Permissions fixed for rents and allowed admins to use exit offers (#9

and #19)
This commit is contained in:
EtienneDx 2020-05-14 19:17:13 +02:00
parent eb35e8fde7
commit 80131ea2d9
2 changed files with 6 additions and 1 deletions

View File

@ -164,7 +164,8 @@ public class RealEstate extends JavaPlugin
throw new ConditionFailedException("This command only applies to rented or leased claims!"); throw new ConditionFailedException("This command only applies to rented or leased claims!");
} }
if((((BoughtTransaction)tr).buyer != null && ((BoughtTransaction)tr).buyer.equals(context.getIssuer().getPlayer().getUniqueId())) || if((((BoughtTransaction)tr).buyer != null && ((BoughtTransaction)tr).buyer.equals(context.getIssuer().getPlayer().getUniqueId())) ||
(tr.getOwner() != null && 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; return;
} }

View File

@ -126,6 +126,8 @@ public class ClaimRent extends BoughtTransaction
{ {
Claim claim = GriefPrevention.instance.dataStore.getClaimAt(sign, false, null); Claim claim = GriefPrevention.instance.dataStore.getClaimAt(sign, false, null);
claim.dropPermission(buyer.toString()); claim.dropPermission(buyer.toString());
claim.managers.remove(buyer.toString());
claim.setSubclaimRestrictions(false);
GriefPrevention.instance.dataStore.saveClaim(claim); GriefPrevention.instance.dataStore.saveClaim(claim);
if(msgBuyer && Bukkit.getOfflinePlayer(buyer).isOnline() && RealEstate.instance.config.cfgMessageBuyer) if(msgBuyer && Bukkit.getOfflinePlayer(buyer).isOnline() && RealEstate.instance.config.cfgMessageBuyer)
{ {
@ -287,6 +289,8 @@ public class ClaimRent extends BoughtTransaction
autoRenew = false; autoRenew = false;
claim.setPermission(buyer.toString(), ClaimPermission.Build); claim.setPermission(buyer.toString(), ClaimPermission.Build);
claim.allowGrantPermission(player); claim.allowGrantPermission(player);
claim.managers.add(player.getUniqueId().toString());
claim.setSubclaimRestrictions(true);
GriefPrevention.instance.dataStore.saveClaim(claim); GriefPrevention.instance.dataStore.saveClaim(claim);
update(); update();
RealEstate.transactionsStore.saveData(); RealEstate.transactionsStore.saveData();