Fixed issues with removing abilities

Author: Glasislundr

core/assets/BehaviorsConfigFile.json

@@ -525,6 +525,10 @@
 				"targetUnit": {
 					"type": "getCastingUnit"
 				},
+				"priority": {
+					"type": "rawPriority",
+					"priority": "CRITBASH"
+				},
 				"listener": {
 					"type": "getStoredAttackPreDamageListenerByKey",
 					"key": {
@@ -537,6 +541,10 @@
 				"targetUnit": {
 					"type": "getCastingUnit"
 				},
+				"priority": {
+					"type": "rawPriority",
+					"priority": "ACCURACY"
+				},
 				"listener": {
 					"type": "getStoredAttackPreDamageListenerByKey",
 					"key": {

core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAttackPostDamageListener.java

@@ -12,11 +12,11 @@
 public class ABActionRemoveAttackPostDamageListener implements ABAction {
 
 	private ABUnitCallback targetUnit;
-	private ABAttackPostDamageListenerCallback buff;
+	private ABAttackPostDamageListenerCallback listener;
 
 	public void runAction(final CSimulation game, final CUnit caster, final Map<String, Object> localStore) {
 		CUnit target = targetUnit.callback(game, caster, localStore);
 
-		target.removePostDamageListener(buff.callback(game, caster, localStore));
+		target.removePostDamageListener(listener.callback(game, caster, localStore));
 	}
 }

core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAttackPreDamageListener.java

@@ -14,11 +14,11 @@ public class ABActionRemoveAttackPreDamageListener implements ABAction {
 
 	private ABUnitCallback targetUnit;
 	private ABAttackPreDamageListenerPriorityCallback priority;
-	private ABAttackPreDamageListenerCallback buff;
+	private ABAttackPreDamageListenerCallback listener;
 
 	public void runAction(final CSimulation game, final CUnit caster, final Map<String, Object> localStore) {
 		CUnit target = targetUnit.callback(game, caster, localStore);
 
-		target.removePreDamageListener(priority.callback(game, caster, localStore), buff.callback(game, caster, localStore));
+		target.removePreDamageListener(priority.callback(game, caster, localStore), listener.callback(game, caster, localStore));
 	}
 }

core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveDamageTakenListener.java

@@ -12,11 +12,11 @@
 public class ABActionRemoveDamageTakenListener implements ABAction {
 
 	private ABUnitCallback targetUnit;
-	private ABDamageTakenListenerCallback buff;
+	private ABDamageTakenListenerCallback listener;
 
 	public void runAction(final CSimulation game, final CUnit caster, final Map<String, Object> localStore) {
 		CUnit target = targetUnit.callback(game, caster, localStore);
 
-		target.removeDamageTakenListener(buff.callback(game, caster, localStore));
+		target.removeDamageTakenListener(listener.callback(game, caster, localStore));
 	}
 }

core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveDamageTakenModificationListener.java

@@ -12,11 +12,11 @@
 public class ABActionRemoveDamageTakenModificationListener implements ABAction {
 
 	private ABUnitCallback targetUnit;
-	private ABDamageTakenModificationListenerCallback buff;
+	private ABDamageTakenModificationListenerCallback listener;
 
 	public void runAction(final CSimulation game, final CUnit caster, final Map<String, Object> localStore) {
 		CUnit target = targetUnit.callback(game, caster, localStore);
 
-		target.removeDamageTakenModificationListener(buff.callback(game, caster, localStore));
+		target.removeDamageTakenModificationListener(listener.callback(game, caster, localStore));
 	}
 }

core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveEvasionListener.java

@@ -12,11 +12,11 @@
 public class ABActionRemoveEvasionListener implements ABAction {
 
 	private ABUnitCallback targetUnit;
-	private ABEvasionListenerCallback buff;
+	private ABEvasionListenerCallback listener;
 
 	public void runAction(final CSimulation game, final CUnit caster, final Map<String, Object> localStore) {
 		CUnit target = targetUnit.callback(game, caster, localStore);
 
-		target.removeEvasionListener(buff.callback(game, caster, localStore));
+		target.removeEvasionListener(listener.callback(game, caster, localStore));
 	}
 }