Merge pull request #114 from WaterArchery/main

Fix for latest Lands version
Geik-xyz · Dec 9, 2024 · b02ed86 · b02ed86
2 parents 6bccc62 + 22361dc
commit b02ed86
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -77,7 +77,7 @@
         <dependency>
             <groupId>com.github.angeschossen</groupId>
             <artifactId>LandsAPI</artifactId>
-            <version>7.1.12</version>
+            <version>7.10.6</version>
             <scope>provided</scope>
         </dependency>
         <!-- WildStacker -->

diff --git a/src/main/java/xyz/geik/farmer/commands/FarmerCommand.java b/src/main/java/xyz/geik/farmer/commands/FarmerCommand.java
@@ -98,8 +98,10 @@ public void removeCommand(CommandSender sender) {
         }
         Player player = (Player) sender;
         String regionID = getRegionID(player);
-        if (regionID == null)
+        if (regionID == null) {
             ChatUtils.sendMessage(player, Main.getLangFile().getMessages().getNoRegion());
+            return;
+        }
 
         UUID ownerUUID = Main.getIntegration().getOwnerUUID(regionID);
         // Custom perm check for remove command

diff --git a/src/main/java/xyz/geik/farmer/integrations/lands/Lands.java b/src/main/java/xyz/geik/farmer/integrations/lands/Lands.java
@@ -38,7 +38,8 @@ public Lands() {
     @Override
     public UUID getOwnerUUID(String regionID) {
         ULID ulid = ULID.fromString(regionID);
-        return api.getLandByULID(ulid).getOwnerUID();
+        Land land = api.getLandByULID(ulid);
+        return land == null ? null : land.getOwnerUID();
     }
 
     /**