misc: It's nullable

NiFeather · Dec 2, 2024 · b53a429 · b53a429
1 parent 27da3ee
commit b53a429
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/src/main/java/xyz/nifeather/morph/misc/integrations/towny/TownyAdapter.java b/src/main/java/xyz/nifeather/morph/misc/integrations/towny/TownyAdapter.java
@@ -21,18 +21,15 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.*;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xiamomc.pluginbase.Annotations.Initializer;
 import xiamomc.pluginbase.Bindables.Bindable;
 import xiamomc.pluginbase.Command.IPluginCommand;
 import xyz.nifeather.morph.MorphPluginObject;
-import xyz.nifeather.morph.abilities.AbilityType;
 import xyz.nifeather.morph.abilities.impl.FlyAbility;
 import xyz.nifeather.morph.config.ConfigOption;
 import xyz.nifeather.morph.config.MorphConfigManager;
-import xyz.nifeather.morph.events.api.gameplay.PlayerMorphEvent;
-import xyz.nifeather.morph.events.api.gameplay.PlayerUnMorphEvent;
-import xyz.nifeather.morph.misc.NmsRecord;
 
 import java.util.Arrays;
 import java.util.List;
@@ -186,13 +183,19 @@ public void onTownClaim(TownClaimEvent e)
     @EventHandler
     public void onTownRemoveResident(TownRemoveResidentEvent e)
     {
-        updatePlayer(e.getResident().getPlayer(), e.getTown());
+        var player = e.getResident().getPlayer();
+
+        if (player != null)
+            updatePlayer(e.getResident().getPlayer(), e.getTown());
     }
 
     @EventHandler
     public void onTownAddResident(TownAddResidentEvent e)
     {
-        updatePlayer(e.getResident().getPlayer(), e.getTown());
+        var player = e.getResident().getPlayer();
+
+        if (player != null)
+            updatePlayer(player, e.getTown());
     }
 
     // Folia没有提供监听玩家改变世界的事件，所以我们只能监听EntityAddToWorldEvent
@@ -223,20 +226,20 @@ public void onPlayerTeleport(PlayerTeleportEvent e)
             this.updatePlayer(e.getPlayer(), townyAPI.getTown(e.getTo()));
     }
 
-    public void updatePlayer(Player player, @Nullable Town town)
+    public void updatePlayer(@NotNull Player player, @Nullable Town town)
     {
         this.updatePlayer(player, town, false);
     }
 
-    public void updatePlayer(Player player, @Nullable Town currentTown, boolean noLookup)
+    public void updatePlayer(@NotNull Player player, @Nullable Town currentTown, boolean noTownLookup)
     {
         if (!worldUsingTowny(player.getWorld()))
         {
             unblockPlayer(player);
             return;
         }
 
-        if (currentTown == null && !noLookup)
+        if (currentTown == null && !noTownLookup)
             currentTown = townyAPI.getTown(player.getLocation());
 
         if (allowFlightAt(player, currentTown))