lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed OnCreatureSee getSeer method to getCreature.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java vendored
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);
}
}

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/DragonValley/Namo.java vendored
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);
}
}

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java vendored
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);
}
}

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java vendored
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);

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java vendored
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);

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java vendored
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())
{

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java vendored
View File

@@ -245,7 +245,7 @@ public class PrimevalIsle 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 (CommonUtil.contains(MONSTERS, npc.getId()))
{

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java vendored
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))
{

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java vendored
View File

@@ -156,7 +156,7 @@ public class SilentValley 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.isPlayable())
{

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java vendored
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))
{

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Baium/Baium.java vendored
View File

@@ -574,7 +574,7 @@ public class Baium extends AbstractNpcAI
_standbyPlayer = (PlayerInstance) creature;
}
final Npc npc = (Npc) event.getSeer();
final Npc npc = (Npc) event.getCreature();
if (creature.isInCategory(CategoryType.CLERIC_GROUP))
{
if (npc.getCurrentHp() < (npc.getMaxHp() * 0.25))

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java vendored
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))
{

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java vendored
View File

@@ -307,7 +307,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))
{

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java vendored
View File

@@ -142,7 +142,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))
{

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java vendored
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();

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java vendored
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();

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java vendored
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:

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java vendored
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))
{

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java vendored
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))
{

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java vendored
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;

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java vendored
View File

@@ -491,7 +491,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)
{

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Gordon.java vendored
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);
}
}

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java vendored
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)
{

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java vendored
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))
{

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java vendored
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())
{

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java vendored
View File

@@ -679,7 +679,7 @@ public class HarnakUndergroundRuins extends AbstractInstance
final Creature creature = event.getSeen();
if (creature.isPlayer())
{
final Npc npc = (Npc) event.getSeer();
final Npc npc = (Npc) event.getCreature();
startQuestTimer("cast_release_power", 2000, npc, creature.getActingPlayer());
if (npc.getId() == POWER_SOURCE)
{

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java vendored
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());
}
}

4
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java vendored
View File

@@ -151,11 +151,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);
}
}

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java vendored
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())
{

4
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperEliyah.java vendored
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);
}
}

6
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperGuardian.java vendored
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);
}
}

4
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java vendored
View File

@@ -157,11 +157,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);
}
}

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java vendored
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))
{

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java vendored
View File

@@ -346,7 +346,7 @@ public class MemoryOfDisaster 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))
{

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java vendored
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);

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java vendored
View File

@@ -478,7 +478,7 @@ public class PailakaInjuredDragon 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))
{

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java vendored
View File

@@ -174,7 +174,7 @@ public class PailakaSongOfIceAndFire extends AbstractInstance
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.setScriptValue(1);

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java vendored
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) && (npc.getId() == EXIT_PORTAL))
{

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java vendored
View File

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

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java vendored
View File

@@ -403,7 +403,7 @@ public class Q00454_CompletelyLost extends Quest
final Creature creature = event.getSeen();
if (creature.isPlayer())
{
final Npc npc = (Npc) event.getSeer();
final Npc npc = (Npc) event.getCreature();
if (npc.isScriptValue(0))
{
addAttackPlayerDesire(npc, creature.getActingPlayer(), 10);

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10385_RedThreadOfFate/Q10385_RedThreadOfFate.java vendored
View File

@@ -695,7 +695,7 @@ public class Q10385_RedThreadOfFate extends Quest
final Creature creature = event.getSeen();
if (creature.isPlayer())
{
final Npc npc = (Npc) event.getSeer();
final Npc npc = (Npc) event.getCreature();
final PlayerInstance player = creature.getActingPlayer();
final QuestState qs = getQuestState(player, false);
if ((npc.getId() == INVISIBLE_ANGHEL_WATERFALL_NPC) && (qs != null) && qs.isCond(7))

10
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/OnCreatureSee.java
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()