JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HG

Browse Source
This commit is contained in:
Chiss 2013-11-24 21:58:55 +11:00
parent 4c7e42760b
commit 276898dced
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hungergames/HungerGames.java
View File

@ -728,6 +728,8 @@ public class HungerGames extends SoloGame
if (change.Chunk.equals(loc.getChunk())) if (change.Chunk.equals(loc.getChunk()))
{ {
change.AddChange(loc, id, data); change.AddChange(loc, id, data);
added = true;
break;
} }
} }
if (!added) if (!added)
@ -768,8 +770,6 @@ public class HungerGames extends SoloGame
//XXX Simply replace this line with the the Multiblocks packet. //XXX Simply replace this line with the the Multiblocks packet.
MapUtil.SendChunkForPlayer(change.Chunk.getX(), change.Chunk.getZ(), player); 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()); _redChunks.remove(event.getPlayer());
} }
@Override
public void EndCheck()
{
///XXX REMOVE ME
}
} }

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
View File

@ -99,7 +99,7 @@ public class GameManager implements Listener
//Stop Countdown! //Stop Countdown!
if (game.GetCountdown() != -1 && if (game.GetCountdown() != -1 &&
UtilServer.getPlayers().length < Manager.GetPlayerMin() && UtilServer.getPlayers().length < Manager.GetPlayerMin() &&
!game.GetCountdownForce() && game.GetType() != GameType.HungerGames) //XXX !game.GetCountdownForce())
{ {
game.SetCountdown(-1); game.SetCountdown(-1);
Manager.GetLobby().DisplayWaiting(); Manager.GetLobby().DisplayWaiting();
@ -124,7 +124,7 @@ public class GameManager implements Listener
for (Player player : UtilServer.getPlayers()) for (Player player : UtilServer.getPlayers())
player.playSound(player.getLocation(), Sound.NOTE_PLING, 2f, 2f); 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.Announce(C.cWhite + C.Bold + game.GetName() + " ended, not enough players!");
game.SetState(GameState.Dead); game.SetState(GameState.Dead);