BugFix: Fix unbinding player_move to unbind multiple player_move events if no threshold prefilter is supplied

When binding multiple player_move events without threshold prefilter and then unbinding one of those events, all events would not trigger anymore until another event with the default treshold prefilter would be bound. This bug is caused by the unbind code removing the default threshold without checking whether more events still use it.

Author: Pieter12345

src/main/java/com/laytonsmith/core/events/drivers/PlayerEvents.java

@@ -61,7 +61,6 @@
 import com.laytonsmith.core.events.BoundEvent.ActiveEvent;
 import com.laytonsmith.core.events.Driver;
 import com.laytonsmith.core.events.EventBuilder;
-import com.laytonsmith.core.events.EventUtils;
 import com.laytonsmith.core.events.Prefilters;
 import com.laytonsmith.core.events.Prefilters.PrefilterType;
 import com.laytonsmith.core.events.drivers.EntityEvents.entity_death;
@@ -78,7 +77,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.IllegalFormatConversionException;
 import java.util.List;
 import java.util.Map;
@@ -1876,10 +1874,10 @@ public boolean modifyEvent(String key, Construct value, BindableEvent event) {
 
 	}
 
-	private static final Set<Integer> THRESHOLD_LIST = new HashSet<>();
+	private static final Map<Integer, Integer> THRESHOLD_LIST = new HashMap<>();
 
 	public static Set<Integer> GetThresholdList() {
-		return THRESHOLD_LIST;
+		return THRESHOLD_LIST.keySet();
 	}
 
 	private static final Map<Integer, Map<String, MCLocation>> LAST_PLAYER_LOCATIONS = new HashMap<>();
@@ -1925,33 +1923,27 @@ public void hook() {
 
 		@Override
 		public void bind(BoundEvent event) {
-			int threshold = 1;
 			Map<String, Construct> prefilters = event.getPrefilter();
-			if(prefilters.containsKey("threshold")) {
-				threshold = Static.getInt32(prefilters.get("threshold"), Target.UNKNOWN);
-			}
-			THRESHOLD_LIST.add(threshold);
+			int threshold = (prefilters.containsKey("threshold")
+					? Static.getInt32(prefilters.get("threshold"), Target.UNKNOWN) : 1);
+			Integer count = THRESHOLD_LIST.get(threshold);
+			THRESHOLD_LIST.put(threshold, (count != null ? count + 1 : 1));
 		}
 
 		@Override
 		public void unbind(BoundEvent event) {
-			int threshold = 1;
 			Map<String, Construct> prefilters = event.getPrefilter();
-			if(prefilters.containsKey("threshold")) {
-				threshold = Static.getInt32(prefilters.get("threshold"), Target.UNKNOWN);
-			}
-			for(BoundEvent b : EventUtils.GetEvents(event.getDriver())) {
-				if(b.getId().equals(event.getId())) {
-					continue;
-				}
-				if(b.getPrefilter().containsKey("threshold")) {
-					if(threshold == Static.getInt(b.getPrefilter().get("threshold"), Target.UNKNOWN)) {
-						return;
-					}
+			int threshold = (prefilters.containsKey("threshold")
+					? Static.getInt32(prefilters.get("threshold"), Target.UNKNOWN) : 1);
+			Integer count = THRESHOLD_LIST.get(threshold);
+			if(count != null) {
+				if(count <= 1) {
+					THRESHOLD_LIST.remove(threshold);
+					LAST_PLAYER_LOCATIONS.remove(threshold);
+				} else {
+					THRESHOLD_LIST.put(threshold, count - 1);
 				}
 			}
-			THRESHOLD_LIST.remove(threshold);
-			LAST_PLAYER_LOCATIONS.remove(threshold);
 		}
 
 		@Override