From 45aa7db5c4db5e0116bf2fbcde6e22d318b9b2e1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 25 May 2016 12:37:17 -0400 Subject: [PATCH] Update Upstream --- Spigot-Server-Patches/Add-World-Util-Methods.patch | 2 +- .../Do-not-mark-chunks-as-active-for-neighbor-updates.patch | 2 +- work/CraftBukkit | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Spigot-Server-Patches/Add-World-Util-Methods.patch b/Spigot-Server-Patches/Add-World-Util-Methods.patch index 6b4d62aae5..bcc2566515 100644 --- a/Spigot-Server-Patches/Add-World-Util-Methods.patch +++ b/Spigot-Server-Patches/Add-World-Util-Methods.patch @@ -20,7 +20,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + // Paper end + public Chunk getChunkIfLoaded(int x, int z) { - return ((ChunkProviderServer) this.chunkProvider).getLoadedChunkAt(x, z); + return ((ChunkProviderServer) this.chunkProvider).getChunkIfLoaded(x, z); } @@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess { } 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 65ef835a21..ef72d0c476 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 @@ -73,7 +73,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 continue; } -- net.minecraft.server.Chunk neighbor = world.getChunkProviderServer().getLoadedChunkAt(chunk.locX + x, chunk.locZ + z); +- net.minecraft.server.Chunk neighbor = world.getChunkProviderServer().getChunkIfLoaded(chunk.locX + x, chunk.locZ + z); + net.minecraft.server.Chunk neighbor = net.minecraft.server.MCUtil.getLoadedChunkWithoutMarkingActive(world, chunk.locX + x, chunk.locZ + z); // Paper if (neighbor != null) { neighbor.setNeighborUnloaded(-xx, -zz); diff --git a/work/CraftBukkit b/work/CraftBukkit index 8982e3f33e..042911fef4 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 8982e3f33e4c1d47fe31d71c8dc25e929d7b99d7 +Subproject commit 042911fef46a2efd1fcc4266a01ede48e6e2948c