Merge pull request #261 from TiagoFar78/bugsFixing

Fix small bugs
TiagoFar78 · Jun 16, 2024 · 4976d27 · 4976d27
2 parents c0918a8 + 42ab04a
commit 4976d27
Show file tree

Hide file tree

Showing 15 changed files with 95 additions and 12 deletions.
diff --git a/src/main/java/net/tiagofar78/prisonescape/game/PEGame.java b/src/main/java/net/tiagofar78/prisonescape/game/PEGame.java
@@ -5,6 +5,7 @@
 import net.tiagofar78.prisonescape.bukkit.BukkitSoundBoard;
 import net.tiagofar78.prisonescape.bukkit.BukkitTeleporter;
 import net.tiagofar78.prisonescape.bukkit.BukkitWorldEditor;
+import net.tiagofar78.prisonescape.game.phases.Disabled;
 import net.tiagofar78.prisonescape.game.phases.Finished;
 import net.tiagofar78.prisonescape.game.phases.Phase;
 import net.tiagofar78.prisonescape.game.phases.Waiting;
@@ -118,6 +119,7 @@ public int playerJoin(String playerName) {
 
         BukkitTeleporter.teleport(player, _prison.getWaitingLobbyLocation());
         player.setKit(new TeamSelectorKit());
+        player.clearEffects();
 
         int maxPlayers = config.getMaxPlayers();
         int playerNumber = _playersOnLobby.size();
@@ -417,6 +419,12 @@ public void run() {
     }
 
     private void disableGame() {
+        if (_phase.isGameDisabled()) {
+            return;
+        }
+
+        _phase = new Disabled();
+
         for (PEPlayer player : _playersOnLobby) {
             teleportToLeavingLocation(player);
             player.removeScoreboard();

diff --git a/src/main/java/net/tiagofar78/prisonescape/game/PEPlayer.java b/src/main/java/net/tiagofar78/prisonescape/game/PEPlayer.java
@@ -369,6 +369,17 @@ public void setEffect(PotionEffectType effect, int seconds, int level) {
         player.addPotionEffect(new PotionEffect(effect, ticksDuration, level));
     }
 
+    public void clearEffects() {
+        Player player = Bukkit.getPlayer(getName());
+        if (player == null || !player.isOnline()) {
+            return;
+        }
+
+        for (PotionEffect effect : player.getActivePotionEffects()) {
+            player.removePotionEffect(effect.getType());
+        }
+    }
+
     private void setItemBukkit(int index, Item item) {
         Player bukkitPlayer = Bukkit.getPlayer(getName());
         if (bukkitPlayer == null || !bukkitPlayer.isOnline()) {

diff --git a/src/main/java/net/tiagofar78/prisonescape/game/phases/Disabled.java b/src/main/java/net/tiagofar78/prisonescape/game/phases/Disabled.java
@@ -0,0 +1,30 @@
+package net.tiagofar78.prisonescape.game.phases;
+
+public class Disabled extends Phase {
+
+    @Override
+    public Phase next() {
+        return null;
+    }
+
+    @Override
+    public boolean isClockStopped() {
+        return true;
+    }
+
+    @Override
+    public boolean hasGameStarted() {
+        return true;
+    }
+
+    @Override
+    public boolean hasGameEnded() {
+        return true;
+    }
+
+    @Override
+    public boolean isGameDisabled() {
+        return true;
+    }
+
+}
diff --git a/src/main/java/net/tiagofar78/prisonescape/game/phases/Finished.java b/src/main/java/net/tiagofar78/prisonescape/game/phases/Finished.java
@@ -4,7 +4,7 @@ public class Finished extends Phase {
 
     @Override
     public Phase next() {
-        return null;
+        return new Disabled();
     }
 
     @Override
@@ -21,4 +21,9 @@ public boolean hasGameStarted() {
     public boolean hasGameEnded() {
         return true;
     }
+
+    @Override
+    public boolean isGameDisabled() {
+        return false;
+    }
 }
diff --git a/src/main/java/net/tiagofar78/prisonescape/game/phases/Ongoing.java b/src/main/java/net/tiagofar78/prisonescape/game/phases/Ongoing.java
@@ -21,4 +21,9 @@ public boolean hasGameStarted() {
     public boolean hasGameEnded() {
         return false;
     }
+
+    @Override
+    public boolean isGameDisabled() {
+        return false;
+    }
 }
diff --git a/src/main/java/net/tiagofar78/prisonescape/game/phases/Phase.java b/src/main/java/net/tiagofar78/prisonescape/game/phases/Phase.java
@@ -10,4 +10,6 @@ public abstract class Phase {
 
     public abstract boolean hasGameEnded();
 
+    public abstract boolean isGameDisabled();
+
 }
diff --git a/src/main/java/net/tiagofar78/prisonescape/game/phases/Waiting.java b/src/main/java/net/tiagofar78/prisonescape/game/phases/Waiting.java
@@ -21,4 +21,9 @@ public boolean hasGameStarted() {
     public boolean hasGameEnded() {
         return false;
     }
+
+    @Override
+    public boolean isGameDisabled() {
+        return false;
+    }
 }
diff --git a/src/main/java/net/tiagofar78/prisonescape/game/prisonbuilding/PrisonBuilding.java b/src/main/java/net/tiagofar78/prisonescape/game/prisonbuilding/PrisonBuilding.java
@@ -100,19 +100,19 @@ public PrisonBuilding(Location reference) {
         _doors = new Hashtable<>();
         for (Location loc : config.getGoldenDoorsLocations()) {
             Location referenceLoc = loc.add(reference);
-            GoldenDoor goldenDoor = new GoldenDoor();
+            GoldenDoor goldenDoor = new GoldenDoor(referenceLoc);
             _doors.put(referenceLoc, goldenDoor);
             _doors.put(referenceLoc.clone().add(0, 1, 0), goldenDoor);
         }
         for (Location loc : config.getGrayDoorsLocations()) {
             Location referenceLoc = loc.add(reference);
-            GrayDoor grayDoor = new GrayDoor();
+            GrayDoor grayDoor = new GrayDoor(referenceLoc);
             _doors.put(referenceLoc, grayDoor);
             _doors.put(referenceLoc.clone().add(0, 1, 0), grayDoor);
         }
         for (Location loc : config.getCodeDoorsLocations()) {
             Location referenceLoc = loc.add(reference);
-            CodeDoor codeDoor = new CodeDoor();
+            CodeDoor codeDoor = new CodeDoor(referenceLoc);
             _doors.put(referenceLoc, codeDoor);
             _doors.put(referenceLoc.clone().add(0, 1, 0), codeDoor);
         }

diff --git a/src/main/java/net/tiagofar78/prisonescape/game/prisonbuilding/doors/CellDoor.java b/src/main/java/net/tiagofar78/prisonescape/game/prisonbuilding/doors/CellDoor.java
@@ -10,6 +10,7 @@ public class CellDoor extends Door {
     private Location _location;
 
     public CellDoor(Location location) {
+        super(location);
         _location = location;
     }
 

diff --git a/src/main/java/net/tiagofar78/prisonescape/game/prisonbuilding/doors/CodeDoor.java b/src/main/java/net/tiagofar78/prisonescape/game/prisonbuilding/doors/CodeDoor.java
@@ -5,10 +5,12 @@
 import net.tiagofar78.prisonescape.items.Item;
 import net.tiagofar78.prisonescape.managers.GameManager;
 
+import org.bukkit.Location;
+
 public class CodeDoor extends Door {
 
-    public CodeDoor() {
-        super();
+    public CodeDoor(Location location) {
+        super(location);
     }
 
     public ClickDoorReturnAction click(PEPlayer player, Item itemHeld) {

diff --git a/src/main/java/net/tiagofar78/prisonescape/game/prisonbuilding/doors/Door.java b/src/main/java/net/tiagofar78/prisonescape/game/prisonbuilding/doors/Door.java
@@ -11,8 +11,8 @@ public abstract class Door {
 
     private boolean _isOpen;
 
-    public Door() {
-        _isOpen = false;
+    public Door(Location location) {
+        close(location);
     }
 
     public boolean isOpened() {

diff --git a/src/main/java/net/tiagofar78/prisonescape/game/prisonbuilding/doors/GoldenDoor.java b/src/main/java/net/tiagofar78/prisonescape/game/prisonbuilding/doors/GoldenDoor.java
@@ -6,10 +6,12 @@
 import net.tiagofar78.prisonescape.items.Item;
 import net.tiagofar78.prisonescape.managers.GameManager;
 
+import org.bukkit.Location;
+
 public class GoldenDoor extends Door {
 
-    public GoldenDoor() {
-        super();
+    public GoldenDoor(Location location) {
+        super(location);
     }
 
     public ClickDoorReturnAction click(PEPlayer player, Item itemHeld) {

diff --git a/src/main/java/net/tiagofar78/prisonescape/game/prisonbuilding/doors/GrayDoor.java b/src/main/java/net/tiagofar78/prisonescape/game/prisonbuilding/doors/GrayDoor.java
@@ -6,8 +6,14 @@
 import net.tiagofar78.prisonescape.items.Item;
 import net.tiagofar78.prisonescape.managers.GameManager;
 
+import org.bukkit.Location;
+
 public class GrayDoor extends Door {
 
+    public GrayDoor(Location location) {
+        super(location);
+    }
+
     public ClickDoorReturnAction click(PEPlayer player, Item itemHeld) {
         PEGame game = GameManager.getGame();
         boolean isOpened = isOpened();

diff --git a/src/main/java/net/tiagofar78/prisonescape/items/BombItem.java b/src/main/java/net/tiagofar78/prisonescape/items/BombItem.java
@@ -1,11 +1,13 @@
 package net.tiagofar78.prisonescape.items;
 
+import net.tiagofar78.prisonescape.game.PEGame;
 import net.tiagofar78.prisonescape.managers.GameManager;
 
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
+import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerInteractEvent;
 
 import java.util.ArrayList;
@@ -35,8 +37,12 @@ public void use(PlayerInteractEvent e) {
             return;
         }
 
+        PEGame game = GameManager.getGame();
         Location blockLoc = getPlacedBlockLocation(block.getLocation(), e.getBlockFace());
-        GameManager.getGame().placeBomb(blockLoc);
+        game.placeBomb(blockLoc);
+
+        Player player = e.getPlayer();
+        game.getPEPlayer(player.getName()).removeItem(player.getInventory().getHeldItemSlot());
     }
 
     private Location getPlacedBlockLocation(Location blockLocation, BlockFace face) {

diff --git a/src/main/java/net/tiagofar78/prisonescape/items/GoldenKeyItem.java b/src/main/java/net/tiagofar78/prisonescape/items/GoldenKeyItem.java
@@ -19,7 +19,7 @@ public boolean isIllegal() {
 
     @Override
     public Material getMaterial() {
-        return Material.TORCH;
+        return Material.BLAZE_ROD;
     }
 
     @Override
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,4 +10,6 @@ public abstract class Phase {

		public abstract boolean hasGameEnded();

		public abstract boolean isGameDisabled();

		}