Explorar o código

Removing duplicate / unnecessary actions

RedstoneFuture %!s(int64=2) %!d(string=hai) anos
pai
achega
459483def7

+ 2 - 10
missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/Game.java

@@ -242,7 +242,7 @@ public class Game {
 
 
     public void stopGame() {
     public void stopGame() {
         if (Config.isSetup()) return;
         if (Config.isSetup()) return;
-
+        
         Logger.DEBUG.log("Stopping");
         Logger.DEBUG.log("Stopping");
 
 
         for (BukkitTask bt : playerTasks.values()) {
         for (BukkitTask bt : playerTasks.values()) {
@@ -284,7 +284,7 @@ public class Game {
             return;
             return;
         }
         }
 
 
-        GameManager.getInstance().restartGame(lobby);
+        GameManager.getInstance().restartGame(lobby, false);
     }
     }
 
 
     public void appendRestart() {
     public void appendRestart() {
@@ -416,11 +416,6 @@ public class Game {
     }
     }
 
 
     public void resetGame() {
     public void resetGame() {
-        if (state == GameState.INGAME) {
-            stopGame();
-            return;
-        }
-
         HandlerList.unregisterAll(listener);
         HandlerList.unregisterAll(listener);
 
 
         stopTimer();
         stopTimer();
@@ -436,9 +431,6 @@ public class Game {
         if (scoreboardManager != null) {
         if (scoreboardManager != null) {
             scoreboardManager.removeScoreboard();
             scoreboardManager.removeScoreboard();
         }
         }
-
-        team1 = null;
-        team2 = null;
     }
     }
 
 
     public boolean isInLobbyArea(Location location) {
     public boolean isInLobbyArea(Location location) {