Renamed onAdvEvent method to onEvent.

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)
 		{

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"))
 		{

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)
 		{

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)
 		{

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)
 		{

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)
 		{

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)

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

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

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

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

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

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()

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

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"))
 		{

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)
 		{

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"))
 		{

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

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

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

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

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

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

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)
 		{

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()

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())

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)

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))
 		{

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;
 	}

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, " ");

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();

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, " ");

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

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));

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;
 		

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();

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();

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

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);
 		}

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)

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)

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)

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"))

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))

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)

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"))

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"))

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

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)

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)
 		{

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)

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)

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)

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)
 		{

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

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)

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)
 		{

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))

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)
 		{

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)

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);

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)
 		{

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)
 		{

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)
 		{

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())
 		{

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)

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)

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

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)

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)

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;
 		

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)

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)

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

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)
 		{

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)
 		{

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

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)
 		{

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)
 		{

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"))
 		{

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"))
 		{

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

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)

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)
 		{

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)
 		{

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)
 		{

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;
 			}

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)
 		{

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)
 		{

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;
 			}

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)
 		{

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)
 		{

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)
 		{

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;
 			}

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)
 		{

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)
 		{

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)
 		{

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;
 			}

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)
 		{

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)
 		{