Merge remote-tracking branch 'origin/api-10' into api-11

Author: aromaa

src/main/java/org/spongepowered/common/event/tracking/PhaseTracker.java

@@ -664,6 +664,7 @@ public void popCauseFrame(final StackFrame oldFrame) {
         // Remove new values
         for (final Map.Entry<EventContextKey<?>, Object> entry : frame.getOriginalContextDelta().entrySet()) {
             this.cached_ctx = null;
+            this.cached_cause = null;
             if (entry.getValue() == null) { // wasn't present before, remove
                 this.ctx.remove(entry.getKey());
             } else { // was there, replace
@@ -710,6 +711,7 @@ public <T> CauseStackManager addContext(final EventContextKey<T> key, final T va
         Objects.requireNonNull(value, "value");
         this.enforceMainThread();
         this.cached_ctx = null;
+        this.cached_cause = null;
         final @Nullable Object existing = this.ctx.put(key, value);
         if (!this.frames.isEmpty()) {
             this.frames.peek().storeOriginalContext(key, existing);
@@ -729,6 +731,7 @@ public <T> Optional<T> removeContext(final EventContextKey<T> key) {
         Objects.requireNonNull(key, "key");
         this.enforceMainThread();
         this.cached_ctx = null;
+        this.cached_cause = null;
         final Object existing = this.ctx.remove(key);
         if (!this.frames.isEmpty()) {
             this.frames.peek().storeOriginalContext(key, existing);

src/main/java/org/spongepowered/common/world/storage/SpongeChunkLayout.java

@@ -39,10 +39,9 @@ public final class SpongeChunkLayout implements ChunkLayout {
     private final Vector3i spaceSize;
 
     public SpongeChunkLayout(final int minY, final int height) {
-        final var totalHeight = Math.abs(minY) + height;
-        this.size = new Vector3i(16, totalHeight, 16);
+        this.size = new Vector3i(16, height, 16);
         this.mask = this.size.sub(1, 1, 1);
-        this.spaceMax = new Vector3i(Constants.World.BLOCK_MAX.x(), height, Constants.World.BLOCK_MAX.z()).sub(1, 1, 1);
+        this.spaceMax = new Vector3i(Constants.World.BLOCK_MAX.x(), minY + height, Constants.World.BLOCK_MAX.z()).sub(1, 1, 1);
         this.spaceMin = new Vector3i(Constants.World.BLOCK_MIN.x(), minY, Constants.World.BLOCK_MIN.z());
         this.spaceSize = this.spaceMax.sub(this.spaceMin).add(1, 1, 1);
     }
@@ -88,17 +87,17 @@ public boolean isInChunk(final int x, final int y, final int z) {
 
     @Override
     public boolean isInChunk(final int wx, final int wy, final int wz, final int cx, final int cy, final int cz) {
-        return this.isInChunk(wx - (cx << 4), wy - (cy << 8), wz - (cz << 4));
+        return this.isInChunk(wx - (cx << 4), wy - Math.floorDiv(cy - this.spaceMin.y(), this.size.y()), wz - (cz << 4));
     }
 
     @Override
     public Vector3i forceToChunk(final int x, final int y, final int z) {
-        return new Vector3i(x >> 4, y >> 8, z >> 4);
+        return new Vector3i(x >> 4, Math.floorDiv(y - this.spaceMin.y(), this.size.y()), z >> 4);
     }
 
     @Override
     public Vector3i forceToWorld(final int x, final int y, final int z) {
-        return new Vector3i(x << 4, y << 8, z << 4);
+        return new Vector3i(x << 4, (y * this.size.y()) + this.spaceMin.y(), z << 4);
     }
 
 }