Name Change for Distance Conditions

ShinyDeagle · TheComputerGeek2 · commit 740e897a4aaa · 2018-04-29T11:42:41.000-07:00
To keep a consistent naming scheme for all modifiers. This should be appropriate.
diff --git a/src/com/nisovin/magicspells/castmodifiers/Condition.java b/src/com/nisovin/magicspells/castmodifiers/Condition.java
@@ -108,8 +108,8 @@ static Condition getConditionByName(String name) {
 		conditions.put("playeronline", PlayerOnlineCondition.class);
 		conditions.put("chance", ChanceCondition.class);
 		conditions.put("entitytype", EntityTypeCondition.class);
-		conditions.put("distancemorethan", DistanceMoreThan.class);
-		conditions.put("distancelessthan", DistanceLessThan.class);
+		conditions.put("distancemorethan", DistanceMoreThanCondition.class);
+		conditions.put("distancelessthan", DistanceLessThanCondition.class);
 		conditions.put("name", NameCondition.class);
 		conditions.put("namepattern", NamePatternCondition.class);
 		conditions.put("uptime", UpTimeCondition.class);
@@ -119,16 +119,16 @@ static Condition getConditionByName(String name) {
 		conditions.put("variablecompare", VariableCompareCondition.class);
 		conditions.put("variablematches", VariableMatchesCondition.class);
 		conditions.put("variablestringequals", VariableStringEqualsCondition.class);
-		conditions.put("alivelessthan", AliveLessThan.class);
-		conditions.put("alivemorethan", AliveMoreThan.class);
-		conditions.put("lastlifelongerthan", LastLifeLongerThan.class);
-		conditions.put("lastlifeshorterthan", LastLifeShorterThan.class);
+		conditions.put("alivelessthan", AliveLessThanCondition.class);
+		conditions.put("alivemorethan", AliveMoreThanCondition.class);
+		conditions.put("lastlifelongerthan", LastLifeLongerThanCondition.class);
+		conditions.put("lastlifeshorterthan", LastLifeShorterThanCondition.class);
 		conditions.put("testforblock", TestForBlockCondition.class);
 		conditions.put("richerthan", RicherThanCondition.class);
 		conditions.put("lookingatblock", LookingAtBlockCondition.class);
 		conditions.put("oncooldown", OnCooldownCondition.class);
 		conditions.put("hasmark", HasMarkCondition.class);
-		conditions.put("playercountabove", PlayerCountAbove.class);
+		conditions.put("playercountabove", PlayerCountAboveCondition.class);
 		conditions.put("targetmaxhealthgreaterthan", TargetMaxHealthGreaterThanCondition.class);
 		conditions.put("targetmaxhealthlessthan", TargetMaxHealthLessThanCondition.class);
 		conditions.put("worldguardmembership", WorldGuardRegionMembershipCondition.class);
diff --git a/src/com/nisovin/magicspells/castmodifiers/conditions/AliveLessThanCondition.java b/src/com/nisovin/magicspells/castmodifiers/conditions/AliveLessThanCondition.java
@@ -8,8 +8,8 @@
 import com.nisovin.magicspells.MagicSpells;
 import com.nisovin.magicspells.castmodifiers.Condition;
 
-public class AliveLessThan extends Condition {
 	
+public class AliveLessThanCondition extends Condition {
 	int time;
 	
 	@Override
diff --git a/src/com/nisovin/magicspells/castmodifiers/conditions/AliveMoreThanCondition.java b/src/com/nisovin/magicspells/castmodifiers/conditions/AliveMoreThanCondition.java
@@ -8,8 +8,8 @@
 import com.nisovin.magicspells.MagicSpells;
 import com.nisovin.magicspells.castmodifiers.Condition;
 
-public class AliveMoreThan extends Condition {
 	
+public class AliveMoreThanCondition extends Condition {
 	int time;
 	
 	@Override
diff --git a/src/com/nisovin/magicspells/castmodifiers/conditions/DistanceLessThanCondition.java b/src/com/nisovin/magicspells/castmodifiers/conditions/DistanceLessThanCondition.java
@@ -7,7 +7,7 @@
 import com.nisovin.magicspells.DebugHandler;
 import com.nisovin.magicspells.castmodifiers.Condition;
 
-public class DistanceLessThan extends Condition {
+public class DistanceLessThanCondition extends Condition {
 
 	private double distanceSq;
 	
diff --git a/src/com/nisovin/magicspells/castmodifiers/conditions/DistanceMoreThanCondition.java b/src/com/nisovin/magicspells/castmodifiers/conditions/DistanceMoreThanCondition.java
@@ -7,7 +7,7 @@
 import com.nisovin.magicspells.DebugHandler;
 import com.nisovin.magicspells.castmodifiers.Condition;
 
-public class DistanceMoreThan extends Condition {
+public class DistanceMoreThanCondition extends Condition {
 
 	private double distanceSq;
 	
diff --git a/src/com/nisovin/magicspells/castmodifiers/conditions/LastLifeLongerThanCondition.java b/src/com/nisovin/magicspells/castmodifiers/conditions/LastLifeLongerThanCondition.java
@@ -8,8 +8,8 @@
 import com.nisovin.magicspells.MagicSpells;
 import com.nisovin.magicspells.castmodifiers.Condition;
 
-public class LastLifeLongerThan extends Condition {
 	
+public class LastLifeLongerThanCondition extends Condition {
 	int time;
 	
 	@Override
diff --git a/src/com/nisovin/magicspells/castmodifiers/conditions/LastLifeShorterThanCondition.java b/src/com/nisovin/magicspells/castmodifiers/conditions/LastLifeShorterThanCondition.java
@@ -8,8 +8,8 @@
 import com.nisovin.magicspells.MagicSpells;
 import com.nisovin.magicspells.castmodifiers.Condition;
 
-public class LastLifeShorterThan extends Condition {
 	
+public class LastLifeShorterThanCondition extends Condition {
 	int time;
 	
 	@Override
diff --git a/src/com/nisovin/magicspells/castmodifiers/conditions/PlayerCountAboveCondition.java b/src/com/nisovin/magicspells/castmodifiers/conditions/PlayerCountAboveCondition.java
@@ -7,7 +7,7 @@
 
 import com.nisovin.magicspells.castmodifiers.Condition;
 
-public class PlayerCountAbove extends Condition {
+public class PlayerCountAboveCondition extends Condition {
 
 	int count;
 	
