RedstoneFuture 2 tahun lalu
induk
melakukan
581ef78d06

+ 2 - 9
missilewars-plugin/src/main/java/de/butzlabben/missilewars/commands/MWCommands.java

@@ -19,12 +19,7 @@
 package de.butzlabben.missilewars.commands;
 
 import co.aikar.commands.BaseCommand;
-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Default;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Subcommand;
+import co.aikar.commands.annotation.*;
 import de.butzlabben.missilewars.Logger;
 import de.butzlabben.missilewars.MissileWars;
 import de.butzlabben.missilewars.configuration.Config;
@@ -37,8 +32,6 @@ import de.butzlabben.missilewars.game.enums.GameState;
 import de.butzlabben.missilewars.game.enums.MapChooseProcedure;
 import de.butzlabben.missilewars.game.missile.Missile;
 import de.butzlabben.missilewars.game.missile.MissileFacing;
-import java.util.Map;
-import java.util.Optional;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -51,7 +44,7 @@ public class MWCommands extends BaseCommand {
 
         sender.sendMessage(Messages.getPrefix() + "MissileWars v" + MissileWars.getInstance().version + " by Butzlabben");
 
-        sendHelpMessage(sender, "mw.vote", "/mw vote", "Vote for a arena.");
+        sendHelpMessage(sender, "mw.vote", "/mw vote <arena>", "Vote for a arena.");
         sendHelpMessage(sender, "mw.change", "/mw change <1|2>", "Changes your team.");
         sendHelpMessage(sender, "mw.quit", "/mw quit", "Quit a game.");
 

+ 5 - 17
missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/Game.java

@@ -156,8 +156,7 @@ public class Game {
         // choose the game arena
         if (lobby.getMapChooseProcedure() == MapChooseProcedure.FIRST) {
             setArena(lobby.getArenas().get(0));
-
-            finalStartGame();
+            finalGamePreparations();
 
         } else if (lobby.getMapChooseProcedure() == MapChooseProcedure.MAPCYCLE) {
             final int lastMapIndex = cycles.getOrDefault(lobby.getName(), -1);
@@ -165,15 +164,13 @@ public class Game {
             int index = lastMapIndex >= arenas.size() - 1 ? 0 : lastMapIndex + 1;
             cycles.put(lobby.getName(), index);
             setArena(arenas.get(index));
-
-            finalStartGame();
+            finalGamePreparations();
 
         } else if (lobby.getMapChooseProcedure() == MapChooseProcedure.MAPVOTING) {
             if (mapVoting.onlyOneArenaFound()) {
                 setArena(lobby.getArenas().get(0));
                 Logger.WARN.log("Only one arena was found for the lobby \"" + lobby.getName() + "\". The configured map voting was skipped.");
-
-                finalStartGame();
+                finalGamePreparations();
             } else {
                 mapVoting.startVote();
             }
@@ -183,7 +180,7 @@ public class Game {
         scoreboardManager.createScoreboard();
     }
 
-    public void finalStartGame() {
+    public void finalGamePreparations() {
         if (this.arena == null) {
             throw new IllegalStateException("The arena is not yet set");
         }
@@ -195,9 +192,7 @@ public class Game {
 
         Logger.DEBUG.log("Making game ready");
         ++fights;
-        if (fights >= Config.getFightRestart()) {
-            restart = true;
-        }
+        if (fights >= Config.getFightRestart()) restart = true;
 
         FightStats.checkTables();
         Logger.DEBUG.log("Fights: " + fights);
@@ -671,13 +666,6 @@ public class Game {
         }
 
         createInnerGameArea();
-
-        if (lobby.getMapChooseProcedure() == MapChooseProcedure.MAPVOTING) {
-            this.broadcast(Messages.getMessage(true, Messages.MessageEnum.VOTE_FINISHED).replace("%map%", this.arena.getDisplayName()));
-        }
-        applyForAllPlayers(player -> player.getInventory().setItem(4, new ItemStack(Material.AIR)));
-
-        ready = true;
     }
 
     private void createInnerGameArea() {