Upstream/GriefDefender
1
0
Fork 0
mirror of https://github.com/bloodmc/GriefDefender.git synced 2025-02-08 00:31:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

1.3.4 Update

Browse Source 
* Fix deleteChunkHash NPE.
* Ignore '/claimrent' command in wilderness.
This commit is contained in:
bloodshot 2020-06-08 17:03:04 -04:00
parent cf2d6047cb
commit 1639945a1d
5 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bukkit/src/main/java/com/griefdefender/claim/GDClaimManager.java
View File

@ -387,9 +387,9 @@ private void deleteChunkHashes(GDClaim claim) {
Set<Claim> claimsInChunk = this.chunksToClaimsMap.get(chunkHash);
if (claimsInChunk != null) {
claimsInChunk.remove(claim);
}
if (claimsInChunk.isEmpty()) {
this.chunksToClaimsMap.remove(chunkHash);
if (claimsInChunk.isEmpty()) {
this.chunksToClaimsMap.remove(chunkHash);
}
}
}
}

9
bukkit/src/main/java/com/griefdefender/command/CommandClaimRent.java
View File

@ -110,6 +110,9 @@ public void execute(Player player, @Optional String[] args) {
if (subCommand.equalsIgnoreCase("cancel")) {
final GDPlayerData playerData = GriefDefenderPlugin.getInstance().dataStore.getOrCreatePlayerData(player.getWorld(), player.getUniqueId());
final GDClaim claim = GriefDefenderPlugin.getInstance().dataStore.getClaimAtPlayer(playerData, player.getLocation());
if (claim.isWilderness()) {
return;
}
boolean isRenter = false;
for (UUID uuid : claim.getEconomyData().getRenters()) {
if (player.getUniqueId().equals(uuid)) {
@ -135,6 +138,9 @@ public void execute(Player player, @Optional String[] args) {
final GDPlayerData playerData = GriefDefenderPlugin.getInstance().dataStore.getOrCreatePlayerData(player.getWorld(), player.getUniqueId());
final GDClaim claim = GriefDefenderPlugin.getInstance().dataStore.getClaimAtPlayer(playerData, player.getLocation());
if (claim.isWilderness()) {
return;
}
if (playerData.canIgnoreClaim(claim) || player.hasPermission(GDPermissions.COMMAND_DELETE_ADMIN_CLAIMS)) {
final GDPermissionUser renter = PermissionHolderCache.getInstance().getOrCreateUser(args[1]);
if (renter != null) {
@ -217,6 +223,9 @@ public void execute(Player player, @Optional String[] args) {
} else if (subCommand.equalsIgnoreCase("info")) {
final GDPlayerData playerData = GriefDefenderPlugin.getInstance().dataStore.getOrCreatePlayerData(player.getWorld(), player.getUniqueId());
final GDClaim claim = GriefDefenderPlugin.getInstance().dataStore.getClaimAtPlayer(playerData, player.getLocation());
if (claim.isWilderness()) {
return;
}
final UUID ownerUniqueId = claim.getOwnerUniqueId();
final boolean isAdmin = player.getUniqueId().equals(ownerUniqueId) || player.hasPermission(GDPermissions.COMMAND_DELETE_ADMIN_CLAIMS) || claim.allowEdit(player) == null;
List<Component> textList = new ArrayList<>();

2
bukkit/src/main/resources/plugin.yml
View File

@ -3,5 +3,5 @@ main: com.griefdefender.GDBootstrap
softdepend: [dynmap, PlaceholderAPI, WorldEdit, WorldGuard, Vault]
depend: [LuckPerms]
load: STARTUP
version: '1.3.3'
version: '1.3.4'
api-version: 1.13

2
gradle.properties
View File

@ -2,7 +2,7 @@
name=GriefDefender
group=com.griefdefender
url=https://github.com/bloodmc/GriefDefender
version=1.3.3
version=1.3.4
apiVersion=1.0.0-20200528.202302-24
# Bukkit
adapterVersion=1.15.2-20200608.154231-14

9
sponge/src/main/java/com/griefdefender/command/CommandClaimRent.java
View File

@ -109,6 +109,9 @@ public void execute(Player player, @Optional String[] args) {
if (subCommand.equalsIgnoreCase("cancel")) {
final GDPlayerData playerData = GriefDefenderPlugin.getInstance().dataStore.getOrCreatePlayerData(player.getWorld(), player.getUniqueId());
final GDClaim claim = GriefDefenderPlugin.getInstance().dataStore.getClaimAtPlayer(playerData, player.getLocation());
if (claim.isWilderness()) {
return;
}
boolean isRenter = false;
for (UUID uuid : claim.getEconomyData().getRenters()) {
if (player.getUniqueId().equals(uuid)) {
@ -134,6 +137,9 @@ public void execute(Player player, @Optional String[] args) {
final GDPlayerData playerData = GriefDefenderPlugin.getInstance().dataStore.getOrCreatePlayerData(player.getWorld(), player.getUniqueId());
final GDClaim claim = GriefDefenderPlugin.getInstance().dataStore.getClaimAtPlayer(playerData, player.getLocation());
if (claim.isWilderness()) {
return;
}
if (playerData.canIgnoreClaim(claim) || player.hasPermission(GDPermissions.COMMAND_DELETE_ADMIN_CLAIMS)) {
final GDPermissionUser renter = PermissionHolderCache.getInstance().getOrCreateUser(args[1]);
if (renter != null) {
@ -216,6 +222,9 @@ public void execute(Player player, @Optional String[] args) {
} else if (subCommand.equalsIgnoreCase("info")) {
final GDPlayerData playerData = GriefDefenderPlugin.getInstance().dataStore.getOrCreatePlayerData(player.getWorld(), player.getUniqueId());
final GDClaim claim = GriefDefenderPlugin.getInstance().dataStore.getClaimAtPlayer(playerData, player.getLocation());
if (claim.isWilderness()) {
return;
}
if (!claim.getEconomyData().isForRent() && !claim.getEconomyData().isRented()) {
if (player.getUniqueId().equals(claim.getOwnerUniqueId())) {
GriefDefenderPlugin.sendMessage(player, MessageCache.getInstance().ECONOMY_CLAIM_RENT_OWNER_NOT_RENTING);