瀏覽代碼

BETA: Core cleanup after [DP8648], if you want to keep backward compatibility skip this change set.

Zoey76 13 年之前
父節點
當前提交
694c76e5ad
共有 1 個文件被更改,包括 3 次插入8 次删除
  1. 3 8
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/L2SkillOpType.java

+ 3 - 8
L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/L2SkillOpType.java

@@ -29,7 +29,6 @@ package com.l2jserver.gameserver.model.skills;
  * 	<li>P = Passive Skill</li>
  * 	<li>P = Passive Skill</li>
  * 	<li>T = Toggle Skill</li>
  * 	<li>T = Toggle Skill</li>
  * </ul>
  * </ul>
- * TODO: Remove old types, keeping them for backward compatibility.
  * @author Zoey76
  * @author Zoey76
  */
  */
 public enum L2SkillOpType
 public enum L2SkillOpType
@@ -43,10 +42,7 @@ public enum L2SkillOpType
 	DA1,
 	DA1,
 	DA2,
 	DA2,
 	P,
 	P,
-	T,
-	OP_ACTIVE,
-	OP_PASSIVE,
-	OP_TOGGLE;
+	T;
 	
 	
 	/**
 	/**
 	 * @return {@code true} if the operative skill type is active, {@code false} otherwise.
 	 * @return {@code true} if the operative skill type is active, {@code false} otherwise.
@@ -63,7 +59,6 @@ public enum L2SkillOpType
 			case CA5:
 			case CA5:
 			case DA1:
 			case DA1:
 			case DA2:
 			case DA2:
-			case OP_ACTIVE:
 				return true;
 				return true;
 			default:
 			default:
 				return false;
 				return false;
@@ -75,7 +70,7 @@ public enum L2SkillOpType
 	 */
 	 */
 	public boolean isPassive()
 	public boolean isPassive()
 	{
 	{
-		return (this == P) || (this == OP_PASSIVE);
+		return (this == P);
 	}
 	}
 	
 	
 	/**
 	/**
@@ -83,6 +78,6 @@ public enum L2SkillOpType
 	 */
 	 */
 	public boolean isToggle()
 	public boolean isToggle()
 	{
 	{
-		return (this == T) || (this == OP_TOGGLE);
+		return (this == T);
 	}
 	}
 }
 }