Renamed onAdvEvent method to onEvent.
This commit is contained in:
@@ -449,7 +449,7 @@ public class FeedableBeasts extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
if (event.equalsIgnoreCase("polymorph Mad Cow") && (npc != null) && (player != null) && MAD_COW_POLYMORPH.containsKey(npc.getId()))
|
||||
{
|
||||
@@ -473,7 +473,7 @@ public class FeedableBeasts extends AbstractNpcAI
|
||||
nextNpc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player);
|
||||
}
|
||||
|
||||
return super.onAdvEvent(event, npc, player);
|
||||
return super.onEvent(event, npc, player);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -44,7 +44,7 @@ public class Tunatun extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
if ("Whip".equals(event))
|
||||
{
|
||||
|
||||
@@ -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"))
|
||||
{
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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())
|
||||
{
|
||||
|
||||
@@ -35,7 +35,7 @@ public class Rafforty extends AbstractNpcAI
|
||||
private static final int BOTTLE = 16027;
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
switch (event)
|
||||
|
||||
@@ -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)))
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
@@ -168,7 +168,7 @@ public class PrimevalIsle extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
switch (event)
|
||||
{
|
||||
@@ -211,7 +211,7 @@ public class PrimevalIsle extends AbstractNpcAI
|
||||
break;
|
||||
}
|
||||
}
|
||||
return super.onAdvEvent(event, npc, player);
|
||||
return super.onEvent(event, npc, player);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -145,7 +145,7 @@ public class Venom extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
switch (event)
|
||||
{
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -108,7 +108,7 @@ public class VarkaSilenosSupport extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = null;
|
||||
if (Util.isDigit(event) && BUFF.containsKey(Integer.parseInt(event)))
|
||||
|
||||
@@ -192,7 +192,7 @@ public class Antharas extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
switch (event)
|
||||
{
|
||||
@@ -605,7 +605,7 @@ public class Antharas extends AbstractNpcAI
|
||||
break;
|
||||
}
|
||||
}
|
||||
return super.onAdvEvent(event, npc, player);
|
||||
return super.onEvent(event, npc, player);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -163,7 +163,7 @@ public class Baium extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
switch (event)
|
||||
{
|
||||
@@ -477,7 +477,7 @@ public class Baium extends AbstractNpcAI
|
||||
break;
|
||||
}
|
||||
}
|
||||
return super.onAdvEvent(event, npc, player);
|
||||
return super.onEvent(event, npc, player);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -143,7 +143,7 @@ public class Core extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
if (event.equalsIgnoreCase("core_unlock"))
|
||||
{
|
||||
@@ -162,7 +162,7 @@ public class Core extends AbstractNpcAI
|
||||
_minions.forEach(Attackable::decayMe);
|
||||
_minions.clear();
|
||||
}
|
||||
return super.onAdvEvent(event, npc, player);
|
||||
return super.onEvent(event, npc, player);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -112,7 +112,7 @@ public class DrChaos extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
switch (event)
|
||||
{
|
||||
@@ -223,7 +223,7 @@ public class DrChaos extends AbstractNpcAI
|
||||
break;
|
||||
}
|
||||
}
|
||||
return super.onAdvEvent(event, npc, player);
|
||||
return super.onEvent(event, npc, player);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -317,7 +317,7 @@ public class Frintezza extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
long temp = 0;
|
||||
if (event.equalsIgnoreCase("waiting"))
|
||||
@@ -1290,7 +1290,7 @@ public class Frintezza extends AbstractNpcAI
|
||||
_zone.oustAllPlayers();
|
||||
}
|
||||
|
||||
return super.onAdvEvent(event, npc, player);
|
||||
return super.onEvent(event, npc, player);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -169,7 +169,7 @@ public class Orfen extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
if (event.equalsIgnoreCase("orfen_unlock"))
|
||||
{
|
||||
@@ -232,7 +232,7 @@ public class Orfen extends AbstractNpcAI
|
||||
mob.setIsRaidMinion(true);
|
||||
MINIONS.add(mob);
|
||||
}
|
||||
return super.onAdvEvent(event, npc, player);
|
||||
return super.onEvent(event, npc, player);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -146,7 +146,7 @@ public class QueenAnt extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
switch (event)
|
||||
{
|
||||
@@ -230,7 +230,7 @@ public class QueenAnt extends AbstractNpcAI
|
||||
break;
|
||||
}
|
||||
}
|
||||
return super.onAdvEvent(event, npc, player);
|
||||
return super.onEvent(event, npc, player);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -80,7 +80,7 @@ public class Sailren extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
switch (event)
|
||||
{
|
||||
@@ -249,7 +249,7 @@ public class Sailren extends AbstractNpcAI
|
||||
break;
|
||||
}
|
||||
}
|
||||
return super.onAdvEvent(event, npc, player);
|
||||
return super.onEvent(event, npc, player);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -191,7 +191,7 @@ public class Valakas extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
if (npc != null)
|
||||
{
|
||||
@@ -380,7 +380,7 @@ public class Valakas extends AbstractNpcAI
|
||||
{
|
||||
BOSS_ZONE.oustAllPlayers();
|
||||
}
|
||||
return super.onAdvEvent(event, npc, player);
|
||||
return super.onEvent(event, npc, player);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -197,7 +197,7 @@ public class Zaken extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
switch (event)
|
||||
{
|
||||
@@ -588,7 +588,7 @@ public class Zaken extends AbstractNpcAI
|
||||
break;
|
||||
}
|
||||
}
|
||||
return super.onAdvEvent(event, npc, player);
|
||||
return super.onEvent(event, npc, player);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -51,7 +51,7 @@ public class ArenaManager extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
switch (event)
|
||||
{
|
||||
@@ -100,7 +100,7 @@ public class ArenaManager extends AbstractNpcAI
|
||||
break;
|
||||
}
|
||||
}
|
||||
return super.onAdvEvent(event, npc, player);
|
||||
return super.onEvent(event, npc, player);
|
||||
}
|
||||
|
||||
public static void main(String[] args)
|
||||
|
||||
@@ -39,7 +39,7 @@ public class Asamah extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = null;
|
||||
if (event.equals("32115-03.htm") || event.equals("32115-04.htm"))
|
||||
|
||||
@@ -48,7 +48,7 @@ public class BlackJudge extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = null;
|
||||
final int level = ((player.getExpertiseLevel() < 5) ? player.getExpertiseLevel() : 5);
|
||||
|
||||
@@ -56,7 +56,7 @@ public class CastleBlacksmith extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
return (event.equalsIgnoreCase(npc.getId() + "-02.html") && hasRights(player, npc)) ? event : null;
|
||||
}
|
||||
|
||||
@@ -444,7 +444,7 @@ public class CastleChamberlain extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
final Castle castle = npc.getCastle();
|
||||
final StringTokenizer st = new StringTokenizer(event, " ");
|
||||
|
||||
@@ -121,7 +121,7 @@ public class CastleCourtMagician extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
if ((player.getClan() == null) && (player.getClanId() != npc.getCastle().getOwnerId()))
|
||||
{
|
||||
|
||||
@@ -57,7 +57,7 @@ public class CastleMercenaryManager extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = null;
|
||||
final StringTokenizer st = new StringTokenizer(event, " ");
|
||||
|
||||
@@ -55,7 +55,7 @@ public class CastleTeleporter extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
if (event.equalsIgnoreCase("teleporter-03.html"))
|
||||
{
|
||||
|
||||
@@ -52,7 +52,7 @@ public class CastleWarehouse extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
switch (event)
|
||||
|
||||
@@ -68,7 +68,7 @@ public class ClanTrader extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = null;
|
||||
switch (event)
|
||||
|
||||
@@ -51,7 +51,7 @@ public class GatekeeperSpirit extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = null;
|
||||
switch (event)
|
||||
|
||||
@@ -52,7 +52,7 @@ public class HealerTrainer extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = null;
|
||||
switch (event)
|
||||
|
||||
@@ -70,7 +70,7 @@ public class ManorManager extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = null;
|
||||
switch (event)
|
||||
|
||||
@@ -66,7 +66,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
switch (event)
|
||||
{
|
||||
@@ -123,7 +123,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
|
||||
break;
|
||||
}
|
||||
}
|
||||
return super.onAdvEvent(event, npc, player);
|
||||
return super.onEvent(event, npc, player);
|
||||
}
|
||||
|
||||
public static void main(String[] args)
|
||||
|
||||
@@ -55,7 +55,7 @@ public class NewbieTravelToken extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
if (Util.isDigit(event))
|
||||
{
|
||||
@@ -71,7 +71,7 @@ public class NewbieTravelToken extends AbstractNpcAI
|
||||
{
|
||||
player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT);
|
||||
}
|
||||
return super.onAdvEvent(event, npc, player);
|
||||
return super.onEvent(event, npc, player);
|
||||
}
|
||||
}
|
||||
return event;
|
||||
|
||||
@@ -60,7 +60,7 @@ public class NoblesseTeleport extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
if ("teleportWithToken".equals(event))
|
||||
{
|
||||
@@ -73,7 +73,7 @@ public class NoblesseTeleport extends AbstractNpcAI
|
||||
return "noble-nopass.htm";
|
||||
}
|
||||
}
|
||||
return super.onAdvEvent(event, npc, player);
|
||||
return super.onEvent(event, npc, player);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -152,7 +152,7 @@ public class OracleTeleport extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = "";
|
||||
final QuestState qs = getQuestState(player, true);
|
||||
|
||||
@@ -61,7 +61,7 @@ public class Selina extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
final BuffHolder buff = BUFFS.get(event);
|
||||
if (buff != null)
|
||||
@@ -69,7 +69,7 @@ public class Selina extends AbstractNpcAI
|
||||
if ((getQuestItemsCount(player, GOLDEN_RAM_COIN) >= buff.getCost()))
|
||||
{
|
||||
castSkill(npc, player, buff);
|
||||
return super.onAdvEvent(event, npc, player);
|
||||
return super.onEvent(event, npc, player);
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||
@@ -48,7 +48,7 @@ public class SinEater extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
if (event.equals("TALK") && (player != null) && (player.getSummon() != null))
|
||||
{
|
||||
@@ -79,7 +79,7 @@ public class SinEater extends AbstractNpcAI
|
||||
}
|
||||
startQuestTimer("TALK", 60000, null, player);
|
||||
}
|
||||
return super.onAdvEvent(event, npc, player);
|
||||
return super.onEvent(event, npc, player);
|
||||
}
|
||||
|
||||
@RegisterEvent(EventType.ON_CREATURE_DEATH)
|
||||
|
||||
@@ -53,7 +53,7 @@ public class SymbolMaker extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = null;
|
||||
switch (event)
|
||||
|
||||
@@ -52,7 +52,7 @@ public class TownPets extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
if (event.equalsIgnoreCase("move"))
|
||||
{
|
||||
|
||||
@@ -54,7 +54,7 @@ public class TurekOrcs extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
if (event.equalsIgnoreCase("checkState") && !npc.isDead() && (npc.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK))
|
||||
{
|
||||
@@ -68,7 +68,7 @@ public class TurekOrcs extends AbstractNpcAI
|
||||
npc.getVariables().remove("state");
|
||||
}
|
||||
}
|
||||
return super.onAdvEvent(event, npc, player);
|
||||
return super.onEvent(event, npc, player);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -63,7 +63,7 @@ public class ValakasTeleporters extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = "";
|
||||
final QuestState qs = getQuestState(player, false);
|
||||
|
||||
@@ -75,7 +75,7 @@ public class WarriorFishingBlock extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
switch (event)
|
||||
{
|
||||
@@ -104,7 +104,7 @@ public class WarriorFishingBlock extends AbstractNpcAI
|
||||
break;
|
||||
}
|
||||
}
|
||||
return super.onAdvEvent(event, npc, player);
|
||||
return super.onEvent(event, npc, player);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -181,7 +181,7 @@ public class WyvernManager extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = null;
|
||||
switch (event)
|
||||
|
||||
@@ -352,7 +352,7 @@ public class RainbowSpringsChateau extends ClanHallSiegeEngine
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String html = event;
|
||||
final Clan clan = player.getClan();
|
||||
|
||||
@@ -157,7 +157,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized String onAdvEvent(String event, Npc npc, Player player)
|
||||
public synchronized String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String html = event;
|
||||
final Clan clan = player.getClan();
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
@@ -99,7 +99,7 @@ public class EchoCrystals extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = "";
|
||||
final QuestState qs = player.getQuestState(EchoCrystals.class.getSimpleName());
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -61,7 +61,7 @@ public class MissQueen extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
if (event.equals("newbie_coupon"))
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
@@ -267,7 +267,7 @@ public class NpcLocationInfo extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
if (Util.isDigit(event))
|
||||
|
||||
@@ -69,7 +69,7 @@ public class RaidbossInfo extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
if (Util.isDigit(event))
|
||||
|
||||
@@ -166,7 +166,7 @@ public class Deathmatch extends Event
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
if (!EVENT_ACTIVE)
|
||||
{
|
||||
|
||||
@@ -184,7 +184,7 @@ public class TvT extends Event
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
if (!EVENT_ACTIVE)
|
||||
{
|
||||
|
||||
@@ -50,7 +50,7 @@ public class Wedding extends AbstractNpcAI
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
if (player.getPartnerId() == 0)
|
||||
{
|
||||
|
||||
@@ -59,7 +59,7 @@ public class HeavyMedal extends LongTimeEvent
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
int level = checkLevel(player);
|
||||
|
||||
@@ -149,7 +149,7 @@ public class L2Day extends LongTimeEvent
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
switch (event)
|
||||
|
||||
@@ -45,7 +45,7 @@ public class Q00001_LettersOfLove extends Quest
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
final QuestState st = getQuestState(player, false);
|
||||
|
||||
@@ -48,7 +48,7 @@ public class Q00002_WhatWomenWant extends Quest
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
final QuestState st = getQuestState(player, false);
|
||||
|
||||
@@ -57,7 +57,7 @@ public class Q00003_WillTheSealBeBroken extends Quest
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
final QuestState qs = getQuestState(player, false);
|
||||
if (qs == null)
|
||||
|
||||
@@ -50,7 +50,7 @@ public class Q00004_LongLiveThePaagrioLord extends Quest
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
final QuestState st = getQuestState(player, false);
|
||||
|
||||
@@ -50,7 +50,7 @@ public class Q00005_MinersFavor extends Quest
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
final QuestState st = getQuestState(player, false);
|
||||
|
||||
@@ -44,7 +44,7 @@ public class Q00006_StepIntoTheFuture extends Quest
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
final QuestState st = getQuestState(player, false);
|
||||
|
||||
@@ -44,7 +44,7 @@ public class Q00007_ATripBegins extends Quest
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
final QuestState st = getQuestState(player, false);
|
||||
|
||||
@@ -44,7 +44,7 @@ public class Q00008_AnAdventureBegins extends Quest
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
final QuestState st = getQuestState(player, false);
|
||||
|
||||
@@ -41,7 +41,7 @@ public class Q00009_IntoTheCityOfHumans extends Quest
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
final QuestState st = getQuestState(player, false);
|
||||
|
||||
@@ -44,7 +44,7 @@ public class Q00010_IntoTheWorld extends Quest
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
final QuestState st = getQuestState(player, false);
|
||||
|
||||
@@ -40,7 +40,7 @@ public class Q00011_SecretMeetingWithKetraOrcs extends Quest
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
final QuestState st = getQuestState(player, false);
|
||||
|
||||
@@ -40,7 +40,7 @@ public class Q00012_SecretMeetingWithVarkaSilenos extends Quest
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
final QuestState st = getQuestState(player, false);
|
||||
|
||||
@@ -39,7 +39,7 @@ public class Q00013_ParcelDelivery extends Quest
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
final QuestState st = getQuestState(player, false);
|
||||
|
||||
@@ -39,7 +39,7 @@ public class Q00014_WhereaboutsOfTheArchaeologist extends Quest
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
final QuestState st = getQuestState(player, false);
|
||||
|
||||
@@ -37,7 +37,7 @@ public class Q00015_SweetWhispers extends Quest
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
final QuestState st = getQuestState(player, false);
|
||||
|
||||
@@ -44,7 +44,7 @@ public class Q00016_TheComingDarkness extends Quest
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
final QuestState st = getQuestState(player, false);
|
||||
|
||||
@@ -42,7 +42,7 @@ public class Q00017_LightAndDarkness extends Quest
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
final QuestState st = getQuestState(player, false);
|
||||
|
||||
@@ -41,7 +41,7 @@ public class Q00018_MeetingWithTheGoldenRam extends Quest
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
final QuestState st = getQuestState(player, false);
|
||||
|
||||
@@ -39,7 +39,7 @@ public class Q00019_GoToThePastureland extends Quest
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
final QuestState st = getQuestState(player, false);
|
||||
|
||||
@@ -36,7 +36,7 @@ public class Q00020_BringUpWithLove extends Quest
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
final QuestState st = getQuestState(player, false);
|
||||
|
||||
@@ -60,7 +60,7 @@ public class Q00021_HiddenTruth extends Quest
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
final QuestState st = getQuestState(player, false);
|
||||
|
||||
@@ -75,7 +75,7 @@ public class Q00022_TragedyInVonHellmannForest extends Quest
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
final QuestState qs = player.getQuestState(getName());
|
||||
String htmltext = null;
|
||||
|
||||
@@ -57,7 +57,7 @@ public class Q00023_LidiasHeart extends Quest
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
final QuestState st = getQuestState(player, false);
|
||||
|
||||
@@ -65,7 +65,7 @@ public class Q00024_InhabitantsOfTheForestOfTheDead extends Quest
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
QuestState st = player.getQuestState(getName());
|
||||
if (st == null)
|
||||
|
||||
@@ -61,7 +61,7 @@ public class Q00025_HidingBehindTheTruth extends Quest
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
final QuestState qs = player.getQuestState(getName());
|
||||
|
||||
@@ -46,7 +46,7 @@ public class Q00027_ChestCaughtWithABaitOfWind extends Quest
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
final QuestState st = getQuestState(player, false);
|
||||
|
||||
@@ -43,7 +43,7 @@ public class Q00028_ChestCaughtWithABaitOfIcyAir extends Quest
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
final QuestState st = getQuestState(player, false);
|
||||
|
||||
@@ -43,7 +43,7 @@ public class Q00029_ChestCaughtWithABaitOfEarth extends Quest
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
final QuestState st = getQuestState(player, false);
|
||||
|
||||
@@ -43,7 +43,7 @@ public class Q00030_ChestCaughtWithABaitOfFire extends Quest
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
final QuestState st = getQuestState(player, false);
|
||||
|
||||
@@ -43,7 +43,7 @@ public class Q00031_SecretBuriedInTheSwamp extends Quest
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
final QuestState st = getQuestState(player, false);
|
||||
|
||||
@@ -50,7 +50,7 @@ public class Q00032_AnObviousLie extends Quest
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
final QuestState st = getQuestState(player, false);
|
||||
|
||||
@@ -45,7 +45,7 @@ public class Q00033_MakeAPairOfDressShoes extends Quest
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
final QuestState st = getQuestState(player, false);
|
||||
|
||||
@@ -52,7 +52,7 @@ public class Q00034_InSearchOfCloth extends Quest
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
final QuestState st = getQuestState(player, false);
|
||||
|
||||
@@ -48,7 +48,7 @@ public class Q00035_FindGlitteringJewelry extends Quest
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
final QuestState st = getQuestState(player, false);
|
||||
|
||||
@@ -44,7 +44,7 @@ public class Q00036_MakeASewingKit extends Quest
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
final QuestState st = getQuestState(player, false);
|
||||
|
||||
@@ -49,7 +49,7 @@ public class Q00037_MakeFormalWear extends Quest
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
final QuestState st = getQuestState(player, false);
|
||||
|
||||
@@ -69,7 +69,7 @@ public class Q00038_DragonFangs extends Quest
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
final QuestState st = getQuestState(player, false);
|
||||
|
||||
@@ -73,7 +73,7 @@ public class Q00039_RedEyedInvaders extends Quest
|
||||
}
|
||||
|
||||
@Override
|
||||
public String onAdvEvent(String event, Npc npc, Player player)
|
||||
public String onEvent(String event, Npc npc, Player player)
|
||||
{
|
||||
String htmltext = event;
|
||||
final QuestState st = getQuestState(player, false);
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user