2 files changed, 8 insertions, 1 deletions
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/Disguiser.java b/src/main/java/net/tylermurphy/hideAndSeek/game/Disguiser.java
index a14827b..2f8cbf6 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/game/Disguiser.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/Disguiser.java
@@ -1,5 +1,7 @@
 package net.tylermurphy.hideAndSeek.game;
 
+import static net.tylermurphy.hideAndSeek.configuration.Config.*;
+
 import net.tylermurphy.hideAndSeek.game.util.Disguise;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -46,6 +48,10 @@ public class Disguiser {
     }
 
     public void disguise(Player player, Material material){
+        if(!blockhuntEnabled){
+            player.sendMessage(errorPrefix + "Please enable blockhunt in config.yml to enable disguises. Blockhunt does not work on 1.8");
+            return;
+        }
         if(disguises.containsKey(player)){
             disguises.get(player).remove();
         }
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/util/Disguise.java b/src/main/java/net/tylermurphy/hideAndSeek/game/util/Disguise.java
index b0f18a9..e29350b 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/game/util/Disguise.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/util/Disguise.java
@@ -92,7 +92,6 @@ public class Disguise {
                 solid = true;
                 blockLocation = hider.getLocation().getBlock().getLocation();
                 respawnHitbox();
-                teleportEntity(hitBox, true);
             }
             sendBlockUpdate(blockLocation, material);
         } else if(solid){
@@ -104,6 +103,7 @@ public class Disguise {
             sendBlockUpdate(blockLocation, Material.AIR);
         }
         toggleEntityVisibility(block, !solid);
+        teleportEntity(hitBox, true);
         teleportEntity(block, solid);
     }
 
@@ -122,6 +122,7 @@ public class Disguise {
     }
 
     private void teleportEntity(Entity entity, boolean center) {
+        if(entity == null) return;
         EntityTeleportPacket packet = new EntityTeleportPacket();
         packet.setEntity(entity);
         double x,y,z;