fix: nullability bugs and probable source of placeholder bugs

Signed-off-by: Daniel Nägele <info@naegele.dev>

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

@@ -19,13 +19,13 @@
 package de.butzlabben.missilewars.configuration.arena;
 
 import com.google.gson.annotations.SerializedName;
+import java.util.HashMap;
+import java.util.Map;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.ToString;
 import org.bukkit.configuration.serialization.ConfigurationSerializable;
-
-import java.util.HashMap;
-import java.util.Map;
+import org.jetbrains.annotations.NotNull;
 
 @Getter
 @ToString
@@ -43,6 +43,7 @@ public class AreaConfiguration implements ConfigurationSerializable {
      * This method is used to save the config entries in the config file.
      */
     @Override
+    @NotNull
     public Map<String, Object> serialize() {
         Map<String, Object> serialized = new HashMap<>();
         serialized.put("min_x", minX);

missilewars-plugin/src/main/java/de/butzlabben/missilewars/event/GameStartEvent.java

@@ -20,6 +20,7 @@ package de.butzlabben.missilewars.event;
 
 import de.butzlabben.missilewars.game.Game;
 import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
 
 public class GameStartEvent extends GameEvent {
 
@@ -34,6 +35,7 @@ public class GameStartEvent extends GameEvent {
     }
 
     @Override
+    @NotNull
     public HandlerList getHandlers() {
         return handlers;
     }

missilewars-plugin/src/main/java/de/butzlabben/missilewars/event/PlayerArenaJoinEvent.java

@@ -24,6 +24,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.player.PlayerEvent;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Get's called, when a player has already entered an arena
@@ -45,6 +46,7 @@ public class PlayerArenaJoinEvent extends PlayerEvent implements Cancellable {
     }
 
     @Override
+    @NotNull
     public HandlerList getHandlers() {
         return handlers;
     }

missilewars-plugin/src/main/java/de/butzlabben/missilewars/event/PlayerArenaLeaveEvent.java

@@ -23,6 +23,7 @@ import lombok.Getter;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.player.PlayerEvent;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Get's called, when a player has already left an arena
@@ -43,6 +44,7 @@ public class PlayerArenaLeaveEvent extends PlayerEvent {
     }
 
     @Override
+    @NotNull
     public HandlerList getHandlers() {
         return handlers;
     }

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

@@ -24,13 +24,12 @@ import de.butzlabben.missilewars.configuration.Config;
 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 lombok.Getter;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
 
 @Getter
 public class GameManager {
@@ -141,9 +140,7 @@ public class GameManager {
         }
 
         // delete the old game from the list
-        if (games.get(targetLobbyName) != null) {
-            games.remove(targetLobby);
-        }
+        games.remove(targetLobbyName);
 
         Logger.DEBUG.log("Old Game disabled.");
 

missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/misc/MissileWarsPlaceholder.java

@@ -26,6 +26,7 @@ import de.butzlabben.missilewars.game.GameManager;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
 
 public class MissileWarsPlaceholder extends PlaceholderExpansion {
 
@@ -36,16 +37,19 @@ public class MissileWarsPlaceholder extends PlaceholderExpansion {
     }
 
     @Override
+    @NotNull
     public String getAuthor() {
         return "Daniel Nägele";
     }
 
     @Override
+    @NotNull
     public String getIdentifier() {
         return "missilewars";
     }
 
     @Override
+    @NotNull
     public String getVersion() {
         return "0.0.1";
     }
@@ -70,8 +74,8 @@ public class MissileWarsPlaceholder extends PlaceholderExpansion {
                 if (params.startsWith("arena_")) return "§c§oThis is not a game arena!";
             }
 
-            if (params.startsWith("lobby_")) params.replace("_this", playerGame.getLobby().getName());
-            if (params.startsWith("arena_")) params.replace("_this", playerGame.getArena().getName());
+            if (params.startsWith("lobby_")) params = params.replace("_this", playerGame.getLobby().getName());
+            if (params.startsWith("arena_")) params = params.replace("_this", playerGame.getArena().getName());
         }
 
 

missilewars-plugin/src/main/java/de/butzlabben/missilewars/inventory/OrcListener.java

@@ -64,8 +64,6 @@ public class OrcListener implements Listener {
 
     @EventHandler
     public void on(InventoryCloseEvent e) {
-        if (e.getInventory() != null) {
-            invs.remove(e.getPlayer().getUniqueId());
-        }
+        invs.remove(e.getPlayer().getUniqueId());
     }
 }

missilewars-plugin/src/main/java/de/butzlabben/missilewars/player/PlayerData.java

@@ -20,6 +20,12 @@ package de.butzlabben.missilewars.player;
 
 import com.google.common.base.Preconditions;
 import de.butzlabben.missilewars.util.version.VersionUtil;
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 import lombok.AllArgsConstructor;
 import lombok.ToString;
 import org.bukkit.GameMode;
@@ -27,13 +33,7 @@ import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.configuration.serialization.ConfigurationSerializable;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import org.jetbrains.annotations.NotNull;
 
 @ToString
 @AllArgsConstructor
@@ -114,6 +114,7 @@ public class PlayerData implements ConfigurationSerializable {
      * This method is used to save the original player data in the temporary player-data file.
      */
     @Override
+    @NotNull
     public Map<String, Object> serialize() {
         Map<String, Object> serialized = new HashMap<>();
         serialized.put("uuid", uuid.toString());