From c280d84172d18f92f00a4ff4f750cdbc0c2237aa Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 25 Jul 2018 01:11:08 -0400 Subject: [PATCH] Update upstream and remove hopper patch for #1270 --- ...roto-Chunks.patch => 0305-Don-t-save-Proto-Chunks.patch} | 6 +++--- ...-RegistryID.c.patch => 0306-Optimize-RegistryID.c.patch} | 6 +++--- ...ion-to-prevent-armor-stands-from-doing-entity-loo.patch} | 6 +++--- ... => 0308-Thread-Safe-Iteration-of-Chunk-Scheduler.patch} | 4 ++-- ...k-chunk-dirty-anytime-entities-change-to-guarante.patch} | 4 ++-- ...tch => 0310-Add-some-Debug-to-Chunk-Entity-slices.patch} | 6 +++--- ...le-Cache.patch => 0311-Optimize-Region-File-Cache.patch} | 4 ++-- .../server}/0305-Optimize-Hoppers.patch | 0 work/CraftBukkit | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) rename Spigot-Server-Patches/{0306-Don-t-save-Proto-Chunks.patch => 0305-Don-t-save-Proto-Chunks.patch} (92%) rename Spigot-Server-Patches/{0307-Optimize-RegistryID.c.patch => 0306-Optimize-RegistryID.c.patch} (94%) rename Spigot-Server-Patches/{0308-Option-to-prevent-armor-stands-from-doing-entity-loo.patch => 0307-Option-to-prevent-armor-stands-from-doing-entity-loo.patch} (93%) rename Spigot-Server-Patches/{0309-Thread-Safe-Iteration-of-Chunk-Scheduler.patch => 0308-Thread-Safe-Iteration-of-Chunk-Scheduler.patch} (94%) rename Spigot-Server-Patches/{0310-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch => 0309-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch} (90%) rename Spigot-Server-Patches/{0311-Add-some-Debug-to-Chunk-Entity-slices.patch => 0310-Add-some-Debug-to-Chunk-Entity-slices.patch} (95%) rename Spigot-Server-Patches/{0312-Optimize-Region-File-Cache.patch => 0311-Optimize-Region-File-Cache.patch} (96%) rename {Spigot-Server-Patches => removed/server}/0305-Optimize-Hoppers.patch (100%) diff --git a/Spigot-Server-Patches/0306-Don-t-save-Proto-Chunks.patch b/Spigot-Server-Patches/0305-Don-t-save-Proto-Chunks.patch similarity index 92% rename from Spigot-Server-Patches/0306-Don-t-save-Proto-Chunks.patch rename to Spigot-Server-Patches/0305-Don-t-save-Proto-Chunks.patch index 45a16ffeeb..a9273c1ef9 100644 --- a/Spigot-Server-Patches/0306-Don-t-save-Proto-Chunks.patch +++ b/Spigot-Server-Patches/0305-Don-t-save-Proto-Chunks.patch @@ -1,4 +1,4 @@ -From 114ef33e651ac74cef786afa84ff16003b0cccfb Mon Sep 17 00:00:00 2001 +From 29f7275b4762c83996dee6cd72fa71af7adc0f81 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 22 Jul 2018 21:21:41 -0400 Subject: [PATCH] Don't save Proto Chunks @@ -8,7 +8,7 @@ the loadChunk method refuses to acknoledge they exists, and will restart a new chunk generation process to begin with, so saving them serves no benefit. diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index ea8684747..a97e024ec 100644 +index 5fd0c0cf50..43348a627f 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -282,6 +282,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { @@ -20,7 +20,7 @@ index ea8684747..a97e024ec 100644 world.checkSession(); diff --git a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java -index 501565dd5..7b3068753 100644 +index 501565dd5d..7b30687530 100644 --- a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java +++ b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java @@ -23,7 +23,7 @@ public class ChunkTaskScheduler extends Scheduler Date: Mon, 23 Jul 2018 13:08:19 -0400 Subject: [PATCH] Optimize RegistryID.c() @@ -6,7 +6,7 @@ Subject: [PATCH] Optimize RegistryID.c() This is a frequent hotspot for world loading/saving. diff --git a/src/main/java/net/minecraft/server/RegistryID.java b/src/main/java/net/minecraft/server/RegistryID.java -index bde5714d..a01cda9d 100644 +index bde5714dd6..a01cda9d81 100644 --- a/src/main/java/net/minecraft/server/RegistryID.java +++ b/src/main/java/net/minecraft/server/RegistryID.java @@ -14,12 +14,14 @@ public class RegistryID implements Registry { // Paper - decompile fix @@ -64,5 +64,5 @@ index bde5714d..a01cda9d 100644 public int b() { -- -2.17.0 (Apple Git-106) +2.18.0 diff --git a/Spigot-Server-Patches/0308-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0307-Option-to-prevent-armor-stands-from-doing-entity-loo.patch similarity index 93% rename from Spigot-Server-Patches/0308-Option-to-prevent-armor-stands-from-doing-entity-loo.patch rename to Spigot-Server-Patches/0307-Option-to-prevent-armor-stands-from-doing-entity-loo.patch index 46c822556c..c8f9f70135 100644 --- a/Spigot-Server-Patches/0308-Option-to-prevent-armor-stands-from-doing-entity-loo.patch +++ b/Spigot-Server-Patches/0307-Option-to-prevent-armor-stands-from-doing-entity-loo.patch @@ -1,11 +1,11 @@ -From 6e268e2762db21feffbcde6e6d4b2e5e2d8e8668 Mon Sep 17 00:00:00 2001 +From 51044d9a361f21f02b6c9fadb0a9d9d5e37d636c Mon Sep 17 00:00:00 2001 From: Hugo Manrique Date: Mon, 23 Jul 2018 12:57:39 +0200 Subject: [PATCH] Option to prevent armor stands from doing entity lookups diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index a8470e6e7..f33cd90d2 100644 +index b9f5f49055..aa95372e69 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -350,6 +350,11 @@ public class PaperWorldConfig { @@ -21,7 +21,7 @@ index a8470e6e7..f33cd90d2 100644 private void maxEntityCollision() { maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) ); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 127dcedc9..72e22c09b 100644 +index 127dcedc97..72e22c09ba 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -11,6 +11,7 @@ import java.util.Iterator; diff --git a/Spigot-Server-Patches/0309-Thread-Safe-Iteration-of-Chunk-Scheduler.patch b/Spigot-Server-Patches/0308-Thread-Safe-Iteration-of-Chunk-Scheduler.patch similarity index 94% rename from Spigot-Server-Patches/0309-Thread-Safe-Iteration-of-Chunk-Scheduler.patch rename to Spigot-Server-Patches/0308-Thread-Safe-Iteration-of-Chunk-Scheduler.patch index 261f818d39..194f1e38ab 100644 --- a/Spigot-Server-Patches/0309-Thread-Safe-Iteration-of-Chunk-Scheduler.patch +++ b/Spigot-Server-Patches/0308-Thread-Safe-Iteration-of-Chunk-Scheduler.patch @@ -1,11 +1,11 @@ -From b8644d59101dbe08f8213be53d43d51a2e41a300 Mon Sep 17 00:00:00 2001 +From fc2eced1f0c62db6c0eea3efac000fd94ad623a6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 23 Jul 2018 19:13:06 -0400 Subject: [PATCH] Thread Safe Iteration of Chunk Scheduler diff --git a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java -index 7b3068753..45f9ad372 100644 +index 7b30687530..45f9ad3726 100644 --- a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java +++ b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java @@ -1,8 +1,10 @@ diff --git a/Spigot-Server-Patches/0310-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch b/Spigot-Server-Patches/0309-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch similarity index 90% rename from Spigot-Server-Patches/0310-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch rename to Spigot-Server-Patches/0309-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch index e7bd156ddf..a615839752 100644 --- a/Spigot-Server-Patches/0310-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch +++ b/Spigot-Server-Patches/0309-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch @@ -1,4 +1,4 @@ -From 37d9641af77fd0ec11e932162a0125bd53f05ce3 Mon Sep 17 00:00:00 2001 +From f159b677ff7fabd0341ec5ae5b74bddda4d86b52 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 23 Jul 2018 22:18:31 -0400 Subject: [PATCH] Mark chunk dirty anytime entities change to guarantee it @@ -6,7 +6,7 @@ Subject: [PATCH] Mark chunk dirty anytime entities change to guarantee it diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 95c6812d7..aa75cc420 100644 +index 95c6812d7d..aa75cc4205 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -714,6 +714,7 @@ public class Chunk implements IChunkAccess { diff --git a/Spigot-Server-Patches/0311-Add-some-Debug-to-Chunk-Entity-slices.patch b/Spigot-Server-Patches/0310-Add-some-Debug-to-Chunk-Entity-slices.patch similarity index 95% rename from Spigot-Server-Patches/0311-Add-some-Debug-to-Chunk-Entity-slices.patch rename to Spigot-Server-Patches/0310-Add-some-Debug-to-Chunk-Entity-slices.patch index 14e6a515b3..2cf4f08847 100644 --- a/Spigot-Server-Patches/0311-Add-some-Debug-to-Chunk-Entity-slices.patch +++ b/Spigot-Server-Patches/0310-Add-some-Debug-to-Chunk-Entity-slices.patch @@ -1,4 +1,4 @@ -From 1a1fa5156619969d65be7638a7cd2f056c9a933c Mon Sep 17 00:00:00 2001 +From 8b56a881c447a5f3f72582d443339843298a1f16 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 23 Jul 2018 22:44:23 -0400 Subject: [PATCH] Add some Debug to Chunk Entity slices @@ -9,7 +9,7 @@ This should hopefully avoid duplicate entities ever being created if the entity was to end up in 2 different chunk slices diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index aa75cc420..56a74c606 100644 +index aa75cc4205..56a74c6062 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -712,8 +712,33 @@ public class Chunk implements IChunkAccess { @@ -61,7 +61,7 @@ index aa75cc420..56a74c606 100644 if (entity instanceof EntityItem) { itemCounts[i]--; diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index b6d6d4f37..bc4ba9f3c 100644 +index 9f2a23d693..7a63114fe5 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -63,6 +63,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/Spigot-Server-Patches/0312-Optimize-Region-File-Cache.patch b/Spigot-Server-Patches/0311-Optimize-Region-File-Cache.patch similarity index 96% rename from Spigot-Server-Patches/0312-Optimize-Region-File-Cache.patch rename to Spigot-Server-Patches/0311-Optimize-Region-File-Cache.patch index 0709758d4a..5c808735c9 100644 --- a/Spigot-Server-Patches/0312-Optimize-Region-File-Cache.patch +++ b/Spigot-Server-Patches/0311-Optimize-Region-File-Cache.patch @@ -1,4 +1,4 @@ -From e979cf5f12f51ca8cea8931026b091f21cc62eb9 Mon Sep 17 00:00:00 2001 +From cf496744a11659b8a12697b56a3d057b24203df9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 23 Jul 2018 23:40:04 -0400 Subject: [PATCH] Optimize Region File Cache @@ -32,7 +32,7 @@ synchronized context, reducing lock times. Ultimately: This brings us back to Vanilla, which has had no indication of region file loss. diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java -index 3b8d01ea1..609d6c355 100644 +index 3b8d01ea1a..609d6c3550 100644 --- a/src/main/java/net/minecraft/server/RegionFileCache.java +++ b/src/main/java/net/minecraft/server/RegionFileCache.java @@ -97,7 +97,7 @@ public class RegionFileCache { diff --git a/Spigot-Server-Patches/0305-Optimize-Hoppers.patch b/removed/server/0305-Optimize-Hoppers.patch similarity index 100% rename from Spigot-Server-Patches/0305-Optimize-Hoppers.patch rename to removed/server/0305-Optimize-Hoppers.patch diff --git a/work/CraftBukkit b/work/CraftBukkit index 49a2604e1f..9646d8d780 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 49a2604e1f8721c813820c847f971df4c25002e1 +Subproject commit 9646d8d7800931effa31be173fda765ecdf996c4