Merge pull request #1 from GreenSurvivors/dev

Fixing not visible tool-points
GreenSurvivors · Mar 8, 2022 · c87ed8e · c87ed8e
2 parents c46645e + 1663f14
commit c87ed8e
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 33 deletions.
diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/PlayerLoadout.java b/Minigames/src/main/java/au/com/mineauz/minigames/PlayerLoadout.java
@@ -138,7 +138,7 @@ public void equiptLoadout(MinigamePlayer player) {
         }
         if (!itemSlot.isEmpty()) {
             for (Integer slot : itemSlot.keySet()) {
-                if (slot < 100)
+                if (slot < 100 && slot >= 0)
                     player.getPlayer().getInventory().setItem(slot, getItem(slot));
                 else if (slot == 100)
                     player.getPlayer().getInventory().setBoots(getItem(slot));

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemDisplayLoadout.java b/Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemDisplayLoadout.java
@@ -133,7 +133,7 @@ public ItemStack onClick() {
         loadoutMenu.displayMenu(getContainer().getViewer());
 
         for (Integer item : loadout.getItems()) {
-            if (item < 100)
+            if (item < 100 && item >= 0)
                 loadoutMenu.addItemStack(loadout.getItem(item), item);
             else if (item == 100)
                 loadoutMenu.addItemStack(loadout.getItem(item), 39);

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/tool/EndPositionMode.java b/Minigames/src/main/java/au/com/mineauz/minigames/tool/EndPositionMode.java
@@ -58,7 +58,7 @@ public void onEntityRightClick(MinigamePlayer player, Minigame minigame, Team te
     @Override
     public void select(MinigamePlayer player, Minigame minigame, Team team) {
         if (minigame.getEndPosition() != null) {
-            player.getPlayer().sendBlockChange(minigame.getEndPosition(), Material.SKELETON_SKULL, (byte) 1);
+            player.getPlayer().sendBlockChange(minigame.getEndPosition(), Material.SKELETON_SKULL.createBlockData());
             player.sendInfoMessage("Selected end position (marked with skull)");
         } else {
             player.sendMessage("No end position set!", MinigameMessageType.ERROR);

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/tool/LobbyPositionMode.java b/Minigames/src/main/java/au/com/mineauz/minigames/tool/LobbyPositionMode.java
@@ -58,7 +58,7 @@ public void onEntityRightClick(MinigamePlayer player, Minigame minigame, Team te
     @Override
     public void select(MinigamePlayer player, Minigame minigame, Team team) {
         if (minigame.getLobbyPosition() != null) {
-            player.getPlayer().sendBlockChange(minigame.getLobbyPosition(), Material.SKELETON_SKULL, (byte) 1);
+            player.getPlayer().sendBlockChange(minigame.getLobbyPosition(), Material.SKELETON_SKULL.createBlockData());
             player.sendInfoMessage("Selected lobby position (marked with skull)");
         } else {
             player.sendMessage("No lobby position set!", MinigameMessageType.ERROR);

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/tool/QuitPositionMode.java b/Minigames/src/main/java/au/com/mineauz/minigames/tool/QuitPositionMode.java
@@ -58,7 +58,7 @@ public void onEntityRightClick(MinigamePlayer player, Minigame minigame, Team te
     @Override
     public void select(MinigamePlayer player, Minigame minigame, Team team) {
         if (minigame.getQuitPosition() != null) {
-            player.getPlayer().sendBlockChange(minigame.getQuitPosition(), Material.SKELETON_SKULL, (byte) 1);
+            player.getPlayer().sendBlockChange(minigame.getQuitPosition(), Material.SKELETON_SKULL.createBlockData());
             player.sendInfoMessage("Selected quit position (marked with skull)");
         } else {
             player.sendMessage("No quit position set!", MinigameMessageType.ERROR);

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/tool/SpectatorPositionMode.java b/Minigames/src/main/java/au/com/mineauz/minigames/tool/SpectatorPositionMode.java
@@ -58,7 +58,7 @@ public void onEntityRightClick(MinigamePlayer player, Minigame minigame, Team te
     @Override
     public void select(MinigamePlayer player, Minigame minigame, Team team) {
         if (minigame.getSpectatorLocation() != null) {
-            player.getPlayer().sendBlockChange(minigame.getSpectatorLocation(), Material.SKELETON_SKULL, (byte) 1);
+            player.getPlayer().sendBlockChange(minigame.getSpectatorLocation(), Material.SKELETON_SKULL.createBlockData());
             player.sendInfoMessage("Selected spectator position (marked with skull).");
         } else {
             player.sendMessage("No spectator position set!", MinigameMessageType.ERROR);

diff --git a/Minigames/src/main/java/au/com/mineauz/minigames/tool/StartPositionMode.java b/Minigames/src/main/java/au/com/mineauz/minigames/tool/StartPositionMode.java
@@ -116,13 +116,13 @@ public void onEntityRightClick(MinigamePlayer player, Minigame minigame, Team te
     public void select(MinigamePlayer player, Minigame minigame, Team team) {
         if (team != null) {
             for (Location loc : team.getStartLocations()) {
-                player.getPlayer().sendBlockChange(loc, Material.SKELETON_SKULL, (byte) 1);
+                player.getPlayer().sendBlockChange(loc, Material.SKELETON_SKULL.createBlockData());
             }
             player.sendInfoMessage("Selected " + team.getChatColor() + team.getDisplayName() + ChatColor.WHITE +
                     " start points in " + minigame);
         } else {
             for (Location loc : minigame.getStartLocations()) {
-                player.getPlayer().sendBlockChange(loc, Material.SKELETON_SKULL, (byte) 1);
+                player.getPlayer().sendBlockChange(loc, Material.SKELETON_SKULL.createBlockData());
             }
             player.sendInfoMessage("Selected start points in " + minigame);
         }

diff --git a/Regions/src/main/java/au/com/mineauz/minigamesregions/RegionEvents.java b/Regions/src/main/java/au/com/mineauz/minigamesregions/RegionEvents.java
@@ -13,6 +13,7 @@
 import au.com.mineauz.minigamesregions.triggers.Triggers;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
+import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -231,34 +232,13 @@ private void interactNode(PlayerInteractEvent event){
 
         if (!event.isCancelled()) {
             if (event.getAction() == Action.PHYSICAL) {
-                switch (event.getClickedBlock().getType()) {
-                    case STONE_PRESSURE_PLATE:
-                    case ACACIA_PRESSURE_PLATE:
-                    case LIGHT_WEIGHTED_PRESSURE_PLATE:
-                    case HEAVY_WEIGHTED_PRESSURE_PLATE:
-                    case BIRCH_PRESSURE_PLATE:
-                    case DARK_OAK_PRESSURE_PLATE:
-                    case JUNGLE_PRESSURE_PLATE:
-                    case OAK_PRESSURE_PLATE:
-                    case SPRUCE_PRESSURE_PLATE:
+                if (event.getClickedBlock().getType().toString().contains("PRESSURE_PLATE")) {
                     trigger(ply, event.getClickedBlock(), Triggers.getTrigger("INTERACT"));
-                    break;
-                default:
-                    break;
                 }
             } else if (event.getAction() == Action.RIGHT_CLICK_BLOCK) {
-                switch (event.getClickedBlock().getType()) {
-                    case ACACIA_BUTTON:
-                    case BIRCH_BUTTON:
-                    case DARK_OAK_BUTTON:
-                    case JUNGLE_BUTTON:
-                    case OAK_BUTTON:
-                    case SPRUCE_BUTTON:
-                    case STONE_BUTTON:
-                        trigger(ply, event.getClickedBlock(), Triggers.getTrigger("INTERACT"));
-                        break;
-                    default:
-                        break;
+                if (event.getClickedBlock().getType().toString().contains("BUTTON") ||
+                        event.getClickedBlock().getType() == Material.LEVER) {
+                    trigger(ply, event.getClickedBlock(), Triggers.getTrigger("INTERACT"));
                 }
             }
         }