From d326f106d6124b8e8bb3243127deb63aabc8aa9a Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 23 Aug 2019 15:32:59 -0400 Subject: [PATCH] Ensure subclaim boundaries are inside parent (#590) Fixes GHSA-7mmh-4c9r-pf6v --- .../me/ryanhamshire/GriefPrevention/DataStore.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/java/me/ryanhamshire/GriefPrevention/DataStore.java b/src/main/java/me/ryanhamshire/GriefPrevention/DataStore.java index 24e25c2..c327862 100644 --- a/src/main/java/me/ryanhamshire/GriefPrevention/DataStore.java +++ b/src/main/java/me/ryanhamshire/GriefPrevention/DataStore.java @@ -847,6 +847,18 @@ public abstract class DataStore smallz = z2; bigz = z1; } + + if(parent != null) + { + Location lesser = parent.getLesserBoundaryCorner(); + Location greater = parent.getGreaterBoundaryCorner(); + if(smallx < lesser.getX() || smallz < lesser.getZ() || bigx > greater.getX() || bigz > greater.getZ()) + { + result.succeeded = false; + result.claim = parent; + return result; + } + } //creative mode claims always go to bedrock if(GriefPrevention.instance.config_claims_worldModes.get(world) == ClaimsMode.Creative)