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

Replaced instanceof L2Attackable with isAttackable method.

Browse Source
This commit is contained in:
MobiusDev
2018-07-02 00:55:13 +00:00
parent 6c1d37f4ae
commit 0b09d49f8d
51 changed files with 73 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java vendored
View File

@@ -740,7 +740,7 @@ public class HeartInfinityDefence extends AbstractNpcAI
@Override
public final String onEnterZone(L2Character character, L2ZoneType zone)
{
if (character instanceof L2Attackable)
if (character.isAttackable())
{
final L2Attackable npc = (L2Attackable) character;
final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc);

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java vendored
View File

@@ -73,7 +73,7 @@ public class L2NpcActionShift implements IActionShiftHandler
html.replace("%lvl%", String.valueOf(((L2Npc) target).getTemplate().getLevel()));
html.replace("%name%", ((L2Npc) target).getTemplate().getName());
html.replace("%tmplid%", String.valueOf(((L2Npc) target).getTemplate().getId()));
html.replace("%aggro%", String.valueOf((target instanceof L2Attackable) ? ((L2Attackable) target).getAggroRange() : 0));
html.replace("%aggro%", String.valueOf(target.isAttackable() ? ((L2Attackable) target).getAggroRange() : 0));
html.replace("%hp%", String.valueOf((int) ((L2Character) target).getCurrentHp()));
html.replace("%hpmax%", String.valueOf(((L2Character) target).getMaxHp()));
html.replace("%mp%", String.valueOf((int) ((L2Character) target).getCurrentMp()));

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java vendored
View File

@@ -18,7 +18,6 @@ package handlers.effecthandlers;
import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Attackable;
import com.l2jmobius.gameserver.model.conditions.Condition;
import com.l2jmobius.gameserver.model.effects.AbstractEffect;
import com.l2jmobius.gameserver.model.effects.L2EffectType;
@@ -50,7 +49,7 @@ public final class GetAgro extends AbstractEffect
@Override
public void onStart(BuffInfo info)
{
if (info.getEffected() instanceof L2Attackable)
if ((info.getEffected() != null) && info.getEffected().isAttackable())
{
info.getEffected().getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, info.getEffector());
}

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java vendored
View File

@@ -30,7 +30,6 @@ import com.l2jmobius.gameserver.instancemanager.InstanceManager;
import com.l2jmobius.gameserver.model.L2Party;
import com.l2jmobius.gameserver.model.L2World;
import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Attackable;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.L2Playable;
@@ -262,7 +261,7 @@ public class Q00727_HopeWithinTheDarkness extends Quest
{
for (L2Character foe : L2World.getInstance().getVisibleObjects(npc, L2Character.class, npc.getAggroRange()))
{
if ((foe instanceof L2Attackable) && !(foe instanceof L2QuestGuardInstance))
if (foe.isAttackable() && !(foe instanceof L2QuestGuardInstance))
{
((L2QuestGuardInstance) npc).addDamageHate(foe, 0, 999);
((L2QuestGuardInstance) npc).getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, foe, null);

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

@@ -270,7 +270,7 @@ public class L2AttackableAI extends L2CharacterAI
}
else
{
if (target instanceof L2Attackable)
if (target.isAttackable())
{
if (!target.isAutoAttackable(me))
{
@@ -288,7 +288,7 @@ public class L2AttackableAI extends L2CharacterAI
}
}
if ((target instanceof L2Attackable) || (target instanceof L2Npc))
if (target.isAttackable() || (target instanceof L2Npc))
{
return false;
}
@@ -854,7 +854,7 @@ public class L2AttackableAI extends L2CharacterAI
called.getAI().notifyEvent(CtrlEvent.EVT_AGGRESSION, originalAttackTarget, 1);
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableFactionCall(called, getActiveChar(), originalAttackTarget.getActingPlayer(), originalAttackTarget.isSummon()), called);
}
else if ((called instanceof L2Attackable) && (getAttackTarget() != null) && (called.getAI()._intention != AI_INTENTION_ATTACK))
else if (called.isAttackable() && (getAttackTarget() != null) && (called.getAI()._intention != AI_INTENTION_ATTACK))
{
((L2Attackable) called).addDamageHate(getAttackTarget(), 0, npc.getHating(getAttackTarget()));
called.getAI().setIntention(AI_INTENTION_ATTACK, getAttackTarget());
@@ -2079,7 +2079,7 @@ public class L2AttackableAI extends L2CharacterAI
{
return obj;
}
if ((obj instanceof L2Attackable) && actor.isChaos())
if (obj.isAttackable() && actor.isChaos())
{
if (!((L2Attackable) obj).isInMyClan(actor))
{
@@ -2149,7 +2149,7 @@ public class L2AttackableAI extends L2CharacterAI
actor.setTarget(obj);
setAttackTarget(obj);
}
else if (obj instanceof L2Attackable)
else if (obj.isAttackable())
{
if (actor.isChaos())
{
@@ -2222,7 +2222,7 @@ public class L2AttackableAI extends L2CharacterAI
actor.setTarget(obj);
setAttackTarget(obj);
}
else if (obj instanceof L2Attackable)
else if (obj.isAttackable())
{
if (actor.isChaos())
{

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

@@ -136,7 +136,7 @@ public class L2CharacterAI extends AbstractAI
@Override
protected void onEvtAttacked(L2Character attacker)
{
if ((attacker instanceof L2Attackable) && !attacker.isCoreAIDisabled())
if ((attacker != null) && attacker.isAttackable() && !attacker.isCoreAIDisabled())
{
clientStartAutoAttack();
}
@@ -204,7 +204,7 @@ public class L2CharacterAI extends AbstractAI
// Also enable random animations for this L2Character if allowed
// This is only for mobs - town npcs are handled in their constructor
if (_actor instanceof L2Attackable)
if (_actor.isAttackable())
{
((L2Npc) _actor).startRandomAnimationTask();
}
@@ -672,7 +672,7 @@ public class L2CharacterAI extends AbstractAI
return;
}
if (_actor instanceof L2Attackable)
if (_actor.isAttackable())
{
((L2Attackable) _actor).setisReturningToSpawnPoint(false);
}
@@ -1424,7 +1424,7 @@ public class L2CharacterAI extends AbstractAI
boolean cancast = true;
for (L2Character target : L2World.getInstance().getVisibleObjects(_actor, L2Character.class, sk.getAffectRange()))
{
if (!GeoEngine.getInstance().canSeeTarget(_actor, target) || ((target instanceof L2Attackable) && !((L2Npc) _actor).isChaos()))
if (!GeoEngine.getInstance().canSeeTarget(_actor, target) || (target.isAttackable() && !((L2Npc) _actor).isChaos()))
{
continue;
}
@@ -1443,7 +1443,7 @@ public class L2CharacterAI extends AbstractAI
boolean cancast = true;
for (L2Character target : L2World.getInstance().getVisibleObjects(getAttackTarget(), L2Character.class, sk.getAffectRange()))
{
if (!GeoEngine.getInstance().canSeeTarget(_actor, target) || (target == null) || ((target instanceof L2Attackable) && !((L2Npc) _actor).isChaos()))
if (!GeoEngine.getInstance().canSeeTarget(_actor, target) || (target == null) || (target.isAttackable() && !((L2Npc) _actor).isChaos()))
{
continue;
}
@@ -1463,7 +1463,7 @@ public class L2CharacterAI extends AbstractAI
boolean cancast = false;
for (L2Character target : L2World.getInstance().getVisibleObjects(_actor, L2Character.class, sk.getAffectRange()))
{
if (!GeoEngine.getInstance().canSeeTarget(_actor, target) || ((target instanceof L2Attackable) && !((L2Npc) _actor).isChaos()))
if (!GeoEngine.getInstance().canSeeTarget(_actor, target) || (target.isAttackable() && !((L2Npc) _actor).isChaos()))
{
continue;
}
@@ -1482,7 +1482,7 @@ public class L2CharacterAI extends AbstractAI
boolean cancast = true;
for (L2Character target : L2World.getInstance().getVisibleObjects(getAttackTarget(), L2Character.class, sk.getAffectRange()))
{
if (!GeoEngine.getInstance().canSeeTarget(_actor, target) || ((target instanceof L2Attackable) && !((L2Npc) _actor).isChaos()))
if (!GeoEngine.getInstance().canSeeTarget(_actor, target) || (target.isAttackable() && !((L2Npc) _actor).isChaos()))
{
continue;
}

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

@@ -559,7 +559,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
npc.setHeading(_location.getHeading());
}
if (npc instanceof L2Attackable)
if (npc.isAttackable())
{
((L2Attackable) npc).setChampion(false);
}

4
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2WorldRegion.java
View File

@@ -88,7 +88,7 @@ public final class L2WorldRegion
{
for (L2Object o : _visibleObjects.values())
{
if (o instanceof L2Attackable)
if (o.isAttackable())
{
c++;
final L2Attackable mob = (L2Attackable) o;
@@ -123,7 +123,7 @@ public final class L2WorldRegion
{
for (L2Object o : _visibleObjects.values())
{
if (o instanceof L2Attackable)
if (o.isAttackable())
{
c++;
// Start HP/MP/CP Regeneration task

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

@@ -13789,7 +13789,7 @@ public final class L2PcInstance extends L2Playable
{
return false;
}
if (cha instanceof L2Attackable)
if (cha.isAttackable())
{
return true;
}

5
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2QuestGuardInstance.java
View File

@@ -17,7 +17,6 @@
package com.l2jmobius.gameserver.model.actor.instance;
import com.l2jmobius.gameserver.enums.InstanceType;
import com.l2jmobius.gameserver.model.actor.L2Attackable;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate;
import com.l2jmobius.gameserver.model.events.EventDispatcher;
@@ -49,7 +48,7 @@ public final class L2QuestGuardInstance extends L2GuardInstance
{
super.addDamage(attacker, damage, skill);
if (attacker instanceof L2Attackable)
if (attacker.isAttackable())
{
EventDispatcher.getInstance().notifyEventAsync(new OnAttackableAttack(null, this, damage, skill, false), this);
}
@@ -64,7 +63,7 @@ public final class L2QuestGuardInstance extends L2GuardInstance
return false;
}
if (killer instanceof L2Attackable)
if (killer.isAttackable())
{
// Delayed notification
EventDispatcher.getInstance().notifyEventAsyncDelayed(new OnAttackableKill(null, this, false), this, _onKillDelay);

3
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java
View File

@@ -25,7 +25,6 @@ import com.l2jmobius.gameserver.enums.InstanceType;
import com.l2jmobius.gameserver.enums.TrapAction;
import com.l2jmobius.gameserver.instancemanager.ZoneManager;
import com.l2jmobius.gameserver.model.L2World;
import com.l2jmobius.gameserver.model.actor.L2Attackable;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.tasks.npc.trap.TrapTask;
@@ -210,7 +209,7 @@ public final class L2TrapInstance extends L2Npc
// trap owned by players not attack non-flagged players
if (_owner != null)
{
if (target instanceof L2Attackable)
if (target.isAttackable())
{
return true;
}

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

@@ -61,7 +61,7 @@ public class ConditionPlayerCanSweep extends Condition
L2Attackable target;
for (L2Object objTarget : targets)
{
if (objTarget instanceof L2Attackable)
if ((objTarget != null) && objTarget.isAttackable())
{
target = (L2Attackable) objTarget;
if (target.isDead())

4
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/AbstractScript.java
View File

@@ -2726,7 +2726,7 @@ public abstract class AbstractScript extends ManagedScript
*/
protected void addAttackDesire(L2Npc npc, L2Character target, int desire)
{
if (npc instanceof L2Attackable)
if (npc.isAttackable())
{
((L2Attackable) npc).addDamageHate(target, 0, desire);
}
@@ -2790,7 +2790,7 @@ public abstract class AbstractScript extends ManagedScript
*/
protected void addSkillCastDesire(L2Npc npc, L2Character target, Skill skill, int desire)
{
if (npc instanceof L2Attackable)
if (npc.isAttackable())
{
((L2Attackable) npc).addDamageHate(target, 0, desire);
}

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/instancezone/Instance.java
View File

@@ -438,7 +438,7 @@ public final class Instance
spawnDat.setInstanceId(_id);
spawnDat.setRandomWalking(set.getBoolean("allowRandomWalk"));
final L2Npc spawned = spawnDat.doSpawn();
if ((set.getInt("delay") >= 0) && (spawned instanceof L2Attackable))
if ((set.getInt("delay") >= 0) && spawned.isAttackable())
{
((L2Attackable) spawned).setOnKillDelay(set.getInt("delay"));
}

5
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/Skill.java
View File

@@ -43,7 +43,6 @@ import com.l2jmobius.gameserver.model.L2ExtractableSkill;
import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.PcCondOverride;
import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Attackable;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.instance.L2BlockInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2CubicInstance;
@@ -1210,7 +1209,7 @@ public final class Skill implements IIdentifiable
else
{
// target is mob
if ((targetPlayer == null) && (target instanceof L2Attackable) && (caster instanceof L2Attackable))
if ((targetPlayer == null) && target.isAttackable() && caster.isAttackable())
{
return false;
}
@@ -1253,7 +1252,7 @@ public final class Skill implements IIdentifiable
return Collections.<AbstractFunction> emptyList();
}
if (!player.isPlayable() && !(player instanceof L2Attackable))
if (!player.isPlayable() && !player.isAttackable())
{
return Collections.<AbstractFunction> emptyList();
}

3
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -32,7 +32,6 @@ import com.l2jmobius.gameserver.instancemanager.FortManager;
import com.l2jmobius.gameserver.instancemanager.SiegeManager;
import com.l2jmobius.gameserver.instancemanager.ZoneManager;
import com.l2jmobius.gameserver.model.L2SiegeClan;
import com.l2jmobius.gameserver.model.actor.L2Attackable;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.instance.L2CubicInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -590,7 +589,7 @@ public final class Formulas
final double weaponMod = attacker.getRandomDamageMultiplier();
double penaltyMod = 1;
if ((target instanceof L2Attackable) && !target.isRaid() && !target.isRaidMinion() && (target.getLevel() >= Config.MIN_NPC_LVL_DMG_PENALTY) && (attacker.getActingPlayer() != null) && ((target.getLevel() - attacker.getActingPlayer().getLevel()) >= 2))
if (target.isAttackable() && !target.isRaid() && !target.isRaidMinion() && (target.getLevel() >= Config.MIN_NPC_LVL_DMG_PENALTY) && (attacker.getActingPlayer() != null) && ((target.getLevel() - attacker.getActingPlayer().getLevel()) >= 2))
{
final int lvlDiff = target.getLevel() - attacker.getActingPlayer().getLevel() - 1;
if (lvlDiff >= Config.NPC_SKILL_DMG_PENALTY.size())