better hitboxes for blockhunt

1 files changed, 6 insertions, 9 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/Disguiser.java b/src/main/java/net/tylermurphy/hideAndSeek/game/Disguiser.java
index a8ac441..a14827b 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/game/Disguiser.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/Disguiser.java
@@ -1,16 +1,12 @@
 package net.tylermurphy.hideAndSeek.game;
 
 import net.tylermurphy.hideAndSeek.game.util.Disguise;
-import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
-import org.bukkit.util.BlockVector;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Optional;
-import java.util.Vector;
 
 public class Disguiser {
 
@@ -32,11 +28,8 @@ public class Disguiser {
     }
 
     @Nullable
-    public Disguise getByBlockLocation(BlockVector loc){
-        return disguises.values().stream().filter(disguise -> {
-            if(disguise.getSolidLocation() == null) return false;
-            return disguise.getSolidLocation().toVector().toBlockVector() == loc;
-        }).findFirst().orElse(null);
+    public Disguise getByHitBoxID(int ID){
+        return disguises.values().stream().filter(disguise -> disguise.getHitBoxID() == ID).findFirst().orElse(null);
     }
 
     public void check(){
@@ -66,4 +59,8 @@ public class Disguiser {
         disguises.remove(player);
     }
 
+    public void cleanUp() {
+        disguises.values().forEach(Disguise::remove);
+    }
+
 }