Only match all poses if no trigger var specified

TheComputerGeek2 · Jan 15, 2024 · f8f457e · f8f457e
1 parent 58f27eb
commit f8f457e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/core/src/main/java/com/nisovin/magicspells/spells/passive/StartPoseListener.java b/core/src/main/java/com/nisovin/magicspells/spells/passive/StartPoseListener.java
@@ -14,14 +14,15 @@
 
 public class StartPoseListener extends PassiveListener {
 
-	private final Set<Pose> poses = EnumSet.noneOf(Pose.class);
+	private Set<Pose> poses;
 
 	@Override
 	public void initialize(String var) {
 		if (var == null || var.isEmpty()) return;
 
-		String[] split = var.split(",");
-		for (String pose : split) {
+		poses = EnumSet.noneOf(Pose.class);
+
+		for (String pose : var.split(",")) {
 			try {
 				poses.add(Pose.valueOf(pose.trim().toUpperCase()));
 			} catch (IllegalArgumentException e) {
@@ -34,7 +35,7 @@ public void initialize(String var) {
 	@EventHandler
 	public void onPoseChange(EntityPoseChangeEvent event) {
 		if (!(event.getEntity() instanceof LivingEntity caster) || !canTrigger(caster) || !hasSpell(caster)) return;
-		if (!poses.isEmpty() && !poses.contains(event.getPose())) return;
+		if (poses != null && !poses.contains(event.getPose())) return;
 
 		passiveSpell.activate(caster);
 	}

diff --git a/core/src/main/java/com/nisovin/magicspells/spells/passive/StopPoseListener.java b/core/src/main/java/com/nisovin/magicspells/spells/passive/StopPoseListener.java
@@ -14,14 +14,15 @@
 
 public class StopPoseListener extends PassiveListener {
 
-	private final Set<Pose> poses = EnumSet.noneOf(Pose.class);
+	private Set<Pose> poses;
 
 	@Override
 	public void initialize(String var) {
 		if (var == null || var.isEmpty()) return;
 
-		String[] split = var.split(",");
-		for (String pose : split) {
+		poses = EnumSet.noneOf(Pose.class);
+
+		for (String pose : var.split(",")) {
 			try {
 				poses.add(Pose.valueOf(pose.trim().toUpperCase()));
 			} catch (IllegalArgumentException e) {
@@ -34,7 +35,7 @@ public void initialize(String var) {
 	@EventHandler
 	public void onPoseChange(EntityPoseChangeEvent event) {
 		if (!(event.getEntity() instanceof LivingEntity caster) || !canTrigger(caster) || !hasSpell(caster)) return;
-		if (!poses.isEmpty() && !poses.contains(caster.getPose())) return;
+		if (poses != null && !poses.contains(caster.getPose())) return;
 
 		passiveSpell.activate(caster);
 	}