Renamed OnCreatureSee getSeer method to getCreature.

This commit is contained in:
MobiusDevelopment
2021-06-23 19:25:18 +00:00
parent bd3dc1a34f
commit 49e7f31d04
478 changed files with 616 additions and 616 deletions

View File

@@ -55,7 +55,7 @@ public class MercenaryCaptain extends AbstractNpcAI
final Creature creature = event.getSeen();
if (creature.isPlayer())
{
final Npc npc = (Npc) event.getSeer();
final Npc npc = (Npc) event.getCreature();
startQuestTimer("BROADCAST_TEXT", 3000, npc, null, true);
}
}

View File

@@ -55,7 +55,7 @@ public class Namo extends AbstractNpcAI
final Creature creature = event.getSeen();
if (creature.isPlayer())
{
final Npc npc = (Npc) event.getSeer();
final Npc npc = (Npc) event.getCreature();
startQuestTimer("BROADCAST_TEXT", 3000, npc, null, true);
}
}

View File

@@ -55,7 +55,7 @@ public class Rakun extends AbstractNpcAI
final Creature creature = event.getSeen();
if (creature.isPlayer())
{
final Npc npc = (Npc) event.getSeer();
final Npc npc = (Npc) event.getCreature();
startQuestTimer("BROADCAST_TEXT", 3000, npc, null, true);
}
}

View File

@@ -83,7 +83,7 @@ public class Wisp extends AbstractNpcAI
public void onCreatureSee(OnCreatureSee event)
{
final Creature creature = event.getSeen();
final Npc npc = (Npc) event.getSeer();
final Npc npc = (Npc) event.getCreature();
if (creature.isPlayer() || creature.isFakePlayer())
{
npc.setTarget(creature);

View File

@@ -130,7 +130,7 @@ public class Rooney extends AbstractNpcAI
final Creature creature = event.getSeen();
if (creature.isPlayer())
{
final Npc npc = (Npc) event.getSeer();
final Npc npc = (Npc) event.getCreature();
if (npc.isScriptValue(0))
{
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.WELCOME);

View File

@@ -92,7 +92,7 @@ public class GardenWatchman extends AbstractNpcAI
public void onCreatureSee(OnCreatureSee event)
{
final Npc npc = (Npc) event.getSeer();
final Npc npc = (Npc) event.getCreature();
final Creature creature = event.getSeen();
if (creature.isPlayer())
{

View File

@@ -74,7 +74,7 @@ public class AltarOfSacrifice extends AbstractNpcAI
public void onCreatureSee(OnCreatureSee event)
{
final Npc npc = (Npc) event.getSeer();
final Npc npc = (Npc) event.getCreature();
final Creature creature = event.getSeen();
if ((creature != null) && creature.isPlayer() && _jenas_guard.isScriptValue(0))
{

View File

@@ -190,7 +190,7 @@ public class Wastelands extends AbstractNpcAI
public void onCreatureSee(OnCreatureSee event)
{
final Npc npc = (Npc) event.getSeer();
final Npc npc = (Npc) event.getCreature();
final Creature creature = event.getSeen();
if (creature.isPlayer() && (npc.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK))
{

View File

@@ -556,7 +556,7 @@ public class Baium extends AbstractNpcAI
public void onCreatureSee(OnCreatureSee event)
{
final Npc npc = (Npc) event.getSeer();
final Npc npc = (Npc) event.getCreature();
final Creature creature = event.getSeen();
if (!zone.isInsideZone(creature) || (creature.isNpc() && (creature.getId() == BAIUM_STONE)))

View File

@@ -296,7 +296,7 @@ public class BalokWarzone extends AbstractInstance
public void onCreatureSee(OnCreatureSee event)
{
final Creature creature = event.getSeen();
final Npc npc = (Npc) event.getSeer();
final Npc npc = (Npc) event.getCreature();
final Instance world = npc.getInstanceWorld();
if (isInInstance(world) && creature.isPlayer() && npc.isScriptValue(0))
{

View File

@@ -313,7 +313,7 @@ public class BaylorWarzone extends AbstractInstance
public void onCreatureSee(OnCreatureSee event)
{
final Creature creature = event.getSeen();
final Npc npc = (Npc) event.getSeer();
final Npc npc = (Npc) event.getCreature();
final Instance world = npc.getInstanceWorld();
if (isInInstance(world) && creature.isPlayer() && npc.isScriptValue(0))
{

View File

@@ -134,7 +134,7 @@ public class IceQueensCastle extends AbstractInstance
public void onCreatureSee(OnCreatureSee event)
{
final Npc npc = (Npc) event.getSeer();
final Npc npc = (Npc) event.getCreature();
final Creature creature = event.getSeen();
if (creature.isPlayer() && npc.isScriptValue(0))
{

View File

@@ -337,7 +337,7 @@ public class KimerianCommon extends AbstractInstance
public void onCreatureSee(OnCreatureSee event)
{
final Creature creature = event.getSeen();
final Npc npc = (Npc) event.getSeer();
final Npc npc = (Npc) event.getCreature();
final StatSet npcParams = npc.getParameters();
final StatSet npcVars = npc.getVariables();
final Instance instance = npc.getInstanceWorld();

View File

@@ -511,7 +511,7 @@ public class Lindvior extends AbstractNpcAI
public void onCreatureSee(OnCreatureSee event)
{
final Npc npc = (Npc) event.getSeer();
final Npc npc = (Npc) event.getCreature();
setLindviorSpawnTask();
npc.getSpawn().stopRespawn();
npc.deleteMe();

View File

@@ -114,7 +114,7 @@ public class Vortex extends AbstractNpcAI
public void onCreatureSee(OnCreatureSee event)
{
final Npc npc = (Npc) event.getSeer();
final Npc npc = (Npc) event.getCreature();
switch (npc.getId())
{
case SMALL_VORTEX:

View File

@@ -565,7 +565,7 @@ public class OctavisWarzone extends AbstractInstance
private void onCreatureSee(OnCreatureSee event)
{
final Creature creature = event.getSeen();
final Npc npc = (Npc) event.getSeer();
final Npc npc = (Npc) event.getCreature();
final Instance world = npc.getInstanceWorld();
if (isInInstance(world) && creature.isPlayer() && npc.isScriptValue(0))
{

View File

@@ -553,7 +553,7 @@ public class Ramona extends AbstractNpcAI
public void onCreatureSee(OnCreatureSee event)
{
final Npc npc = (Npc) event.getSeer();
final Npc npc = (Npc) event.getCreature();
npc.setInvul(true);
final Creature creature = event.getSeen();

View File

@@ -275,7 +275,7 @@ public class TeredorWarzone extends AbstractInstance
public void onCreatureSee(OnCreatureSee event)
{
final Creature creature = event.getSeen();
final Npc npc = (Npc) event.getSeer();
final Npc npc = (Npc) event.getCreature();
final Instance instance = npc.getInstanceWorld();
if (isInInstance(instance))
{

View File

@@ -541,7 +541,7 @@ public class Trasken extends AbstractNpcAI
public void onCreatureSee(OnCreatureSee event)
{
final Npc npc = (Npc) event.getSeer();
final Npc npc = (Npc) event.getCreature();
if (npc.isDead())
{
return;

View File

@@ -487,7 +487,7 @@ public class ClanHallManager extends AbstractNpcAI
final Creature creature = event.getSeen();
if (creature.isPlayer())
{
final Npc npc = (Npc) event.getSeer();
final Npc npc = (Npc) event.getCreature();
final ClanHall clanHall = npc.getClanHall();
if (clanHall != null)
{

View File

@@ -43,7 +43,7 @@ public class Gordon extends AbstractNpcAI
final Creature creature = event.getSeen();
if (creature.isPlayer() && ((PlayerInstance) creature).isCursedWeaponEquipped())
{
final Npc npc = (Npc) event.getSeer();
final Npc npc = (Npc) event.getCreature();
addAttackPlayerDesire(npc, (PlayerInstance) creature);
}
}

View File

@@ -503,7 +503,7 @@ public class ChamberOfProphecies extends AbstractInstance
public void onCreatureSee(OnCreatureSee event)
{
final Npc npc = (Npc) event.getSeer();
final Npc npc = (Npc) event.getCreature();
final Instance world = npc.getInstanceWorld();
if (world != null)
{

View File

@@ -383,7 +383,7 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance
public void onCreatureSee(OnCreatureSee event)
{
final Creature creature = event.getSeen();
final Npc npc = (Npc) event.getSeer();
final Npc npc = (Npc) event.getCreature();
final Instance world = npc.getInstanceWorld();
if ((world != null) && creature.isPlayer() && npc.isScriptValue(0))
{

View File

@@ -364,7 +364,7 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance
private void onCreatureSee(OnCreatureSee event)
{
final Creature creature = event.getSeen();
final Npc npc = (Npc) event.getSeer();
final Npc npc = (Npc) event.getCreature();
final Instance instance = npc.getInstanceWorld();
if (isInInstance(instance) && creature.isPlayer())
{

View File

@@ -272,7 +272,7 @@ public class EtinaHelperAliber extends AbstractNpcAI
final Creature creature = event.getSeen();
if (creature.isPlayer())
{
final Npc npc = (Npc) event.getSeer();
final Npc npc = (Npc) event.getCreature();
npc.getVariables().set("PLAYER_OBJECT", creature.getActingPlayer());
}
}

View File

@@ -160,7 +160,7 @@ public class EtinaHelperDevianne extends AbstractNpcAI
final Creature creature = event.getSeen();
if (creature.isPlayer())
{
final Npc npc = (Npc) event.getSeer();
final Npc npc = (Npc) event.getCreature();
npc.getVariables().set("PLAYER_OBJECT", creature.getActingPlayer());
}
}

View File

@@ -159,7 +159,7 @@ public class EtinaHelperElikia extends AbstractNpcAI
final Creature creature = event.getSeen();
if (creature.isPlayer())
{
final Npc npc = (Npc) event.getSeer();
final Npc npc = (Npc) event.getCreature();
npc.getVariables().set("PLAYER_OBJECT", creature.getActingPlayer());
}
}

View File

@@ -192,7 +192,7 @@ public class EtinaHelperLeona extends AbstractNpcAI
final Creature creature = event.getSeen();
if (creature.isPlayer())
{
final Npc npc = (Npc) event.getSeer();
final Npc npc = (Npc) event.getCreature();
npc.getVariables().set("PLAYER_OBJECT", creature.getActingPlayer());
}
}

View File

@@ -159,7 +159,7 @@ public class EtinaHelperSporcha extends AbstractNpcAI
final Creature creature = event.getSeen();
if (creature.isPlayer())
{
final Npc npc = (Npc) event.getSeer();
final Npc npc = (Npc) event.getCreature();
npc.getVariables().set("PLAYER_OBJECT", creature.getActingPlayer());
}
}

View File

@@ -293,7 +293,7 @@ public class KartiaHelperAdolph extends AbstractNpcAI
final Creature creature = event.getSeen();
if (creature.isPlayer())
{
final Npc npc = (Npc) event.getSeer();
final Npc npc = (Npc) event.getCreature();
npc.getVariables().set("PLAYER_OBJECT", creature.getActingPlayer());
}
}

View File

@@ -154,11 +154,11 @@ public class KartiaHelperBarton extends AbstractNpcAI
final Creature creature = event.getSeen();
if (creature.isPlayer())
{
((Npc) event.getSeer()).getVariables().set("PLAYER_OBJECT", creature.getActingPlayer());
((Npc) event.getCreature()).getVariables().set("PLAYER_OBJECT", creature.getActingPlayer());
}
else if (CommonUtil.contains(KARTIA_ADOLPH, creature.getId()))
{
((Npc) event.getSeer()).getVariables().set("ADOLPH_OBJECT", creature);
((Npc) event.getCreature()).getVariables().set("ADOLPH_OBJECT", creature);
}
}

View File

@@ -248,7 +248,7 @@ public class KartiaHelperElise extends AbstractNpcAI
final Creature creature = event.getSeen();
if (creature.isPlayer() || (creature instanceof FriendlyNpcInstance))
{
final Npc npc = (Npc) event.getSeer();
final Npc npc = (Npc) event.getCreature();
final StatSet npcVars = npc.getVariables();
if (creature.isPlayer())
{

View File

@@ -142,11 +142,11 @@ public class KartiaHelperEliyah extends AbstractNpcAI
final Creature creature = event.getSeen();
if (creature.isPlayer())
{
((Npc) event.getSeer()).getVariables().set("PLAYER_OBJECT", creature.getActingPlayer());
((Npc) event.getCreature()).getVariables().set("PLAYER_OBJECT", creature.getActingPlayer());
}
else if (CommonUtil.contains(KARTIA_ADOLPH, creature.getId()))
{
((Npc) event.getSeer()).getVariables().set("ADOLPH_OBJECT", creature);
((Npc) event.getCreature()).getVariables().set("ADOLPH_OBJECT", creature);
}
}

View File

@@ -160,15 +160,15 @@ public class KartiaHelperGuardian extends AbstractNpcAI
final Creature creature = event.getSeen();
if (creature.isPlayer())
{
((Npc) event.getSeer()).getVariables().set("PLAYER_OBJECT", creature.getActingPlayer());
((Npc) event.getCreature()).getVariables().set("PLAYER_OBJECT", creature.getActingPlayer());
}
else if (CommonUtil.contains(KARTIA_ADOLPH, creature.getId()))
{
((Npc) event.getSeer()).getVariables().set("ADOLPH_OBJECT", creature);
((Npc) event.getCreature()).getVariables().set("ADOLPH_OBJECT", creature);
}
else if (CommonUtil.contains(KARTIA_ELIYAH, creature.getId()))
{
((Npc) event.getSeer()).getVariables().set("ELIYAH_OBJECT", creature);
((Npc) event.getCreature()).getVariables().set("ELIYAH_OBJECT", creature);
}
}

View File

@@ -155,11 +155,11 @@ public class KartiaHelperHayuk extends AbstractNpcAI
final Creature creature = event.getSeen();
if (creature.isPlayer())
{
((Npc) event.getSeer()).getVariables().set("PLAYER_OBJECT", creature.getActingPlayer());
((Npc) event.getCreature()).getVariables().set("PLAYER_OBJECT", creature.getActingPlayer());
}
else if (CommonUtil.contains(KARTIA_ADOLPH, creature.getId()))
{
((Npc) event.getSeer()).getVariables().set("ADOLPH_OBJECT", creature);
((Npc) event.getCreature()).getVariables().set("ADOLPH_OBJECT", creature);
}
}

View File

@@ -876,7 +876,7 @@ public class KartiasLabyrinth extends AbstractInstance
public void onCreatureSee(OnCreatureSee event)
{
final Creature creature = event.getSeen();
final Npc npc = (Npc) event.getSeer();
final Npc npc = (Npc) event.getCreature();
final Instance world = npc.getInstanceWorld();
if ((world != null) && (creature.isPlayer() || creature.getInstanceType().isType(InstanceType.FriendlyNpcInstance)) && npc.isScriptValue(1))
{

View File

@@ -288,7 +288,7 @@ public class NornilsGarden extends AbstractInstance
final Creature creature = event.getSeen();
if (creature.isPlayable())
{
final Npc npc = (Npc) event.getSeer();
final Npc npc = (Npc) event.getCreature();
if (npc.isScriptValue(0))
{
startQuestTimer("stage1", 3000, npc, null);

View File

@@ -346,7 +346,7 @@ public class PrisonOfDarkness extends AbstractInstance
public void onCreatureSee(OnCreatureSee event)
{
final Creature creature = event.getSeen();
final Npc npc = (Npc) event.getSeer();
final Npc npc = (Npc) event.getCreature();
final Instance instance = npc.getInstanceWorld();
if (isInInstance(instance))
{

View File

@@ -25,18 +25,18 @@ import org.l2jmobius.gameserver.model.events.impl.IBaseEvent;
*/
public class OnCreatureSee implements IBaseEvent
{
private final Creature _seer;
private final Creature _creature;
private final Creature _seen;
public OnCreatureSee(Creature seer, Creature seen)
public OnCreatureSee(Creature creature, Creature seen)
{
_seer = seer;
_creature = creature;
_seen = seen;
}
public Creature getSeer()
public Creature getCreature()
{
return _seer;
return _creature;
}
public Creature getSeen()