Altitude/AlttdGriefPrevention
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed disappearing subdivisions.

Browse Source 
Was happening on both resize and on extend downward.
This commit is contained in:
ryanhamshire 2014-12-11 19:39:22 -08:00
parent 3c3506bf55
commit 23ceed62a3
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/me/ryanhamshire/GriefPrevention/DataStore.java
View File

@ -696,6 +696,9 @@ public abstract class DataStore
if(claim.parent != null) claim = claim.parent; if(claim.parent != null) claim = claim.parent;
//note any subdivisions
ArrayList<Claim> subdivisions = new ArrayList<Claim>(claim.children);
//delete the claim //delete the claim
this.deleteClaim(claim); this.deleteClaim(claim);
@ -703,6 +706,9 @@ public abstract class DataStore
claim.lesserBoundaryCorner.setY(newDepth); claim.lesserBoundaryCorner.setY(newDepth);
claim.greaterBoundaryCorner.setY(newDepth); claim.greaterBoundaryCorner.setY(newDepth);
//re-add the subdivisions (deleteClaim() removed them)
claim.children.addAll(subdivisions);
//make all subdivisions reach to the same depth //make all subdivisions reach to the same depth
for(int i = 0; i < claim.children.size(); i++) for(int i = 0; i < claim.children.size(); i++)
{ {
@ -942,7 +948,10 @@ public abstract class DataStore
//see CreateClaim() for details on return value //see CreateClaim() for details on return value
synchronized public CreateClaimResult resizeClaim(Claim claim, int newx1, int newx2, int newy1, int newy2, int newz1, int newz2) synchronized public CreateClaimResult resizeClaim(Claim claim, int newx1, int newx2, int newy1, int newy2, int newz1, int newz2)
{ {
//remove old claim //note any subdivisions before deleting the claim
ArrayList<Claim> subdivisions = new ArrayList<Claim>(claim.children);
//remove old claim
this.deleteClaim(claim); this.deleteClaim(claim);
//try to create this new claim, ignoring the original when checking for overlap //try to create this new claim, ignoring the original when checking for overlap
@ -972,13 +981,8 @@ public abstract class DataStore
result.claim.managers.add(managers.get(i)); result.claim.managers.add(managers.get(i));
} }
//copy subdivisions from old claim //restore subdivisions
for(int i = 0; i < claim.children.size(); i++) result.claim.children.addAll(subdivisions);
{
Claim subdivision = claim.children.get(i);
subdivision.parent = result.claim;
result.claim.children.add(subdivision);
}
//save those changes //save those changes
this.saveClaim(result.claim); this.saveClaim(result.claim);