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

Fix max depth below world height (#1502)

Browse Source
This commit is contained in:
Adam 2021-08-02 11:32:23 -04:00 committed by GitHub
parent 7723d10196
commit 219cf6edd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/me/ryanhamshire/GriefPrevention/AutoExtendClaimTask.java
View File

@ -9,6 +9,7 @@ import org.bukkit.block.Biome;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import java.util.Set; import java.util.Set;
//automatically extends a claim downward based on block types detected //automatically extends a claim downward based on block types detected
@ -80,7 +81,8 @@ class AutoExtendClaimTask implements Runnable
private boolean yTooSmall(int y) private boolean yTooSmall(int y)
{ {
return y == 0 || y <= GriefPrevention.instance.config_claims_maxDepth; return y <= Objects.requireNonNull(claim.getLesserBoundaryCorner().getWorld()).getMinHeight()
|| y <= GriefPrevention.instance.config_claims_maxDepth;
} }
//runs in the main execution thread, where it can safely change claims and save those changes //runs in the main execution thread, where it can safely change claims and save those changes

13
src/main/java/me/ryanhamshire/GriefPrevention/DataStore.java
View File

@ -55,6 +55,7 @@ import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
@ -868,8 +869,9 @@ public abstract class DataStore
int smallx, bigx, smally, bigy, smallz, bigz; int smallx, bigx, smally, bigy, smallz, bigz;
if (y1 < GriefPrevention.instance.config_claims_maxDepth) y1 = GriefPrevention.instance.config_claims_maxDepth; int worldMinY = world.getMinHeight();
if (y2 < GriefPrevention.instance.config_claims_maxDepth) y2 = GriefPrevention.instance.config_claims_maxDepth; y1 = Math.max(worldMinY, Math.max(GriefPrevention.instance.config_claims_maxDepth, y1));
y2 = Math.max(worldMinY, Math.max(GriefPrevention.instance.config_claims_maxDepth, y2));
//determine small versus big inputs //determine small versus big inputs
if (x1 < x2) if (x1 < x2)
@ -1057,8 +1059,11 @@ public abstract class DataStore
//respects the max depth config variable //respects the max depth config variable
synchronized public void extendClaim(Claim claim, int newDepth) synchronized public void extendClaim(Claim claim, int newDepth)
{ {
if (newDepth < GriefPrevention.instance.config_claims_maxDepth) newDepth = Math.max(
newDepth = GriefPrevention.instance.config_claims_maxDepth; Objects.requireNonNull(claim.getLesserBoundaryCorner().getWorld()).getMinHeight(),
Math.max(
newDepth,
GriefPrevention.instance.config_claims_maxDepth));
if (claim.parent != null) claim = claim.parent; if (claim.parent != null) claim = claim.parent;