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

Replaced instanceof L2MonsterInstance with isMonster method.

Browse Source
This commit is contained in:
MobiusDev 2018-07-02 01:32:38 +00:00
parent 5f62a4c740
commit bd285c1368
16 changed files with 74 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java vendored
View File

@ -23,7 +23,6 @@ import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Attackable; import com.l2jmobius.gameserver.model.actor.L2Attackable;
import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDeath; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDeath;
import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSee; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSee;
@ -109,7 +108,7 @@ public final class KimerianCommon extends AbstractInstance
else if (!npc.isInCombat() || !npc.isAttackingNow() || (npc.getTarget() == null)) else if (!npc.isInCombat() || !npc.isAttackingNow() || (npc.getTarget() == null))
{ {
final L2Character monster = (L2Character) player.getTarget(); final L2Character monster = (L2Character) player.getTarget();
if ((monster != null) && (monster instanceof L2MonsterInstance) && player.isInCombat()) if ((monster != null) && monster.isMonster() && player.isInCombat())
{ {
addAttackDesire(npc, monster); addAttackDesire(npc, monster);
} }

5
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java
View File

@ -42,7 +42,9 @@ public class ConditionTargetAggro extends Condition
@Override @Override
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{ {
if (effected instanceof L2MonsterInstance) if (effected != null)
{
if (effected.isMonster())
{ {
return ((L2MonsterInstance) effected).isAggressive() == _isAggro; return ((L2MonsterInstance) effected).isAggressive() == _isAggro;
} }
@ -50,6 +52,7 @@ public class ConditionTargetAggro extends Condition
{ {
return ((L2PcInstance) effected).getReputation() < 0; return ((L2PcInstance) effected).getReputation() < 0;
} }
}
return false; return false;
} }
} }

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java vendored
View File

@ -23,7 +23,6 @@ import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Attackable; import com.l2jmobius.gameserver.model.actor.L2Attackable;
import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDeath; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDeath;
import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSee; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSee;
@ -109,7 +108,7 @@ public final class KimerianCommon extends AbstractInstance
else if (!npc.isInCombat() || !npc.isAttackingNow() || (npc.getTarget() == null)) else if (!npc.isInCombat() || !npc.isAttackingNow() || (npc.getTarget() == null))
{ {
final L2Character monster = (L2Character) player.getTarget(); final L2Character monster = (L2Character) player.getTarget();
if ((monster != null) && (monster instanceof L2MonsterInstance) && player.isInCombat()) if ((monster != null) && monster.isMonster() && player.isInCombat())
{ {
addAttackDesire(npc, monster); addAttackDesire(npc, monster);
} }

5
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java
View File

@ -42,7 +42,9 @@ public class ConditionTargetAggro extends Condition
@Override @Override
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{ {
if (effected instanceof L2MonsterInstance) if (effected != null)
{
if (effected.isMonster())
{ {
return ((L2MonsterInstance) effected).isAggressive() == _isAggro; return ((L2MonsterInstance) effected).isAggressive() == _isAggro;
} }
@ -50,6 +52,7 @@ public class ConditionTargetAggro extends Condition
{ {
return ((L2PcInstance) effected).getReputation() < 0; return ((L2PcInstance) effected).getReputation() < 0;
} }
}
return false; return false;
} }
} }

3
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java vendored
View File

@ -23,7 +23,6 @@ import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Attackable; import com.l2jmobius.gameserver.model.actor.L2Attackable;
import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDeath; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDeath;
import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSee; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSee;
@ -109,7 +108,7 @@ public final class KimerianCommon extends AbstractInstance
else if (!npc.isInCombat() || !npc.isAttackingNow() || (npc.getTarget() == null)) else if (!npc.isInCombat() || !npc.isAttackingNow() || (npc.getTarget() == null))
{ {
final L2Character monster = (L2Character) player.getTarget(); final L2Character monster = (L2Character) player.getTarget();
if ((monster != null) && (monster instanceof L2MonsterInstance) && player.isInCombat()) if ((monster != null) && monster.isMonster() && player.isInCombat())
{ {
addAttackDesire(npc, monster); addAttackDesire(npc, monster);
} }

5
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java
View File

@ -42,7 +42,9 @@ public class ConditionTargetAggro extends Condition
@Override @Override
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{ {
if (effected instanceof L2MonsterInstance) if (effected != null)
{
if (effected.isMonster())
{ {
return ((L2MonsterInstance) effected).isAggressive() == _isAggro; return ((L2MonsterInstance) effected).isAggressive() == _isAggro;
} }
@ -50,6 +52,7 @@ public class ConditionTargetAggro extends Condition
{ {
return ((L2PcInstance) effected).getReputation() < 0; return ((L2PcInstance) effected).getReputation() < 0;
} }
}
return false; return false;
} }
} }

3
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java vendored
View File

@ -23,7 +23,6 @@ import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Attackable; import com.l2jmobius.gameserver.model.actor.L2Attackable;
import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDeath; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDeath;
import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSee; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSee;
@ -109,7 +108,7 @@ public final class KimerianCommon extends AbstractInstance
else if (!npc.isInCombat() || !npc.isAttackingNow() || (npc.getTarget() == null)) else if (!npc.isInCombat() || !npc.isAttackingNow() || (npc.getTarget() == null))
{ {
final L2Character monster = (L2Character) player.getTarget(); final L2Character monster = (L2Character) player.getTarget();
if ((monster != null) && (monster instanceof L2MonsterInstance) && player.isInCombat()) if ((monster != null) && monster.isMonster() && player.isInCombat())
{ {
addAttackDesire(npc, monster); addAttackDesire(npc, monster);
} }

5
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java
View File

@ -42,7 +42,9 @@ public class ConditionTargetAggro extends Condition
@Override @Override
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{ {
if (effected instanceof L2MonsterInstance) if (effected != null)
{
if (effected.isMonster())
{ {
return ((L2MonsterInstance) effected).isAggressive() == _isAggro; return ((L2MonsterInstance) effected).isAggressive() == _isAggro;
} }
@ -50,6 +52,7 @@ public class ConditionTargetAggro extends Condition
{ {
return ((L2PcInstance) effected).getReputation() < 0; return ((L2PcInstance) effected).getReputation() < 0;
} }
}
return false; return false;
} }
} }

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java vendored
View File

@ -848,7 +848,7 @@ public class Q00144_PailakaInjuredDragon extends Quest
@Override @Override
public String onSpawn(L2Npc npc) public String onSpawn(L2Npc npc)
{ {
if (npc instanceof L2MonsterInstance) if (npc.isMonster())
{ {
for (int mobId : WALL_MONSTERS) for (int mobId : WALL_MONSTERS)
{ {

6
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
View File

@ -246,7 +246,7 @@ public class L2AttackableAI extends L2CharacterAI
return GeoEngine.getInstance().canSeeTarget(me, player); // Los Check return GeoEngine.getInstance().canSeeTarget(me, player); // Los Check
} }
// Check if the L2MonsterInstance target is aggressive // Check if the L2MonsterInstance target is aggressive
if ((target instanceof L2MonsterInstance) && Config.GUARD_ATTACK_AGGRO_MOB) if (target.isMonster() && Config.GUARD_ATTACK_AGGRO_MOB)
{ {
return (((L2MonsterInstance) target).isAggressive() && GeoEngine.getInstance().canSeeTarget(me, target)); return (((L2MonsterInstance) target).isAggressive() && GeoEngine.getInstance().canSeeTarget(me, target));
} }
@ -2336,7 +2336,7 @@ public class L2AttackableAI extends L2CharacterAI
setIntention(AI_INTENTION_ATTACK, attacker); setIntention(AI_INTENTION_ATTACK, attacker);
} }
if (me instanceof L2MonsterInstance) if (me.isMonster())
{ {
L2MonsterInstance master = (L2MonsterInstance) me; L2MonsterInstance master = (L2MonsterInstance) me;
@ -2388,7 +2388,7 @@ public class L2AttackableAI extends L2CharacterAI
setIntention(AI_INTENTION_ATTACK, target); setIntention(AI_INTENTION_ATTACK, target);
} }
if (me instanceof L2MonsterInstance) if (me.isMonster())
{ {
L2MonsterInstance master = (L2MonsterInstance) me; L2MonsterInstance master = (L2MonsterInstance) me;

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java
View File

@ -269,7 +269,7 @@ public class L2Attackable extends L2Npc
} }
// If this L2Attackable is a L2MonsterInstance and it has spawned minions, call its minions to battle // If this L2Attackable is a L2MonsterInstance and it has spawned minions, call its minions to battle
if (this instanceof L2MonsterInstance) if (isMonster())
{ {
L2MonsterInstance master = (L2MonsterInstance) this; L2MonsterInstance master = (L2MonsterInstance) this;

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java
View File

@ -44,7 +44,7 @@ public class ConditionTargetAggro extends Condition
{ {
if (effected != null) if (effected != null)
{ {
if (effected instanceof L2MonsterInstance) if (effected.isMonster())
{ {
return ((L2MonsterInstance) effected).isAggressive() == _isAggro; return ((L2MonsterInstance) effected).isAggressive() == _isAggro;
} }

3
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/AbstractNpcInfo.java
View File

@ -25,7 +25,6 @@ import com.l2jmobius.gameserver.model.PcCondOverride;
import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.L2Summon; import com.l2jmobius.gameserver.model.actor.L2Summon;
import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2TrapInstance; import com.l2jmobius.gameserver.model.actor.instance.L2TrapInstance;
import com.l2jmobius.gameserver.model.skills.AbnormalVisualEffect; import com.l2jmobius.gameserver.model.skills.AbnormalVisualEffect;
import com.l2jmobius.gameserver.model.zone.ZoneId; import com.l2jmobius.gameserver.model.zone.ZoneId;
@ -113,7 +112,7 @@ public abstract class AbstractNpcInfo implements IClientOutgoingPacket
_title = cha.getTitle(); // On every subclass _title = cha.getTitle(); // On every subclass
} }
if (Config.SHOW_NPC_LVL && (_npc instanceof L2MonsterInstance)) if (Config.SHOW_NPC_LVL && _npc.isMonster())
{ {
String t = "Lv " + cha.getLevel() + (cha.isAggressive() ? "*" : ""); String t = "Lv " + cha.getLevel() + (cha.isAggressive() ? "*" : "");
if (_title != null) if (_title != null)

5
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java
View File

@ -42,7 +42,9 @@ public class ConditionTargetAggro extends Condition
@Override @Override
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{ {
if (effected instanceof L2MonsterInstance) if (effected != null)
{
if (effected.isMonster())
{ {
return ((L2MonsterInstance) effected).isAggressive() == _isAggro; return ((L2MonsterInstance) effected).isAggressive() == _isAggro;
} }
@ -50,6 +52,7 @@ public class ConditionTargetAggro extends Condition
{ {
return ((L2PcInstance) effected).getReputation() < 0; return ((L2PcInstance) effected).getReputation() < 0;
} }
}
return false; return false;
} }
} }

5
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java
View File

@ -42,7 +42,9 @@ public class ConditionTargetAggro extends Condition
@Override @Override
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{ {
if (effected instanceof L2MonsterInstance) if (effected != null)
{
if (effected.isMonster())
{ {
return ((L2MonsterInstance) effected).isAggressive() == _isAggro; return ((L2MonsterInstance) effected).isAggressive() == _isAggro;
} }
@ -50,6 +52,7 @@ public class ConditionTargetAggro extends Condition
{ {
return ((L2PcInstance) effected).getReputation() < 0; return ((L2PcInstance) effected).getReputation() < 0;
} }
}
return false; return false;
} }
} }

5
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java
View File

@ -42,7 +42,9 @@ public class ConditionTargetAggro extends Condition
@Override @Override
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{ {
if (effected instanceof L2MonsterInstance) if (effected != null)
{
if (effected.isMonster())
{ {
return ((L2MonsterInstance) effected).isAggressive() == _isAggro; return ((L2MonsterInstance) effected).isAggressive() == _isAggro;
} }
@ -50,6 +52,7 @@ public class ConditionTargetAggro extends Condition
{ {
return ((L2PcInstance) effected).getReputation() < 0; return ((L2PcInstance) effected).getReputation() < 0;
} }
}
return false; return false;
} }
} }