@@ -262,6 +262,6 @@ public class L2CommandChannel extends AbstractPlayerGroup
*/
public boolean equals(L2CommandChannel cc)
{
- return (getLeaderObjectId() == cc.getLeaderObjectId());
+ return (cc != null) && (getLeaderObjectId() == cc.getLeaderObjectId());
}
@@ -6715,7 +6715,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
switch (skill.getSkillType())
case SUMMON:
- case BEAST_FEED:
case UNLOCK:
case DELUXE_KEY_UNLOCK:
case UNLOCK_SPECIAL:
@@ -9417,7 +9417,6 @@ public final class L2PcInstance extends L2Playable
switch (sklType)
break;
@@ -36,8 +36,6 @@ public enum L2SkillType
// Damage
SIGNET(L2SkillSignet.class),
SIGNET_CASTTIME(L2SkillSignetCasttime.class),
- // Disablers
- CONFUSE_MOB_ONLY,
// reco
GIVE_RECO,
// Aggro
@@ -76,11 +74,6 @@ public enum L2SkillType
FUSION,
RESURRECT,
- BEAST_FEED,
- BEAST_RELEASE,
- BEAST_RELEASE_ALL,
- BEAST_SKILL,
- BEAST_ACCOMPANY,
DETECT_TRAP,
REMOVE_TRAP,
SHIFT_TARGET,