Refactor transfer to transfer both buyers and renters. Update lang fi…

…les and fix data keys in GeneralRegion
md5sha256 · Nov 24, 2023 · 7e1d716 · 7e1d716
1 parent ff1ea3a
commit 7e1d716
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 16 deletions.
diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/commands/TransferCommand.java b/AreaShop/src/main/java/me/wiefferink/areashop/commands/TransferCommand.java
@@ -110,18 +110,16 @@ private void handlePlayer(Player player, String[] args) {
             }
             return;
         }
-        if (region instanceof RentRegion rentRegion) {
-            if (!rentRegion.isRenter(player.getUniqueId())) {
-                // Cannot transfer tenant if we aren't the current tenant
-                this.messageBridge.message(player, "transfer-notCurrentTenant");
-                return;
-            }
-            // Don't restart the rent, just swap the renter
-            rentRegion.setRenter(targetPlayer.getUniqueId());
-            this.messageBridge.message(player, "transfer-transferred-tenant", targetPlayerName, region);
-            if (targetPlayer.isOnline()) {
-                this.messageBridge.message(targetPlayer.getPlayer(), "transfer-transferred-tenant", targetPlayerName, region);
-            }
+        if (!region.isOwner(player.getUniqueId())) {
+            // Cannot transfer tenant if we aren't the current tenant
+            this.messageBridge.message(player, "transfer-notCurrentTenant");
+            return;
+        }
+        // Swap the owner/occupant (renter or buyer)
+        region.setOwner(targetPlayer.getUniqueId());
+        this.messageBridge.message(player, "transfer-transferred-tenant", targetPlayerName, region);
+        if (targetPlayer.isOnline()) {
+            this.messageBridge.message(targetPlayer.getPlayer(), "transfer-transferred-tenant", targetPlayerName, region);
         }
     }
 

diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/regions/GeneralRegion.java b/AreaShop/src/main/java/me/wiefferink/areashop/regions/GeneralRegion.java
@@ -1594,15 +1594,15 @@ public long getVolume() {
 	 * @return Returns true if region transfers are enabled, false otherwise
 	 */
 	public boolean isTransferEnabled() {
-		return getBooleanSetting("transferMode");
+		return getBooleanSetting("general.transferMode");
 	}
 
 	/**
 	 * Se whether region transfers are enabled
 	 * @param enabled Whether region transfers should be enabled, false otherwise
 	 */
 	public void setTransferEnabled(boolean enabled) {
-		setSetting("transferMode", enabled);
+		setSetting("general.transferMode", enabled);
 	}
 
 	/**

diff --git a/AreaShop/src/main/resources/lang/EN.yml b/AreaShop/src/main/resources/lang/EN.yml
@@ -162,9 +162,9 @@ transfer-help: "/as transfer <player> [region], the region you stand in will be
 transfer-noPermission: "You don't have permission to transfer a region."
 transfer-disabled: "Transferring has been disabled for this region."
 transfer-transferred-owner: "%lang:region% has been transferred and is now owned by %0%."
-transfer-transferred-tenant: "%lang:region% has been transferred and is now rented by %0%."
+transfer-transferred-tenant: "%lang:region% has been transferred and is now occupied by %0%."
 transfer-noPlayer: "Unknown player: %0%"
-transfer-notCurrentTenant: "You are not the current tenant/renter of this region."
+transfer-notCurrentTenant: "You are not the current tenant of this region."
 transfer-transferSelf: "You cannot transfer a region to yourself."
 
 reload-reloading: "Reloaded all configuration and region files."