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

Sync with L2JServer Jan 24th 2015.

Browse Source
This commit is contained in:
mobius
2015-01-24 20:02:32 +00:00
parent d349bd3924
commit 1c6301c46d
1012 changed files with 23069 additions and 6307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
trunk/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerHasPet.java
View File

@@ -21,6 +21,7 @@ package com.l2jserver.gameserver.model.conditions;
import java.util.ArrayList;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Summon;
import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
import com.l2jserver.gameserver.model.items.L2Item;
import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
@@ -52,7 +53,8 @@ public class ConditionPlayerHasPet extends Condition
@Override
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{
if ((effector.getActingPlayer() == null) || (!(effector.getActingPlayer().getSummon() instanceof L2PetInstance)))
final L2Summon pet = effector.getActingPlayer().getPet();
if ((effector.getActingPlayer() == null) || (pet == null))
{
return false;
}
@@ -62,7 +64,7 @@ public class ConditionPlayerHasPet extends Condition
return true;
}
final L2ItemInstance controlItem = ((L2PetInstance) effector.getActingPlayer().getSummon()).getControlItem();
final L2ItemInstance controlItem = ((L2PetInstance) pet).getControlItem();
return (controlItem != null) && _controlItemIds.contains(controlItem.getId());
}
}