From 32ea7542d24d52e8526703322aee62dff8db28ac Mon Sep 17 00:00:00 2001 From: Zach Brown <1254957+zachbr@users.noreply.github.com> Date: Sat, 21 May 2016 22:07:14 -0500 Subject: [PATCH] Update upstream CB Closes GH-303 --- .../Do-not-mark-chunks-as-active-for-neighbor-updates.patch | 4 ++-- work/CraftBukkit | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Spigot-Server-Patches/Do-not-mark-chunks-as-active-for-neighbor-updates.patch b/Spigot-Server-Patches/Do-not-mark-chunks-as-active-for-neighbor-updates.patch index c64b01e39c..65ef835a21 100644 --- a/Spigot-Server-Patches/Do-not-mark-chunks-as-active-for-neighbor-updates.patch +++ b/Spigot-Server-Patches/Do-not-mark-chunks-as-active-for-neighbor-updates.patch @@ -51,7 +51,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 continue; } -- Chunk neighbor = this.getLoadedChunkAt(chunk.locX + x, chunk.locZ + z); +- Chunk neighbor = this.getChunkIfLoaded(chunk.locX + x, chunk.locZ + z); + Chunk neighbor = MCUtil.getLoadedChunkWithoutMarkingActive(this, chunk.locX + x, chunk.locZ + z); // Paper if (neighbor != null) { neighbor.setNeighborLoaded(-x, -z); @@ -60,7 +60,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 continue; } -- Chunk neighbor = this.chunks.get(ChunkCoordIntPair.a(chunk.locX + x, chunk.locZ + z)); +- Chunk neighbor = this.getChunkIfLoaded(chunk.locX + x, chunk.locZ + z); + Chunk neighbor = MCUtil.getLoadedChunkWithoutMarkingActive(this, chunk.locX + x, chunk.locZ + z); // Paper if (neighbor != null) { neighbor.setNeighborUnloaded(-x, -z); diff --git a/work/CraftBukkit b/work/CraftBukkit index d8637dfb7e..8982e3f33e 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit d8637dfb7e581c9745aa8f7f505b971c99720159 +Subproject commit 8982e3f33e4c1d47fe31d71c8dc25e929d7b99d7