Undoing changes

Author: RedstoneFuture

README.md

@@ -7,6 +7,9 @@ MissileWars is a famous, fun and fast minigame spigot-plugin for Minecraft
 You can download the latest jar in the [latest release](https://github.com/Butzlabben/missilewars/releases/latest) or build it yourself (
 see [BUILDING](#building))
 
+However, if you [buy the resource](https://www.spigotmc.org/resources/62947) and leave a review,
+you will also receive an extra map and some more missiles.
+
 ## Building
 
 To build MissileWars, you need to install the Java 17 JDK. Then you can build it via the Maven Wrapper.

missilewars-plugin/pom.xml

@@ -26,7 +26,7 @@
         <version>1.0</version>
     </parent>
 
-    <version>4.6.0</version>
+    <version>4.5.3</version>
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -117,7 +117,7 @@
         <dependency>
             <groupId>com.mojang</groupId>
             <artifactId>authlib</artifactId>
-            <version>4.0.43</version>
+            <version>1.5.25</version>
             <scope>provided</scope>
         </dependency>
 

missilewars-plugin/src/main/java/de/butzlabben/missilewars/MissileWars.java

@@ -57,7 +57,6 @@
 @Getter
 public class MissileWars extends JavaPlugin {
 
-    @Getter
     private static MissileWars instance;
     public final String version = getDescription().getVersion();
     private SignRepository signRepository;
@@ -72,6 +71,13 @@ public MissileWars() {
         instance = this;
     }
 
+    /**
+     * @return the instance of the plugin
+     */
+    public static MissileWars getInstance() {
+        return instance;
+    }
+
     @Override
     public void onEnable() {
         long startTime;
@@ -110,7 +116,7 @@ public void onEnable() {
         GameManager.getInstance().getGames().values().forEach(game -> {
             for (Player player : Bukkit.getOnlinePlayers()) {
                 if (!game.isIn(player.getLocation())) continue;
-                game.playerJoinInGame(player, false);
+                game.teleportToLobbySpawn(player);
             }
         });
 

missilewars-plugin/src/main/java/de/butzlabben/missilewars/commands/StatsCommands.java

@@ -47,7 +47,6 @@
 import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
 
 @CommandAlias("mw|missilewars")
 @Subcommand("stats")
@@ -59,28 +58,6 @@ public class StatsCommands extends BaseCommand {
     private final SimpleDateFormat format = new SimpleDateFormat("dd.MM.yyyy");
     private final SimpleDateFormat preciseFormat = new SimpleDateFormat("hh:mm dd.MM.yyyy");
 
-    @NotNull
-    private static List<String> generateRecommendations(StatsFetcher fetcher, SavedStats avgStatsWithoutDraws) {
-        List<String> recommendations = new ArrayList<>();
-        int gameCount = fetcher.getGameCount();
-
-        double avgWins = avgStatsWithoutDraws.getTeamWon();
-        if (Math.abs(avgWins - 1) > MAX_AVIATION_WIN) {
-            recommendations.add("It could be, that your map is biased to one team, as wins are not equally distributed");
-        }
-
-        int draws = fetcher.getDrawFights();
-        if ((((double) draws / (double) gameCount) * 100) > MAX_FIGHT_DRAW_PERCENTAGE) {
-            recommendations.add("Increase the game_length option. More than 15% of your games are draws");
-        }
-
-        Duration duration = Duration.ofMillis(avgStatsWithoutDraws.getTimeElapsed());
-        if (((double) duration.getSeconds() / 60.0) <= MIN_FIGHT_DURATION) {
-            recommendations.add("Remove some overpowered features. The average game length at won games is under 5 minutes");
-        }
-        return recommendations;
-    }
-
     @Default
     @CommandPermission("mw.stats")
     public void onStats(CommandSender sender, String[] args) {
@@ -95,7 +72,7 @@ public void onStats(CommandSender sender, String[] args) {
         PreFetcher.PrePlayerFetchRunnable preFetchRunnable = PreFetcher.preFetchPlayers(fetcher);
 
         CustomInv inv = new CustomInv("§eMissileWars statistics", 3);
-        List<String> criteriaLore = Arrays.asList("§7Statistics since: §e" + format.format(fetcher.getFrom()), "§7Specified arena: §e" + (arena.isEmpty() ? "any" : arena));
+        List<String> criteriaLore = Arrays.asList("§7Statistics since: §e" + format.format(fetcher.getFrom()), "§7Specified arena: §e" + (arena.equals("") ? "any" : arena));
         inv.addItem(4, new OrcItem(Material.FEATHER, "§aStatistics search criteria", criteriaLore));
 
         int gameCount = fetcher.getGameCount();
@@ -144,10 +121,26 @@ public void onRecommendations(CommandSender sender, String[] args) {
         if (fetcher == null) return;
         SavedStats avgStatsWithDraws = fetcher.getAverageSavedStats(false);
         SavedStats avgStatsWithoutDraws = fetcher.getAverageSavedStats(true);
-        List<String> recommendations = generateRecommendations(fetcher, avgStatsWithoutDraws);
+        List<String> recommendations = new ArrayList<>();
+        int gameCount = fetcher.getGameCount();
+
+        double avgWins = avgStatsWithoutDraws.getTeamWon();
+        if (Math.abs(avgWins - 1) > MAX_AVIATION_WIN) {
+            recommendations.add("It could be, that your map is biased to one team, as wins are not equally distributed");
+        }
+
+        int draws = fetcher.getDrawFights();
+        if ((((double) draws / (double) gameCount) * 100) > MAX_FIGHT_DRAW_PERCENTAGE) {
+            recommendations.add("Increase the game_length option. More than 15% of your games are draws");
+        }
+
+        Duration duration = Duration.ofMillis(avgStatsWithoutDraws.getTimeElapsed());
+        if (((double) duration.getSeconds() / 60.0) <= MIN_FIGHT_DURATION) {
+            recommendations.add("Remove some overpowered features. The average game length at won games is under 5 minutes");
+        }
         // TODO implement more features
 
-        if (recommendations.isEmpty()) {
+        if (recommendations.size() == 0) {
             player.sendMessage(Messages.getPrefix() + "§aThere are currently no recommendations, everything seems fine :)");
         } else {
             player.sendMessage(Messages.getPrefix() + "§7=====[ §eMissileWars recommendations §7]=====");

missilewars-plugin/src/main/java/de/butzlabben/missilewars/configuration/Lobby.java

@@ -30,6 +30,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -39,6 +40,12 @@
 import org.bukkit.Location;
 import org.bukkit.World;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 @Getter
 @ToString
 @RequiredArgsConstructor
@@ -60,10 +67,9 @@ public class Lobby {
     @Setter @SerializedName("spawn_point") private Location spawnPoint = getBukkitDefaultWorld().getSpawnLocation();
     @Setter @SerializedName("after_game_spawn") private Location afterGameSpawn = getBukkitDefaultWorld().getSpawnLocation();
     @Setter @SerializedName("area") private AreaConfiguration areaConfig = AreaConfiguration.aroundLocation(getBukkitDefaultWorld().getSpawnLocation(), 30);
-    @SerializedName("map_choose_procedure") private MapChooseProcedure mapChooseProcedure = MapChooseProcedure.MAPCYCLE;
+    @SerializedName("map_choose_procedure") private MapChooseProcedure mapChooseProcedure = MapChooseProcedure.FIRST;
     @SerializedName("possible_arenas") private List<String> possibleArenas = new ArrayList<>() {{
         add("arena0");
-        add("dam");
     }};
 
     // These values are only set after the Config has been read.

missilewars-plugin/src/main/java/de/butzlabben/missilewars/configuration/arena/MissileConfiguration.java

@@ -54,10 +54,6 @@ public class MissileConfiguration {
         add(new Missile("Juggernaut.schematic", "&4Juggernaut", EntityType.MUSHROOM_COW, 2, 2, 1));
         add(new Missile("Piranha.schematic", "&3Piranha", EntityType.HORSE, 2, 2, 3));
         add(new Missile("Tunnelbore.schematic", "&0Tunnelbore", EntityType.ENDERMAN, 2, 2, 1));
-        add(new Missile("Minuteman.schematic", "&3Minuteman", EntityType.CAVE_SPIDER, 2, 3, 2));
-        add(new Missile("Skybolt.schematic", "&bSkybolt", EntityType.SKELETON_HORSE, 2, 2, 2));
-        add(new Missile("Medusa.schematic", "&5Medusa", EntityType.PARROT, 2, 2, 1));
-
     }};
 
     public List<MissileFacing> getEnabledFacings() {

missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/Arenas.java

@@ -24,12 +24,13 @@
 import de.butzlabben.missilewars.configuration.arena.Arena;
 import de.butzlabben.missilewars.util.SetupUtil;
 import de.butzlabben.missilewars.util.serialization.Serializer;
+import lombok.Getter;
+import org.bukkit.Bukkit;
+
 import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import lombok.Getter;
-import org.bukkit.Bukkit;
 
 public class Arenas {
 
@@ -58,17 +59,9 @@ public static void load() {
                 Bukkit.getPluginManager().disablePlugin(MissileWars.getInstance());
                 return;
             }
-
-            // Also unpack additional arenas
-            try {
-                SetupUtil.copyAndUnzip("Dam-Arena.zip", folder.getAbsolutePath());
-            } catch (IOException e) {
-                Logger.ERROR.log("Could not extract Dam Arena");
-                e.printStackTrace();
-            }
+            files = new File[] {defaultArena};
         }
 
-        files = folder.listFiles();
         for (File config : files) {
             if (!config.getName().endsWith(".yml") && !config.getName().endsWith(".yaml")) continue;
             try {

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

@@ -52,19 +52,9 @@
 import de.butzlabben.missilewars.util.geometry.GameArea;
 import de.butzlabben.missilewars.util.geometry.Geometry;
 import de.butzlabben.missilewars.util.serialization.Serializer;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.function.Consumer;
 import lombok.Getter;
 import lombok.ToString;
-import org.bukkit.Bukkit;
-import org.bukkit.GameMode;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.Sound;
-import org.bukkit.World;
+import org.bukkit.*;
 import org.bukkit.entity.Fireball;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
@@ -73,6 +63,12 @@
 import org.bukkit.scheduler.BukkitTask;
 import org.bukkit.util.Vector;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.function.Consumer;
+
 /**
  * @author Butzlabben
  * @since 01.01.2018
@@ -121,7 +117,7 @@ public Game(Lobby lobby) {
             return;
         }
 
-        if (lobby.getPossibleArenas().isEmpty()) {
+        if (lobby.getPossibleArenas().size() == 0) {
             Logger.ERROR.log("At least one valid arena must be set at lobby \"" + lobby.getName() + "\".");
             return;
         }
@@ -167,7 +163,7 @@ public Game(Lobby lobby) {
         } else if (lobby.getMapChooseProcedure() == MapChooseProcedure.MAPCYCLE) {
             final int lastMapIndex = cycles.getOrDefault(lobby.getName(), -1);
             List<Arena> arenas = lobby.getArenas();
-            int index = (lastMapIndex + 1) % arenas.size();
+            int index = lastMapIndex >= arenas.size() - 1 ? 0 : lastMapIndex + 1;
             cycles.put(lobby.getName(), index);
             setArena(arenas.get(index));
             prepareGame();
@@ -183,14 +179,6 @@ public Game(Lobby lobby) {
             }
         }
 
-        // Add players if they are in the game area
-        for (Player player : Bukkit.getOnlinePlayers()) {
-            if (!isIn(player.getLocation())) {
-                continue;
-            }
-
-            playerJoinInGame(player, false);
-        }
     }
 
     /**
@@ -307,7 +295,7 @@ public void stopGame() {
         Bukkit.getPluginManager().callEvent(new GameStopEvent(this));
     }
 
-    public void triggerRestart() {
+    public void reset() {
         if (Config.isSetup()) return;
 
         if (restart) {
@@ -413,8 +401,10 @@ public void playerLeaveFromGame(MWPlayer mwPlayer) {
         Team team = mwPlayer.getTeam();
         boolean playerWasTeamMember = false;
 
-        BukkitTask task = playerTasks.get(mwPlayer.getUuid());
-        if (task != null) task.cancel();
+        if (state == GameState.INGAME) {
+            BukkitTask task = playerTasks.get(mwPlayer.getUuid());
+            if (task != null) task.cancel();
+        }
 
         PlayerDataProvider.getInstance().loadInventory(player);
 
@@ -486,12 +476,6 @@ public void resetGame() {
         HandlerList.unregisterAll(listener);
         taskManager.stopTimer();
 
-        // Just in case this wasn't executed in stopGame() already
-        // This can happen if a game restart gets issued while it's still active
-        for (BukkitTask bt : playerTasks.values()) {
-            bt.cancel();
-        }
-
         if (gameWorld != null) {
             gameWorld.unload();
             gameWorld.delete();
@@ -665,7 +649,7 @@ public void spawnFireball(Player player, ItemStack itemStack) {
         itemStack.setAmount(amount - 1);
 
         Fireball fb = player.launchProjectile(Fireball.class);
-        fb.setDirection(player.getLocation().getDirection().multiply(2.5D));
+        fb.setVelocity(player.getLocation().getDirection().multiply(2.5D));
         player.playSound(fb.getLocation(), Sound.BLOCK_ANVIL_LAND, 100.0F, 2.0F);
         player.playSound(fb.getLocation(), Sound.ITEM_FLINTANDSTEEL_USE, 100.0F, 1.0F);
         fb.setYield(3F);
@@ -679,7 +663,7 @@ public void setArena(Arena arena) {
         }
 
         arena.getMissileConfiguration().check();
-        if (arena.getMissileConfiguration().getMissiles().isEmpty()) {
+        if (arena.getMissileConfiguration().getMissiles().size() == 0) {
             throw new IllegalStateException("The game cannot be started, when 0 missiles are configured");
         }
 
@@ -827,21 +811,20 @@ public Team getSmallerTeam() {
     }
 
     /**
-     * This method checks whether a team switch would be fair based on
-     * the new team size. If no empty team results or if the team size
-     * difference does not exceed a certain value, the switch is
+     * This method checks whether a team switch would be fair based on 
+     * the new team size. If no empty team results or if the team size 
+     * difference does not exceed a certain value, the switch is 
      * considered acceptable.
-     *
+     * 
      * @param targetTeam the new team
-     *
      * @return (boolean) 'true' if it's a fair team switch
      */
     public boolean isValidTeamSwitch(Team targetTeam) {
-
+        
         // original team sizes
         int targetTeamSize = targetTeam.getMembers().size();
         int currentTeamSize = targetTeam.getEnemyTeam().getMembers().size();
-
+        
         // Preventing an empty team when previously both teams had at least one player:
         if ((currentTeamSize == 1) && (targetTeamSize >= 1)) return false;
 

missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/GameManager.java

@@ -24,13 +24,14 @@
 import de.butzlabben.missilewars.configuration.Lobby;
 import de.butzlabben.missilewars.util.geometry.GameArea;
 import de.butzlabben.missilewars.util.serialization.Serializer;
+import lombok.Getter;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+
 import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import lombok.Getter;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
 
 @Getter
 public class GameManager {
@@ -46,7 +47,6 @@ public void disableAll() {
     }
 
     public void restartAll() {
-        // We use an iterator to prevent a possible ConcurrentModificationException
         var iterator = games.values().iterator();
         //noinspection WhileLoopReplaceableByForEach
         while (iterator.hasNext()) {