Fix assaultinfo problem

APDevTeam · Apr 3, 2021 · 99eee31 · 99eee31
1 parent 2b4d330
commit 99eee31
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>net.countercraft.movecraft.warfare</groupId>
     <artifactId>Movecraft-Warfare</artifactId>
-    <version>0.5.3</version>
+    <version>0.5.4</version>
     <packaging>jar</packaging>
 
     <name>Movecraft-Warfare</name>

diff --git a/src/main/java/net/countercraft/movecraft/warfare/assault/AssaultUtils.java b/src/main/java/net/countercraft/movecraft/warfare/assault/AssaultUtils.java
@@ -1,6 +1,5 @@
 package net.countercraft.movecraft.warfare.assault;
 
-import net.countercraft.movecraft.Movecraft;
 import net.countercraft.movecraft.repair.MovecraftRepair;
 import net.countercraft.movecraft.warfare.MovecraftWarfare;
 import net.countercraft.movecraft.warfare.config.Config;
@@ -10,7 +9,6 @@
 import org.bukkit.OfflinePlayer;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
 
 import java.util.Set;
 import java.util.UUID;
@@ -111,7 +109,8 @@ public static boolean canAssault(String regionName, World w) {
             return false;
 
         // regions with no owners can not be assaulted
-        if (MovecraftWorldGuard.getInstance().getWGUtils().getUUIDOwners(regionName, w).size() == 0)
+        Set<UUID> owners = MovecraftWorldGuard.getInstance().getWGUtils().getUUIDOwners(regionName, w);
+        if (owners == null || owners.size() == 0)
             return false;
 
         // TODO: This is 100% broken, instead we need to use a file to store the last assault data.

diff --git a/src/main/java/net/countercraft/movecraft/warfare/commands/AssaultCommand.java b/src/main/java/net/countercraft/movecraft/warfare/commands/AssaultCommand.java
@@ -19,14 +19,15 @@
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
 
 
 import static net.countercraft.movecraft.utils.ChatUtils.MOVECRAFT_COMMAND_PREFIX;
 
 public class AssaultCommand implements CommandExecutor {
 
     @Override
-    public boolean onCommand(CommandSender commandSender, Command command, String s, String[] args) {
+    public boolean onCommand(@NotNull CommandSender commandSender, Command command, @NotNull String s, @NotNull String[] args) {
         if (!command.getName().equalsIgnoreCase("assault"))
             return false;
 

diff --git a/src/main/java/net/countercraft/movecraft/warfare/commands/AssaultInfoCommand.java b/src/main/java/net/countercraft/movecraft/warfare/commands/AssaultInfoCommand.java
@@ -13,6 +13,7 @@
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -22,7 +23,7 @@
 
 public class AssaultInfoCommand implements CommandExecutor {
     @Override
-    public boolean onCommand(CommandSender commandSender, Command command, String s, String[] args) {
+    public boolean onCommand(@NotNull CommandSender commandSender, Command command, @NotNull String s, @NotNull String[] args) {
         if (!command.getName().equalsIgnoreCase("assaultinfo")) {
             return false;
         }
@@ -54,7 +55,8 @@ public boolean onCommand(CommandSender commandSender, Command command, String s,
 
         HashSet<String> siegeRegions = new HashSet<>();
         for(Siege siege : MovecraftWarfare.getInstance().getSiegeManager().getSieges()) {
-            siegeRegions.add(siege.getName());
+            siegeRegions.add(siege.getCaptureRegion().toUpperCase());
+            siegeRegions.add(siege.getAttackRegion().toUpperCase());
         }
         String assaultRegion = MovecraftWorldGuard.getInstance().getWGUtils().getAssaultableRegion(player.getLocation(), siegeRegions);
         if (assaultRegion == null) {