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

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.L2Character;
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.events.impl.character.OnCreatureDeath;
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))
{
final L2Character monster = (L2Character) player.getTarget();
if ((monster != null) && (monster instanceof L2MonsterInstance) && player.isInCombat())
if ((monster != null) && monster.isMonster() && player.isInCombat())
{
addAttackDesire(npc, monster);
}

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

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