parent
0d26d6c65b
commit
208c8f0c72
|
|
@ -558,9 +558,9 @@ public abstract class DataStore
|
||||||
synchronized void deleteClaim(Claim claim, boolean fireEvent, boolean releasePets)
|
synchronized void deleteClaim(Claim claim, boolean fireEvent, boolean releasePets)
|
||||||
{
|
{
|
||||||
//delete any children
|
//delete any children
|
||||||
for(int j = 0; j < claim.children.size(); j++)
|
for(int j = 1; (j - 1) < claim.children.size(); j++)
|
||||||
{
|
{
|
||||||
this.deleteClaim(claim.children.get(j--), true);
|
this.deleteClaim(claim.children.get(j-1), true);
|
||||||
}
|
}
|
||||||
|
|
||||||
//subdivisions must also be removed from the parent claim child list
|
//subdivisions must also be removed from the parent claim child list
|
||||||
|
|
@ -1159,13 +1159,13 @@ public abstract class DataStore
|
||||||
if((playerID == claim.ownerID || (playerID != null && playerID.equals(claim.ownerID))))
|
if((playerID == claim.ownerID || (playerID != null && playerID.equals(claim.ownerID))))
|
||||||
claimsToDelete.add(claim);
|
claimsToDelete.add(claim);
|
||||||
}
|
}
|
||||||
|
|
||||||
//delete them one by one
|
//delete them one by one
|
||||||
for(int i = 0; i < claimsToDelete.size(); i++)
|
for(int i = 0; i < claimsToDelete.size(); i++)
|
||||||
{
|
{
|
||||||
Claim claim = claimsToDelete.get(i);
|
Claim claim = claimsToDelete.get(i);
|
||||||
claim.removeSurfaceFluids(null);
|
claim.removeSurfaceFluids(null);
|
||||||
|
|
||||||
this.deleteClaim(claim, releasePets);
|
this.deleteClaim(claim, releasePets);
|
||||||
|
|
||||||
//if in a creative mode world, delete the claim
|
//if in a creative mode world, delete the claim
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user