From 276898dced41a114a6408ac6c10e80f63cadfe8a Mon Sep 17 00:00:00 2001 From: Chiss Date: Sun, 24 Nov 2013 21:58:55 +1100 Subject: [PATCH] HG --- .../arcade/game/games/hungergames/HungerGames.java | 10 ++-------- .../src/nautilus/game/arcade/managers/GameManager.java | 4 ++-- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hungergames/HungerGames.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hungergames/HungerGames.java index 30848aa80..41759a2d6 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hungergames/HungerGames.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hungergames/HungerGames.java @@ -728,6 +728,8 @@ public class HungerGames extends SoloGame if (change.Chunk.equals(loc.getChunk())) { change.AddChange(loc, id, data); + added = true; + break; } } if (!added) @@ -768,8 +770,6 @@ public class HungerGames extends SoloGame //XXX Simply replace this line with the the Multiblocks packet. MapUtil.SendChunkForPlayer(change.Chunk.getX(), change.Chunk.getZ(), player); - - player.sendMessage("Chunk Received: " + change.Chunk.getX() + ", " + change.Chunk.getZ()); } } @@ -1192,10 +1192,4 @@ public class HungerGames extends SoloGame { _redChunks.remove(event.getPlayer()); } - - @Override - public void EndCheck() - { - ///XXX REMOVE ME - } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java index abf6a29e6..9757b1f8d 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java @@ -99,7 +99,7 @@ public class GameManager implements Listener //Stop Countdown! if (game.GetCountdown() != -1 && UtilServer.getPlayers().length < Manager.GetPlayerMin() && - !game.GetCountdownForce() && game.GetType() != GameType.HungerGames) //XXX + !game.GetCountdownForce()) { game.SetCountdown(-1); Manager.GetLobby().DisplayWaiting(); @@ -124,7 +124,7 @@ public class GameManager implements Listener for (Player player : UtilServer.getPlayers()) player.playSound(player.getLocation(), Sound.NOTE_PLING, 2f, 2f); - if (game.GetPlayers(true).size() < 2 && game.GetType() != GameType.HungerGames) //XXX + if (game.GetPlayers(true).size() < 2) { game.Announce(C.cWhite + C.Bold + game.GetName() + " ended, not enough players!"); game.SetState(GameState.Dead);