Explorar o código

Bugfixes

- Removed games sticking around in /abba info
- Game duration not being adjusted when in COUNTDOWN state
lennartVH01 %!s(int64=9) %!d(string=hai) anos
pai
achega
fa441fa7c2

+ 1 - 1
src/me/lennartVH01/game/BasicAbbaGame.java

@@ -333,7 +333,7 @@ public class BasicAbbaGame implements AbbaGame{
 	@Override public String getName(){return name;}
 	@Override public Location getSpawn(){return spawn;}
 	@Override public int getDuration(){return duration;}
-	@Override public void setTimeLeft(int timeLeft){if(state == GameState.WAITING) this.duration = timeLeft; else this.timeLeft = timeLeft;}
+	@Override public void setTimeLeft(int timeLeft){if(state == GameState.WAITING || state == GameState.COUNTDOWN) this.duration = timeLeft; else this.timeLeft = timeLeft;}
 	@Override public int getTimeLeft(){return timeLeft;}
 	
 	@Override public void broadcast(final String message){for(Player p:players) p.sendMessage(message);}

+ 3 - 0
src/me/lennartVH01/game/GameManager.java

@@ -23,6 +23,9 @@ public class GameManager implements Listener{
 	public static boolean removeGame(AbbaGame game){
 		if(game == null)
 			return false;
+		for(Player p:game.getPlayers()){
+			playerGames.remove(p.getUniqueId());
+		}
 		games.remove(game);
 		game.destroy();
 		return true;