Changed to automatically sell/rent/lease as 'SERVER' for admin claims

src/me/EtienneDx/RealEstate/GP_RealEstateHook.java

@@ -14,7 +14,7 @@ public class GP_RealEstateHook implements IRealEstate
 	public String allowEdit(Claim claim, Player player)
 	{
 		Transaction b = RealEstate.transactionsStore.getTransaction(claim);
-		if(b != null && b.getOwner().equals(player.getUniqueId()) && b instanceof BoughtTransaction)
+		if(b != null && player.getUniqueId().equals(b.getOwner()) && b instanceof BoughtTransaction)
 		{
 			if(((BoughtTransaction)b).getBuyer() != null)
 				return "This claim is currently involved in a transaction, you can't edit it!";
@@ -26,7 +26,7 @@ public class GP_RealEstateHook implements IRealEstate
 	public String allowBuild(Claim claim, Player player, Material material)
 	{
 		Transaction b = RealEstate.transactionsStore.getTransaction(claim);
-		if(b != null && b.getOwner().equals(player.getUniqueId()) && b instanceof BoughtTransaction)
+		if(b != null && player.getUniqueId().equals(b.getOwner()) && b instanceof BoughtTransaction)// ??
 		{
 			if(((BoughtTransaction)b).getBuyer() != null)
 				return "This claim is currently involved in a transaction, you can't build on it!";
@@ -38,7 +38,7 @@ public class GP_RealEstateHook implements IRealEstate
 	public String allowAccess(Claim claim, Player player)
 	{
 		Transaction b = RealEstate.transactionsStore.getTransaction(claim);
-		if(b != null && b.getOwner().equals(player.getUniqueId()) && b instanceof BoughtTransaction)
+		if(b != null && player.getUniqueId().equals(b.getOwner()) && b instanceof BoughtTransaction)
 		{
 			if(((BoughtTransaction)b).getBuyer() != null)
 				return "This claim is currently involved in a transaction, you can't access it!";
@@ -50,7 +50,7 @@ public class GP_RealEstateHook implements IRealEstate
 	public String allowContainers(Claim claim, Player player)
 	{
 		Transaction b = RealEstate.transactionsStore.getTransaction(claim);
-		if(b != null && b.getOwner().equals(player.getUniqueId()) && b instanceof BoughtTransaction)
+		if(b != null && player.getUniqueId().equals(b.getOwner()) && b instanceof BoughtTransaction)
 		{
 			if(((BoughtTransaction)b).getBuyer() != null)
 				return "This claim is currently involved in a transaction, you can't access it's containers!";

src/me/EtienneDx/RealEstate/RECommand.java

@@ -87,7 +87,7 @@ public class RECommand extends BaseCommand
 		}
 	}
 	
-	@Subcommand("seller")
+	/*@Subcommand("seller")
 	@Description("Displays or changes the seller of a claim (admin only)")
 	@Conditions("inPendingTransactionClaim")
 	public static void setSeller(Player player, @Optional String newSeller)
@@ -112,6 +112,7 @@ public class RECommand extends BaseCommand
 		{
 			tr.setOwner(null);
 			tr.update();
+			RealEstate.transactionsStore.saveData();
 			player.sendMessage(RealEstate.instance.config.chatPrefix + ChatColor.AQUA + "Changed the seller to the server");
 		}
 		else
@@ -130,11 +131,12 @@ public class RECommand extends BaseCommand
 			{
 				tr.setOwner(newOwner.getUniqueId());
 				tr.update();
+				RealEstate.transactionsStore.saveData();
 				player.sendMessage(RealEstate.instance.config.chatPrefix + ChatColor.AQUA + "Changed the seller to " + 
 						ChatColor.GREEN + newOwner.getDisplayName());
 			}
 		}
-	}
+	}*/
 	
 	@Subcommand("exitoffer")
 	@Conditions("partOfBoughtTransaction")

src/me/EtienneDx/RealEstate/REListener.java

@@ -115,13 +115,16 @@ public class REListener implements Listener
 					return;
 				}
 				
-				if(claim.isAdminClaim() && !RealEstate.perms.has(player, "realestate.admin"))// admin may sell admin claims
+				if(claim.isAdminClaim())
+				{
+					if(!RealEstate.perms.has(player, "realestate.admin"))// admin may sell admin claims
 					{
 						player.sendMessage(RealEstate.instance.config.chatPrefix + ChatColor.RED + "You don't have the permission to sell admin claims!");
 						event.setCancelled(true);
 						event.getBlock().breakNaturally();
 						return;
 					}
+				}
 				else if(type.equals("claim") && !player.getUniqueId().equals(claim.ownerID))// only the owner may sell his claim
 				{
 					player.sendMessage(RealEstate.instance.config.chatPrefix + ChatColor.RED + "You can only sell claims you own!");
@@ -132,7 +135,7 @@ public class REListener implements Listener
 
 				// we should be good to sell it now
 				event.setCancelled(true);// need to cancel the event, so we can update the sign elsewhere
-				RealEstate.transactionsStore.sell(claim, player, price, event.getBlock().getLocation());
+				RealEstate.transactionsStore.sell(claim, claim.isAdminClaim() ? null : player, price, event.getBlock().getLocation());
 			}
 			else if(RealEstate.instance.config.cfgRentKeywords.contains(event.getLine(0).toLowerCase()))// we want to rent it
 			{
@@ -216,13 +219,16 @@ public class REListener implements Listener
 					}
 				}
 
-				if(claim.isAdminClaim() && !RealEstate.perms.has(player, "realestate.admin"))// admin may rent admin claims
+				if(claim.isAdminClaim())
+				{
+					if(!RealEstate.perms.has(player, "realestate.admin"))// admin may sell admin claims
 					{
 						player.sendMessage(RealEstate.instance.config.chatPrefix + ChatColor.RED + "You don't have the permission to rent admin claims!");
 						event.setCancelled(true);
 						event.getBlock().breakNaturally();
 						return;
 					}
+				}
 				else if(type.equals("claim") && !player.getUniqueId().equals(claim.ownerID))// only the owner may sell his claim
 				{
 					player.sendMessage(RealEstate.instance.config.chatPrefix + ChatColor.RED + "You can only rent claims you own!");
@@ -307,13 +313,16 @@ public class REListener implements Listener
 					return;
 				}
 
-				if(claim.isAdminClaim() && !RealEstate.perms.has(player, "realestate.admin"))// admin may rent admin claims
+				if(claim.isAdminClaim())
+				{
+					if(!RealEstate.perms.has(player, "realestate.admin"))// admin may sell admin claims
 					{
 						player.sendMessage(RealEstate.instance.config.chatPrefix + ChatColor.RED + "You don't have the permission to lease admin claims!");
 						event.setCancelled(true);
 						event.getBlock().breakNaturally();
 						return;
 					}
+				}
 				else if(type.equals("claim") && !player.getUniqueId().equals(claim.ownerID))// only the owner may sell his claim
 				{
 					player.sendMessage(RealEstate.instance.config.chatPrefix + ChatColor.RED + "You can only lease claims you own!");

src/me/EtienneDx/RealEstate/Transactions/ClaimLease.java

@@ -105,7 +105,7 @@ public class ClaimLease extends BoughtTransaction
 		if(buyer == null) return;
 
 		OfflinePlayer buyerPlayer = Bukkit.getOfflinePlayer(buyer);
-		OfflinePlayer seller = Bukkit.getOfflinePlayer(owner);
+		OfflinePlayer seller = owner == null ? null : Bukkit.getOfflinePlayer(owner);
 		
 		String claimType = GriefPrevention.instance.dataStore.getClaimAt(sign, false, null).parent == null ? "claim" : "subclaim";
 		
@@ -133,6 +133,8 @@ public class ClaimLease extends BoughtTransaction
 							ChatColor.AQUA + ", " + ChatColor.GREEN + paymentsLeft + ChatColor.AQUA + " payments left");
 	        	}
 				
+				if(owner != null)
+				{
 					if(seller.isOnline() && RealEstate.instance.config.cfgMessageOwner)
 					{
 						((Player)seller).sendMessage(RealEstate.instance.config.chatPrefix + ChatColor.GREEN + buyerPlayer.getName() + 
@@ -153,6 +155,7 @@ public class ClaimLease extends BoughtTransaction
 								ChatColor.AQUA + ", " + ChatColor.GREEN + paymentsLeft + ChatColor.AQUA + " payments left");
 		        	}
 				}
+			}
 			else
 			{
 				if(buyerPlayer.isOnline() && RealEstate.instance.config.cfgMessageBuyer)

src/me/EtienneDx/RealEstate/Transactions/ClaimRent.java

@@ -142,7 +142,7 @@ public class ClaimRent extends BoughtTransaction
 		if(buyer == null) return;
 
 		OfflinePlayer buyerPlayer = Bukkit.getOfflinePlayer(this.buyer);
-		OfflinePlayer seller = Bukkit.getOfflinePlayer(owner);
+		OfflinePlayer seller = owner == null ? null : Bukkit.getOfflinePlayer(owner);
 		
 		String claimType = GriefPrevention.instance.dataStore.getClaimAt(sign, false, null).parent == null ? "claim" : "subclaim";
 		
@@ -166,6 +166,8 @@ public class ClaimRent extends BoughtTransaction
 						ChatColor.AQUA + "for the price of " + ChatColor.GREEN + price + " " + RealEstate.econ.currencyNamePlural());
         	}
 			
+			if(seller != null)
+			{
 				if(seller.isOnline() && RealEstate.instance.config.cfgMessageOwner)
 				{
 					((Player)seller).sendMessage(RealEstate.instance.config.chatPrefix + ChatColor.AQUA + buyerPlayer.getName() + 
@@ -183,7 +185,7 @@ public class ClaimRent extends BoughtTransaction
 							sign.getBlockY() + ", Z: " + sign.getBlockZ() + "]" + 
 							ChatColor.AQUA + "at the price of " + ChatColor.GREEN + price + " " + RealEstate.econ.currencyNamePlural());
 	        	}
-			
+			}
 			
 		}
 		else if (autoRenew)

src/me/EtienneDx/RealEstate/Transactions/ClaimSell.java

@@ -115,7 +115,7 @@ public class ClaimSell extends ClaimTransaction
                                 "Z: " + player.getLocation().getBlockZ() + "] " +
                                 "Price: " + price + " " + RealEstate.econ.currencyNamePlural());
                 
-                if(RealEstate.instance.config.cfgMessageOwner)
+                if(RealEstate.instance.config.cfgMessageOwner && owner != null)
                 {
                 	OfflinePlayer oldOwner = Bukkit.getOfflinePlayer(owner);
                 	if(oldOwner.isOnline())

src/me/EtienneDx/RealEstate/Transactions/TransactionsStore.java

@@ -2,6 +2,10 @@ package me.EtienneDx.RealEstate.Transactions;
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Collection;
@@ -10,10 +14,12 @@ import java.util.HashMap;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
+import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
+import org.bukkit.util.FileUtil;
 
 import me.EtienneDx.RealEstate.RealEstate;
 import me.ryanhamshire.GriefPrevention.Claim;
@@ -59,25 +65,40 @@ public class TransactionsStore
     	claimRent = new HashMap<>();
     	claimLease = new HashMap<>();
     	
-    	FileConfiguration config = YamlConfiguration.loadConfiguration(new File(this.dataFilePath));
+    	File file = new File(this.dataFilePath);
-    	for(String key : config.getKeys(true))
+    	
-    	{
+    	FileConfiguration config = YamlConfiguration.loadConfiguration(file);
-    		if(key.startsWith("Sell."))
+    	try {
-    		{
+			RealEstate.instance.addLogEntry(new String(Files.readAllBytes(FileSystems.getDefault().getPath(this.dataFilePath))));
-    			ClaimSell cs = (ClaimSell)config.get(key);
+		} catch (IOException e) {
-    			claimSell.put(key.substring(5), cs);
+			// TODO Auto-generated catch block
+			e.printStackTrace();
 		}
-    		else if(key.startsWith("Rent."))
+    	ConfigurationSection sell = config.getConfigurationSection("Sell");
+    	ConfigurationSection rent = config.getConfigurationSection("Rent");
+    	ConfigurationSection lease = config.getConfigurationSection("Lease");
+    	if(sell != null)
     	{
-    			ClaimRent cr = (ClaimRent)config.get(key);
+    		RealEstate.instance.addLogEntry(sell.toString());
-    			claimRent.put(key.substring(5), cr);
+    		RealEstate.instance.addLogEntry(sell.getKeys(false).size() + "");
-    		}
+	    	for(String key : sell.getKeys(false))
-    		else if(key.startsWith("Lease."))
 			{
-    			ClaimLease cl = (ClaimLease)config.get(key);
+				ClaimSell cs = (ClaimSell)sell.get(key);
-    			claimLease.put(key.substring(6), cl);
+				claimSell.put(key, cs);
 			}
     	}
+    	if(rent != null)
+	    	for(String key : rent.getKeys(false))
+			{
+				ClaimRent cr = (ClaimRent)rent.get(key);
+				claimRent.put(key, cr);
+			}
+    	if(lease != null)
+	    	for(String key : lease.getKeys(false))
+			{
+				ClaimLease cl = (ClaimLease)lease.get(key);
+				claimLease.put(key, cl);
+	    	}
     }
     
     public void saveData()
@@ -160,12 +181,12 @@ public class TransactionsStore
 		cs.update();
 		saveData();
 		
-		RealEstate.instance.addLogEntry("[" + this.dateFormat.format(this.date) + "] " + player.getName() + 
+		RealEstate.instance.addLogEntry("[" + this.dateFormat.format(this.date) + "] " + (player == null ? "The Server" : player.getName()) + 
 				" has made " + (claim.isAdminClaim() ? "an admin" : "a") + " " + (claim.parent == null ? "claim" : "subclaim") + " for sale at " +
-                "[" + player.getLocation().getWorld() + ", " +
+                "[" + claim.getGreaterBoundaryCorner().getWorld() + ", " +
-                "X: " + player.getLocation().getBlockX() + ", " +
+                "X: " + claim.getGreaterBoundaryCorner().getBlockX() + ", " +
-                "Y: " + player.getLocation().getBlockY() + ", " +
+                "Y: " + claim.getGreaterBoundaryCorner().getBlockY() + ", " +
-                "Z: " + player.getLocation().getBlockZ() + "] " +
+                "Z: " + claim.getGreaterBoundaryCorner().getBlockZ() + "] " +
                 "Price: " + price + " " + RealEstate.econ.currencyNamePlural());
 		
 		if(player != null)
@@ -180,7 +201,7 @@ public class TransactionsStore
 			{
 				if(p != player)
 				{
-					p.sendMessage(RealEstate.instance.config.chatPrefix + ChatColor.DARK_GREEN + player.getDisplayName() + 
+					p.sendMessage(RealEstate.instance.config.chatPrefix + ChatColor.DARK_GREEN + (player == null ? "The Server" : player.getDisplayName()) + 
 							ChatColor.AQUA + " has put " + 
 							(claim.isAdminClaim() ? "an admin" : "a") + " " + (claim.parent == null ? "claim" : "subclaim") + " for sale for " + 
 							ChatColor.GREEN + price + " " + RealEstate.econ.currencyNamePlural());
@@ -196,12 +217,12 @@ public class TransactionsStore
 		cr.update();
 		saveData();
 		
-		RealEstate.instance.addLogEntry("[" + this.dateFormat.format(this.date) + "] " + player.getName() + 
+		RealEstate.instance.addLogEntry("[" + this.dateFormat.format(this.date) + "] " + (player == null ? "The Server" : player.getName()) + 
 				" has made " + (claim.isAdminClaim() ? "an admin" : "a") + " " + (claim.parent == null ? "claim" : "subclaim") + " for rent at " +
-                "[" + player.getLocation().getWorld() + ", " +
+				"[" + claim.getLesserBoundaryCorner().getWorld() + ", " +
-                "X: " + player.getLocation().getBlockX() + ", " +
+                "X: " + claim.getLesserBoundaryCorner().getBlockX() + ", " +
-                "Y: " + player.getLocation().getBlockY() + ", " +
+                "Y: " + claim.getLesserBoundaryCorner().getBlockY() + ", " +
-                "Z: " + player.getLocation().getBlockZ() + "] " +
+                "Z: " + claim.getLesserBoundaryCorner().getBlockZ() + "] " +
                 "Price: " + price + " " + RealEstate.econ.currencyNamePlural());
 		
 		if(player != null)
@@ -216,7 +237,7 @@ public class TransactionsStore
 			{
 				if(p != player)
 				{
-					p.sendMessage(RealEstate.instance.config.chatPrefix + ChatColor.DARK_GREEN + player.getDisplayName() + 
+					p.sendMessage(RealEstate.instance.config.chatPrefix + ChatColor.DARK_GREEN + (player == null ? "The Server" : player.getDisplayName()) + 
 							ChatColor.AQUA + " has put " + 
 							(claim.isAdminClaim() ? "an admin" : "a") + " " + (claim.parent == null ? "claim" : "subclaim") + " for rent for " + 
 							ChatColor.GREEN + price + " " + RealEstate.econ.currencyNamePlural());
@@ -232,12 +253,12 @@ public class TransactionsStore
 		cl.update();
 		saveData();
 		
-		RealEstate.instance.addLogEntry("[" + this.dateFormat.format(this.date) + "] " + player.getName() + 
+		RealEstate.instance.addLogEntry("[" + this.dateFormat.format(this.date) + "] " + (player == null ? "The Server" : player.getName()) + 
 				" has made " + (claim.isAdminClaim() ? "an admin" : "a") + " " + (claim.parent == null ? "claim" : "subclaim") + " for lease at " +
-                "[" + player.getLocation().getWorld() + ", " +
+				"[" + claim.getLesserBoundaryCorner().getWorld() + ", " +
-                "X: " + player.getLocation().getBlockX() + ", " +
+                "X: " + claim.getLesserBoundaryCorner().getBlockX() + ", " +
-                "Y: " + player.getLocation().getBlockY() + ", " +
+                "Y: " + claim.getLesserBoundaryCorner().getBlockY() + ", " +
-                "Z: " + player.getLocation().getBlockZ() + "] " +
+                "Z: " + claim.getLesserBoundaryCorner().getBlockZ() + "] " +
                 "Payments Count : " + paymentsCount + " " + 
                 "Price: " + price + " " + RealEstate.econ.currencyNamePlural());
 		
@@ -254,7 +275,7 @@ public class TransactionsStore
 			{
 				if(p != player)
 				{
-					p.sendMessage(RealEstate.instance.config.chatPrefix + ChatColor.DARK_GREEN + player.getDisplayName() + 
+					p.sendMessage(RealEstate.instance.config.chatPrefix + ChatColor.DARK_GREEN + (player == null ? "The Server" : player.getDisplayName()) + 
 							ChatColor.AQUA + " has put " + 
 							(claim.isAdminClaim() ? "an admin" : "a") + " " + (claim.parent == null ? "claim" : "subclaim") + " for lease for " + 
 							ChatColor.GREEN + paymentsCount + ChatColor.AQUA + " payments of " +

src/me/EtienneDx/RealEstate/Utils.java

@@ -104,6 +104,8 @@ public class Utils
 		if(claim.parent == null && RealEstate.instance.config.cfgTransferClaimBlocks)
 		{
 			PlayerData buyerData = GriefPrevention.instance.dataStore.getPlayerData(buyer);
+			if(seller != null)
+			{
 				PlayerData sellerData = GriefPrevention.instance.dataStore.getPlayerData(seller);
 				
 				// the seller has to provide the blocks
@@ -113,6 +115,7 @@ public class Utils
 		            sellerData.setAccruedClaimBlocks(sellerData.getAccruedClaimBlocks() + sellerData.getBonusClaimBlocks());
 		            sellerData.setBonusClaimBlocks(0);
 		        }
+			}
 			
 			// the buyer receive them
 			buyerData.setBonusClaimBlocks(buyerData.getBonusClaimBlocks() + claim.getArea());