Renamed onAdvEvent method to onEvent.
This commit is contained in:
		| @@ -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) | ||||
|   | ||||
| @@ -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) | ||||
| 		{ | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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)) | ||||
| 		{ | ||||
|   | ||||
| @@ -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) | ||||
| 		{ | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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) | ||||
| 		{ | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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); | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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) | ||||
| 		{ | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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()) | ||||
| 		{ | ||||
|   | ||||
| @@ -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) | ||||
| 		{ | ||||
|   | ||||
| @@ -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()) | ||||
| 		{ | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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")) | ||||
| 		{ | ||||
|   | ||||
| @@ -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")) | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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")) | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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")) | ||||
| 		{ | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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)) | ||||
| 		{ | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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()); | ||||
|   | ||||
| @@ -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)) | ||||
| 		{ | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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))) | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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() | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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) | ||||
| 		{ | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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) | ||||
| 		{ | ||||
|   | ||||
| @@ -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) | ||||
| 		{ | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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")) | ||||
|   | ||||
| @@ -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) | ||||
| 		{ | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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")) | ||||
| 		{ | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
Some files were not shown because too many files have changed in this diff Show More
		Reference in New Issue
	
	Block a user
	 MobiusDevelopment
					MobiusDevelopment