diff options
| author | tylermurphy534 <tylermurphy534@gmail.com> | 2023-02-08 23:24:53 +0000 |
|---|---|---|
| committer | tylermurphy534 <tylermurphy534@gmail.com> | 2023-02-08 23:24:53 +0000 |
| commit | b87174e7701863f54ab26998feaf4bdaa9a0df20 (patch) | |
| tree | bf3cec7f3d0be7aa6bc26fc647a06527dfe49235 /src/main/java/net/tylermurphy/hideAndSeek/game/Game.java | |
| parent | Merge pull request '1.7.0 - Multi Map Support' (#4) from dev into main (diff) | |
| parent | update dependicies, fix worldborder, fix timer when player leaves, fix drop i... (diff) | |
| download | kenshinshideandseek-b87174e7701863f54ab26998feaf4bdaa9a0df20.tar.gz kenshinshideandseek-b87174e7701863f54ab26998feaf4bdaa9a0df20.tar.bz2 kenshinshideandseek-b87174e7701863f54ab26998feaf4bdaa9a0df20.zip | |
Merge pull request '1.7.1 - A few tweaks and bug squashes' (#5) from dev into main
Reviewed-on: https://g.tylerm.dev/tylermurphy534/KenshinsHideAndSeek/pulls/5
Diffstat (limited to 'src/main/java/net/tylermurphy/hideAndSeek/game/Game.java')
| -rw-r--r-- | src/main/java/net/tylermurphy/hideAndSeek/game/Game.java | 7 |
1 files changed, 6 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 e18a309..41df9b8 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java @@ -186,7 +186,9 @@ public class Game { PlayerLoader.unloadPlayer(player); if(saveInventory) { ItemStack[] data = Main.getInstance().getDatabase().getInventoryData().getInventory(player.getUniqueId()); - player.getInventory().setContents(data); + try { + player.getInventory().setContents(data); + } catch (NullPointerException ignored){} } if (announceMessagesToNonPlayers) Bukkit.broadcastMessage(messagePrefix + message("GAME_LEAVE").addPlayer(player)); else broadcastMessage(messagePrefix + message("GAME_LEAVE").addPlayer(player)); @@ -240,6 +242,9 @@ public class Game { } } else { lobbyTimer = -1; + if (gameTick % 20 == 0) { + board.reloadLobbyBoards(); + } } } |