From 08701a47f71154845253c75752b87da59b3fa0fb Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 21 May 2016 22:07:14 -0500 Subject: [PATCH] Update upstream CB Closes GH-303 --- Spigot-Server-Patches/0031-Lighting-Queue.patch | 8 ++++---- .../0071-Add-exception-reporting-event.patch | 12 ++++++------ ...ark-chunks-as-active-for-neighbor-updates.patch | 14 +++++++------- ...unk-as-unloading-when-unload-is-cancelled.patch | 8 ++++---- work/CraftBukkit | 2 +- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Spigot-Server-Patches/0031-Lighting-Queue.patch b/Spigot-Server-Patches/0031-Lighting-Queue.patch index cde7f1da80..c39c50822f 100644 --- a/Spigot-Server-Patches/0031-Lighting-Queue.patch +++ b/Spigot-Server-Patches/0031-Lighting-Queue.patch @@ -1,4 +1,4 @@ -From 85c55d56c0aecf3428c971fc1c3830465ea2059e Mon Sep 17 00:00:00 2001 +From 3d850d42da698e6b342438418e47b4e1b663c722 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 00:52:31 -0600 Subject: [PATCH] Lighting Queue @@ -85,10 +85,10 @@ index 5690e81..d55beb9 100644 TileEntity tileentity; diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 6c94565..b26de26 100644 +index a0b90df..01311c8 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java -@@ -275,6 +275,7 @@ public class ChunkProviderServer implements IChunkProvider { +@@ -281,6 +281,7 @@ public class ChunkProviderServer implements IChunkProvider { if (event.isCancelled()) { continue; } @@ -235,5 +235,5 @@ index 362df8f..dc51a79 100644 } -- -2.8.2 +2.8.2.windows.1 diff --git a/Spigot-Server-Patches/0071-Add-exception-reporting-event.patch b/Spigot-Server-Patches/0071-Add-exception-reporting-event.patch index 38f2902440..052fb12394 100644 --- a/Spigot-Server-Patches/0071-Add-exception-reporting-event.patch +++ b/Spigot-Server-Patches/0071-Add-exception-reporting-event.patch @@ -1,4 +1,4 @@ -From cc1f55cfececca4adcf18519f2b2fe2f6b2a3165 Mon Sep 17 00:00:00 2001 +From 46b6f1db57959a42d8f67fbbbb8c7e2f2a8de68f Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 03:15:41 -0600 Subject: [PATCH] Add exception reporting event @@ -89,7 +89,7 @@ index acce7cb..b39960a 100644 } } diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 50f0345..25a2720 100644 +index 01311c8..b268a78 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -11,6 +11,7 @@ import java.util.Iterator; @@ -100,7 +100,7 @@ index 50f0345..25a2720 100644 import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -@@ -203,7 +204,11 @@ public class ChunkProviderServer implements IChunkProvider { +@@ -209,7 +210,11 @@ public class ChunkProviderServer implements IChunkProvider { return chunk; } catch (Exception exception) { @@ -113,7 +113,7 @@ index 50f0345..25a2720 100644 return null; } } -@@ -212,7 +217,11 @@ public class ChunkProviderServer implements IChunkProvider { +@@ -218,7 +223,11 @@ public class ChunkProviderServer implements IChunkProvider { try { this.chunkLoader.b(this.world, chunk); } catch (Exception exception) { @@ -126,7 +126,7 @@ index 50f0345..25a2720 100644 } } -@@ -222,9 +231,14 @@ public class ChunkProviderServer implements IChunkProvider { +@@ -228,9 +237,14 @@ public class ChunkProviderServer implements IChunkProvider { chunk.setLastSaved(this.world.getTime()); this.chunkLoader.a(this.world, chunk); } catch (IOException ioexception) { @@ -372,5 +372,5 @@ index 2a22697..d82dddf 100644 // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code) } -- -2.8.2 +2.8.2.windows.1 diff --git a/Spigot-Server-Patches/0152-Do-not-mark-chunks-as-active-for-neighbor-updates.patch b/Spigot-Server-Patches/0152-Do-not-mark-chunks-as-active-for-neighbor-updates.patch index da03862131..e9dc6dbb27 100644 --- a/Spigot-Server-Patches/0152-Do-not-mark-chunks-as-active-for-neighbor-updates.patch +++ b/Spigot-Server-Patches/0152-Do-not-mark-chunks-as-active-for-neighbor-updates.patch @@ -1,4 +1,4 @@ -From 2746640f12a29c656745e7ea06b1f2ddd9817fb8 Mon Sep 17 00:00:00 2001 +From bf3daa6e44b5a5c1d7949b82a985c3ae89d90df1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 12 May 2016 01:55:17 -0400 Subject: [PATCH] Do not mark chunks as active for neighbor updates @@ -44,23 +44,23 @@ index 904141a..d7b9581 100644 if (chunk4 != null) { chunk4.a(chunkgenerator); diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 3cf2d8b..c2c6d3a 100644 +index f8905b4..6d1b98b 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java -@@ -197,7 +197,7 @@ public class ChunkProviderServer implements IChunkProvider { +@@ -203,7 +203,7 @@ public class ChunkProviderServer implements IChunkProvider { 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); chunk.setNeighborLoaded(x, z); -@@ -318,7 +318,7 @@ public class ChunkProviderServer implements IChunkProvider { +@@ -324,7 +324,7 @@ public class ChunkProviderServer implements IChunkProvider { 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); @@ -109,5 +109,5 @@ index 7b61b14..7752b50 100644 neighbor.setNeighborLoaded(-x, -z); chunk.setNeighborLoaded(x, z); -- -2.8.2 +2.8.2.windows.1 diff --git a/Spigot-Server-Patches/0153-Unmark-chunk-as-unloading-when-unload-is-cancelled.patch b/Spigot-Server-Patches/0153-Unmark-chunk-as-unloading-when-unload-is-cancelled.patch index 01534369f7..11c94beecb 100644 --- a/Spigot-Server-Patches/0153-Unmark-chunk-as-unloading-when-unload-is-cancelled.patch +++ b/Spigot-Server-Patches/0153-Unmark-chunk-as-unloading-when-unload-is-cancelled.patch @@ -1,4 +1,4 @@ -From 5a965808414b88283da8dc7aa36f9dcb6090311f Mon Sep 17 00:00:00 2001 +From 4cbcf0a94fdb7939154591d342fe7b69fe933176 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 12 May 2016 02:03:56 -0400 Subject: [PATCH] Unmark chunk as unloading when unload is cancelled @@ -18,10 +18,10 @@ index d7b9581..40d4c9c 100644 // Paper start diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index c2c6d3a..7427e6e 100644 +index 6d1b98b..4a2cad6 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java -@@ -303,6 +303,7 @@ public class ChunkProviderServer implements IChunkProvider { +@@ -309,6 +309,7 @@ public class ChunkProviderServer implements IChunkProvider { Chunk chunk = (Chunk) this.chunks.get(olong); if (chunk != null && chunk.d) { @@ -30,5 +30,5 @@ index c2c6d3a..7427e6e 100644 ChunkUnloadEvent event = new ChunkUnloadEvent(chunk.bukkitChunk); this.world.getServer().getPluginManager().callEvent(event); -- -2.8.2 +2.8.2.windows.1 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