diff options
Diffstat (limited to 'src/main/java/net/tylermurphy/hideAndSeek/game/Game.java')
| -rw-r--r-- | src/main/java/net/tylermurphy/hideAndSeek/game/Game.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java b/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java index f30f4d1..55e78b5 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java @@ -91,7 +91,7 @@ public class Game { if(status == Status.STARTING || status == Status.PLAYING) return; if(mapSaveEnabled && worldLoader.getWorld() != null) { worldLoader.rollback(); - } else { + } else if(mapSaveEnabled) { worldLoader.loadMap(); } Board.reload(); @@ -302,6 +302,9 @@ public class Game { Board.addHider(player); if(announceMessagesToNonPlayers) Bukkit.broadcastMessage(messagePrefix + message("GAME_JOIN").addPlayer(player)); else Game.broadcastMessage(messagePrefix + message("GAME_JOIN").addPlayer(player)); + for(PotionEffect effect : player.getActivePotionEffects()){ + player.removePotionEffect(effect.getType()); + } player.setGameMode(GameMode.ADVENTURE); Board.createLobbyBoard(player); Board.reloadLobbyBoards(); @@ -348,6 +351,9 @@ public class Game { Board.reloadGameBoards(); Board.reloadBoardTeams(); } + for(PotionEffect effect : player.getActivePotionEffects()){ + player.removePotionEffect(effect.getType()); + } if(bungeeLeave) { ByteArrayDataOutput out = ByteStreams.newDataOutput(); out.writeUTF("Connect"); |