Browse Source

BETA: Core Part for [DP9771].
* Added null check for L2CommandChannel#equals().
* Reported by: jurchiks

Adry_85 12 năm trước cách đây
mục cha
commit
1c03c916d1

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2CommandChannel.java

@@ -262,6 +262,6 @@ public class L2CommandChannel extends AbstractPlayerGroup
 	 */
 	public boolean equals(L2CommandChannel cc)
 	{
-		return (getLeaderObjectId() == cc.getLeaderObjectId());
+		return (cc != null) && (getLeaderObjectId() == cc.getLeaderObjectId());
 	}
 }

+ 0 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -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:

+ 0 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java

@@ -9417,7 +9417,6 @@ public final class L2PcInstance extends L2Playable
 				{
 					switch (sklType)
 					{
-						case BEAST_FEED:
 						case DELUXE_KEY_UNLOCK:
 						case UNLOCK:
 							break;

+ 0 - 7
L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/L2SkillType.java

@@ -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,