fixed EtienneDx#22, smaller default page size

FamousL · May 15, 2020 · 1e3f8f7 · 1e3f8f7
1 parent bb92624
commit 1e3f8f7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/me/EtienneDx/RealEstate/Config.java b/src/me/EtienneDx/RealEstate/Config.java
@@ -87,7 +87,7 @@ public class Config extends AnnotationConfig
     public int cfgLeasePayments = 5;
 
     @ConfigField(name="RealEstate.Settings.PageSize", comment = "How many Real Estate offer should be shown by page using the '/re list' command")
-    public int cfgPageSize = 20;
+    public int cfgPageSize = 8;
 
     public Config()
     {

diff --git a/src/me/EtienneDx/RealEstate/RealEstate.java b/src/me/EtienneDx/RealEstate/RealEstate.java
@@ -214,7 +214,8 @@ else if(tr instanceof BoughtTransaction && ((BoughtTransaction)tr).getBuyer() !=
             	throw new ConditionFailedException("This command only applies to rented claims!");
         	}
         	if((((ClaimRent)tr).buyer != null && ((ClaimRent)tr).buyer.equals(context.getIssuer().getPlayer().getUniqueId())) || 
-        			tr.getOwner().equals(context.getIssuer().getPlayer().getUniqueId()))
+        			(tr.getOwner() != null && (tr.getOwner().equals(context.getIssuer().getPlayer().getUniqueId()))) || 
+        			(c.isAdminClaim() && RealEstate.perms.has(context.getIssuer().getPlayer(), "realestate.admin")))
         	{
         		return;
         	}