From 30b9b403e227f9b7f118b0cfa09893036ee25f4d Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 1 Oct 2017 01:57:01 +0100 Subject: [PATCH] Update craftbukkit --- ...ble-Keep-Spawn-Loaded-range-per-world.patch | 8 ++++---- ...hunk-Unloads-based-on-Player-Movement.patch | 18 +++++++++--------- work/CraftBukkit | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Spigot-Server-Patches/0103-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0103-Configurable-Keep-Spawn-Loaded-range-per-world.patch index 00b0885682..a8818b1ac7 100644 --- a/Spigot-Server-Patches/0103-Configurable-Keep-Spawn-Loaded-range-per-world.patch +++ b/Spigot-Server-Patches/0103-Configurable-Keep-Spawn-Loaded-range-per-world.patch @@ -1,4 +1,4 @@ -From 7be59ddc090a6a8cf93f69dfbaa026997895c5a0 Mon Sep 17 00:00:00 2001 +From d8ab597298a1901854bf1ba603ec6d52d7b8f481 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 13 Sep 2014 23:14:43 -0400 Subject: [PATCH] Configurable Keep Spawn Loaded range per world @@ -67,10 +67,10 @@ index d0ec4e0bf..5e37b54ae 100644 for (int j = -short1; j <= short1; j += 16) { for (int k = -short1; k <= short1; k += 16) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 843a3415f..24b4a7ea7 100644 +index 357b59a26..51af32488 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1275,8 +1275,9 @@ public class CraftWorld implements World { +@@ -1276,8 +1276,9 @@ public class CraftWorld implements World { int chunkCoordX = chunkcoordinates.getX() >> 4; int chunkCoordZ = chunkcoordinates.getZ() >> 4; // Cycle through the 25x25 Chunks around it to load/unload the chunks. @@ -83,5 +83,5 @@ index 843a3415f..24b4a7ea7 100644 loadChunk(chunkCoordX + x, chunkCoordZ + z); } else { -- -2.14.1 +2.14.2 diff --git a/Spigot-Server-Patches/0142-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0142-Delay-Chunk-Unloads-based-on-Player-Movement.patch index 9b91a3973a..e00377a2a6 100644 --- a/Spigot-Server-Patches/0142-Delay-Chunk-Unloads-based-on-Player-Movement.patch +++ b/Spigot-Server-Patches/0142-Delay-Chunk-Unloads-based-on-Player-Movement.patch @@ -1,4 +1,4 @@ -From 6f4bcbbb5d0c76dc99a2aa2cb5aee4d21f8814ba Mon Sep 17 00:00:00 2001 +From 9c77fdd6a8501f3abe70d50ece73744b47e8e176 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 18 Jun 2016 23:22:12 -0400 Subject: [PATCH] Delay Chunk Unloads based on Player Movement @@ -17,7 +17,7 @@ This allows servers with smaller worlds who do less long distance exploring to s wasting cpu cycles on saving/unloading/reloading chunks repeatedly. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index d5d6e7fc..ef60c15b 100644 +index d5d6e7fcd..ef60c15bd 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -346,4 +346,13 @@ public class PaperWorldConfig { @@ -35,7 +35,7 @@ index d5d6e7fc..ef60c15b 100644 + } } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 0845d1ff..a0b5cd56 100644 +index 0845d1ffe..a0b5cd56b 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -30,6 +30,7 @@ public class Chunk { @@ -47,7 +47,7 @@ index 0845d1ff..a0b5cd56 100644 public final int locZ; private boolean m; diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index a512a411..9836c0c5 100644 +index c7af8da61..0adfcaa8b 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -315,6 +315,19 @@ public class ChunkProviderServer implements IChunkProvider { @@ -71,7 +71,7 @@ index a512a411..9836c0c5 100644 this.chunkLoader.b(); } diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java -index 3d30e183..48a008e0 100644 +index 3d30e1831..48a008e0a 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java +++ b/src/main/java/net/minecraft/server/PlayerChunk.java @@ -32,8 +32,16 @@ public class PlayerChunk { @@ -108,7 +108,7 @@ index 3d30e183..48a008e0 100644 // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 0a0b5261..14ea89c9 100644 +index 0a0b5261b..14ea89c91 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -487,7 +487,13 @@ public class PlayerChunkMap { @@ -127,10 +127,10 @@ index 0a0b5261..14ea89c9 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 24b4a7ea..416e86af 100644 +index 51af32488..67cb2230b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1568,7 +1568,7 @@ public class CraftWorld implements World { +@@ -1569,7 +1569,7 @@ public class CraftWorld implements World { ChunkProviderServer cps = world.getChunkProviderServer(); for (net.minecraft.server.Chunk chunk : cps.chunks.values()) { // If in use, skip it @@ -140,5 +140,5 @@ index 24b4a7ea..416e86af 100644 } -- -2.13.1.windows.2 +2.14.2 diff --git a/work/CraftBukkit b/work/CraftBukkit index a3b3a421ac..59fa98bfb7 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit a3b3a421ac4ace7786a5375c4c0b4c39d3d9d0ba +Subproject commit 59fa98bfb7ca40b65af91af573708fab4e1b4f6a