block solidify time, seeker lobby

3 files changed, 5 insertions, 95 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java b/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java
index b3fd457..ac210a3 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java
@@ -333,6 +333,7 @@ public class Game {
 		if (spawnPosition.getBlockX() == 0 && spawnPosition.getBlockY() == 0 && spawnPosition.getBlockZ() == 0) return true;
 		if (lobbyPosition.getBlockX() == 0 && lobbyPosition.getBlockY() == 0 && lobbyPosition.getBlockZ() == 0) return true;
 		if (exitPosition.getBlockX() == 0 && exitPosition.getBlockY() == 0 && exitPosition.getBlockZ() == 0) return true;
+		if (seekerLobbyPosition.getBlockX() == 0 && seekerLobbyPosition.getBlockY() == 0 && seekerLobbyPosition.getBlockZ() == 0) return true;
 		if (mapSaveEnabled) {
 			File destination = new File(Main.getInstance().getWorldContainer() + File.separator + getGameWorld());
 			if (!destination.exists()) return true;
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/PlayerLoader.java b/src/main/java/net/tylermurphy/hideAndSeek/game/PlayerLoader.java
index bd35ab5..eedfabe 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/game/PlayerLoader.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/PlayerLoader.java
@@ -52,11 +52,8 @@ public class PlayerLoader {
     }
 
     public static void loadSeeker(Player player, String gameWorld){
-        player.teleport(new Location(Bukkit.getWorld(gameWorld), spawnPosition.getX(),spawnPosition.getY(),spawnPosition.getZ()));
+        player.teleport(new Location(Bukkit.getWorld(gameWorld), seekerLobbyPosition.getX(),seekerLobbyPosition.getY(),seekerLobbyPosition.getZ()));
         loadPlayer(player);
-        player.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS,1000000,127,false,false));
-        player.addPotionEffect(new PotionEffect(PotionEffectType.SLOW,1000000,127,false,false));
-        player.addPotionEffect(new PotionEffect(PotionEffectType.JUMP,1000000,128,false,false));
         Titles.sendTitle(player, 10, 70, 20, ChatColor.WHITE + "" + message("SEEKER_TEAM_NAME"), ChatColor.WHITE + message("SEEKERS_SUBTITLE").toString());
     }
 
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/listener/DisguiseHandler.java b/src/main/java/net/tylermurphy/hideAndSeek/game/listener/DisguiseHandler.java
index 10db324..cb8ad04 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/game/listener/DisguiseHandler.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/listener/DisguiseHandler.java
@@ -1,21 +1,19 @@
 package net.tylermurphy.hideAndSeek.game.listener;
 
 import static com.comphenix.protocol.PacketType.Play.Client.*;
+import static net.tylermurphy.hideAndSeek.configuration.Config.solidifyTime;
 
 import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.ProtocolManager;
 import com.comphenix.protocol.events.PacketAdapter;
 import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.events.PacketEvent;
-import com.cryptomorin.xseries.XMaterial;
 import net.tylermurphy.hideAndSeek.Main;
 import net.tylermurphy.hideAndSeek.game.util.Disguise;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
-import org.bukkit.Material;
 import org.bukkit.attribute.Attribute;
-import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -23,15 +21,9 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.potion.PotionEffect;
-import org.bukkit.potion.PotionEffectType;
-
 import java.util.ArrayList;
 import java.util.List;
 
-@SuppressWarnings("deprecation")
 public class DisguiseHandler implements Listener {
 
     private static final ProtocolManager protocolManager = ProtocolLibrary.getProtocolManager();
@@ -50,18 +42,11 @@ public class DisguiseHandler implements Listener {
             if(lastLocation.getWorld() != currentLocation.getWorld()) return;
             double distance = lastLocation.distance(currentLocation);
             disguise.setSolidify(distance < .1);
-        }, 40L);
+        }, solidifyTime);
         if(event.getFrom().distance(event.getTo()) > .1)
             disguise.setSolidify(false);
     }
 
-//    @EventHandler(priority = EventPriority.MONITOR)
-//    public void onInteract(PlayerInteractEvent event) {
-//        Action action = event.getAction();
-//        Player player = event.getPlayer();
-//        Block block = event.
-//    }
-
     private PacketAdapter createProtocol(){
         return new PacketAdapter(Main.getInstance(), USE_ENTITY) {
 
@@ -69,7 +54,6 @@ public class DisguiseHandler implements Listener {
             public void onPacketReceiving(PacketEvent event){
                 PacketContainer packet = event.getPacket();
                 Player player = event.getPlayer();
-//                if(!Main.getInstance().getBoard().isSeeker(player)) return;
                 int id = packet.getIntegers().read(0);
                 Disguise disguise = Main.getInstance().getDisguiser().getByEntityID(id);
                 if(disguise == null) disguise = Main.getInstance().getDisguiser().getByHitBoxID(id);
@@ -91,7 +75,7 @@ public class DisguiseHandler implements Listener {
         if(Main.getInstance().supports(9)) {
             amount = seeker.getAttribute(Attribute.GENERIC_ATTACK_DAMAGE).getValue();
         } else {
-            amount = getItemDamageValue(seeker.getItemInHand(), disguise.getPlayer(), seeker);
+            return; //1.8 is not supported in Blockhunt yet!!!
         }
 
         disguise.setSolidify(false);
@@ -112,76 +96,4 @@ public class DisguiseHandler implements Listener {
         Bukkit.getScheduler().scheduleSyncDelayedTask(Main.getInstance(), () -> debounce.remove(disguise.getPlayer()), 10);
     }
 
-    private int getItemDamageValue(ItemStack is, Player damaged, Player attacker) {
-        double damageValue = 0;
-        if (is != null) {
-            if (is.getType() == XMaterial.WOODEN_SWORD.parseMaterial()) {
-                damageValue = 5;
-            } else if (is.getType() == Material.STONE_SWORD) {
-                damageValue = 6;
-            } else if (is.getType() == Material.IRON_SWORD) {
-                damageValue = 7;
-            } else if (is.getType() == Material.DIAMOND_SWORD) {
-                damageValue = 8;
-            } else {
-                damageValue = 1;
-            }
-            damageValue += is.getEnchantmentLevel(Enchantment.DAMAGE_ALL);
-        }
-
-        if (damaged != null) {
-            Inventory i = damaged.getInventory();
-            Material helmet = i.getItem(39).getType();
-            Material chestplate = i.getItem(40).getType();
-            Material leggings = i.getItem(41).getType();
-            Material boots = i.getItem(42).getType();
-            if (helmet == Material.LEATHER_HELMET)
-                damageValue -= (0.5 / 1.5);
-                // value shown at bar above the health bar / 1.5
-            else if (helmet == Material.CHAINMAIL_HELMET
-                    || helmet == Material.IRON_HELMET
-                    || helmet == Material.DIAMOND_HELMET
-                    || helmet == XMaterial.GOLDEN_HELMET.parseMaterial())
-                damageValue -= (1 / 1.5);
-
-            if (chestplate == Material.LEATHER_CHESTPLATE)
-                damageValue -= (1.0);
-            else if (chestplate == Material.CHAINMAIL_CHESTPLATE
-                    || chestplate == XMaterial.GOLDEN_CHESTPLATE.parseMaterial())
-                damageValue -= (2.5 / 1.5);
-            else if (chestplate == Material.IRON_CHESTPLATE)
-                damageValue -= (3 / 1.5);
-            else if (chestplate == Material.DIAMOND_CHESTPLATE)
-                damageValue -= (4 / 1.5);
-
-            if (leggings == Material.LEATHER_LEGGINGS)
-                damageValue -= (1 / 1.5);
-            else if (leggings == XMaterial.GOLDEN_LEGGINGS.parseMaterial())
-                damageValue -= (1.0);
-            else if (leggings == Material.CHAINMAIL_LEGGINGS)
-                damageValue -= (2 / 1.5);
-            else if (leggings == Material.IRON_LEGGINGS)
-                damageValue -= (2.5 / 1.5);
-            else if (leggings == Material.DIAMOND_LEGGINGS)
-                damageValue -= (3 / 1.5);
-
-            if (boots == Material.LEATHER_BOOTS
-                    || boots == XMaterial.GOLDEN_BOOTS.parseMaterial()
-                    || boots == Material.CHAINMAIL_BOOTS)
-                damageValue -= (0.5 / 1.5);
-            else if (boots == Material.IRON_BOOTS)
-                damageValue -= (1 / 1.5);
-            else if (boots == Material.DIAMOND_BOOTS)
-                damageValue -= (1.0);
-        }
-
-        for (PotionEffect effect : attacker.getActivePotionEffects()){
-            if (effect.getType() == PotionEffectType.HARM) {
-                damageValue += effect.getAmplifier()*1.5;
-            }
-        }
-
-        return (int) Math.round(Math.max(damageValue, 0.0));
-    }
-
 }