From a26eb46e28c777783e1efd3a7167a3ac7accd2b7 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Mon, 28 Jun 2021 13:17:21 -0500 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: e895403 Improve horrible CraftChunk#getEntities performance (#5999) ba7ffd0 Implement Sound.Source.Provider (#5935) --- gradle.properties | 2 +- .../server/0001-Tuinity-Server-Changes.patch | 18 +----------------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/gradle.properties b/gradle.properties index 5a18b7700..827ab7ebf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ version = 1.17-R0.1-SNAPSHOT mcVersion = 1.17 packageVersion = 1_17_R1 -paperCommit = 0ad55267a387bf9cea3b6d0caeb843b3253cca65 +paperCommit = ba7ffd06e9f08910d05e059f239838c4f94ea4d6 org.gradle.parallel = true org.gradle.vfs.watch = false diff --git a/patches/server/0001-Tuinity-Server-Changes.patch b/patches/server/0001-Tuinity-Server-Changes.patch index 1391873d3..1e22d9b4e 100644 --- a/patches/server/0001-Tuinity-Server-Changes.patch +++ b/patches/server/0001-Tuinity-Server-Changes.patch @@ -16384,7 +16384,7 @@ index f01182a0ac8a14bcd5b1deb778306e7bf1bf70ed..2cfc54a577d0a63a504e24bc54fd763f } } diff --git a/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java b/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java -index e94b5a7fe47831e2c3e0935e316737a2422e4250..265343f8663e0c9551ed286d954889ad08043b16 100644 +index 79e733b3ea2e6589d60f3b322244479d2b3b9f86..a99d0a00bbdb90588b87a3f85c62bdc1468b5e5a 100644 --- a/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java +++ b/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java @@ -41,8 +41,10 @@ public class PersistentEntitySectionManager implements A @@ -16920,22 +16920,6 @@ index f325d76c79d63629200262a77eab7cdcc9beedfa..ad23eafd6d9e7901f726977ad8404fa3 Direction.Axis axis = direction.getAxis(); DoubleList doubleList = this.getCoords(axis); if (doubleList.size() == 2 && DoubleMath.fuzzyEquals(doubleList.getDouble(0), 0.0D, 1.0E-7D) && DoubleMath.fuzzyEquals(doubleList.getDouble(1), 1.0D, 1.0E-7D)) { -diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java -index 08a5fabb1d13db26014bb5751aa271c0a0bdcb7a..05dae6fae8482dba551974f3a348d86b30c47c96 100644 ---- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java -+++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java -@@ -111,10 +111,7 @@ public class CraftChunk implements Chunk { - } - - Location location = new Location(null, 0, 0, 0); -- return this.getWorld().getEntities().stream().filter((entity) -> { -- entity.getLocation(location); -- return location.getBlockX() >> 4 == this.x && location.getBlockZ() >> 4 == this.z; -- }).toArray(Entity[]::new); -+ return ((CraftWorld)this.getWorld()).getHandle().getChunkEntities(this.x, this.z); // Tuinity - optimise this... jesus christ, iterating over all entities? - } - - @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java index b020d44f95ab8aafb270ca6e36abe86d6589fc9b..2aa45667054a721465f353f0500e30d90f7d16a4 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java