From 7efbd63f8d45e7f3dda75d80e65ffd72ff17ffdb Mon Sep 17 00:00:00 2001 From: ryanhamshire Date: Wed, 7 Sep 2016 15:50:55 -0700 Subject: [PATCH] Fixed /abandonallclaims wrt pets This command was releasing all pets in the abandoned land claims by mistake. --- src/me/ryanhamshire/GriefPrevention/DataStore.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/me/ryanhamshire/GriefPrevention/DataStore.java b/src/me/ryanhamshire/GriefPrevention/DataStore.java index d544744..e31b8b3 100644 --- a/src/me/ryanhamshire/GriefPrevention/DataStore.java +++ b/src/me/ryanhamshire/GriefPrevention/DataStore.java @@ -1146,14 +1146,14 @@ public abstract class DataStore } //deletes all claims owned by a player - synchronized public void deleteClaimsForPlayer(UUID playerID, boolean deleteCreativeClaims) + synchronized public void deleteClaimsForPlayer(UUID playerID, boolean releasePets) { //make a list of the player's claims ArrayList claimsToDelete = new ArrayList(); for(int i = 0; i < this.claims.size(); i++) { Claim claim = this.claims.get(i); - if((playerID == claim.ownerID || (playerID != null && playerID.equals(claim.ownerID))) && (deleteCreativeClaims || !GriefPrevention.instance.creativeRulesApply(claim.getLesserBoundaryCorner()))) + if((playerID == claim.ownerID || (playerID != null && playerID.equals(claim.ownerID)))) claimsToDelete.add(claim); } @@ -1163,7 +1163,7 @@ public abstract class DataStore Claim claim = claimsToDelete.get(i); claim.removeSurfaceFluids(null); - this.deleteClaim(claim, true); + this.deleteClaim(claim, releasePets); //if in a creative mode world, delete the claim if(GriefPrevention.instance.creativeRulesApply(claim.getLesserBoundaryCorner()))