From d91ac35d7663a4843d13733f2b6a4fd2df3f7be6 Mon Sep 17 00:00:00 2001 From: Ivan Pekov Date: Fri, 4 Sep 2020 09:19:36 +0300 Subject: [PATCH] Updated Upstream and Sidestream(s) (Tuinity) Upstream/An Sidestream has released updates that appears to apply and compile correctly This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing. Tuinity Changes: e59b60b Updated Upstream (Paper) 09f62a7 Rebuild patches b041d11 Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.2 4468be2 Updated Upstream (Paper) --- .gitmodules | 6 ------ PATCHES.md | 1 - Tuinity | 2 +- .../server/0001-Yatopia-Server-Fixes.patch | 12 ++++++------ .../0027-Fix-lead-fall-dmg-config.patch | 2 +- ...0035-lithium-collision-optimizations.patch | 2 +- ...the-chunk-that-you-re-teleporting-to.patch | 2 +- ...0041-Fix-vanilla-generation-deadlock.patch | 19 ------------------- ...0041-Nuke-streams-off-BlockPosition.patch} | 2 +- ...42-Nuke-streams-off-SectionPosition.patch} | 0 scripts/fetchUpstream.sh | 6 +++--- 11 files changed, 14 insertions(+), 40 deletions(-) delete mode 100644 patches/server/0041-Fix-vanilla-generation-deadlock.patch rename patches/server/{0042-Nuke-streams-off-BlockPosition.patch => 0041-Nuke-streams-off-BlockPosition.patch} (99%) rename patches/server/{0043-Nuke-streams-off-SectionPosition.patch => 0042-Nuke-streams-off-SectionPosition.patch} (100%) diff --git a/.gitmodules b/.gitmodules index f7e102b7..ca6f3628 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,29 +2,23 @@ path = Tuinity url = https://github.com/YatopiaMC/Yatopia-Tuninty.git branch = ver/1.16.2 - update = merge [submodule "Akarin"] path = Akarin url = https://github.com/Akarin-project/Akarin.git branch = 1.16.2 - update = merge [submodule "Purpur"] path = Purpur url = https://github.com/pl3xgaming/Purpur.git branch = ver/1.16.2 - update = merge [submodule "Empirecraft"] path = Empirecraft url = https://github.com/starlis/empirecraft.git branch = ver/1.16.2 - update = merge [submodule "Origami"] path = Origami url = https://github.com/Minebench/Origami.git branch = 1.16 - update = merge [submodule "Rainforest"] path = Rainforest url = https://github.com/Proximyst/Rainforest.git branch = ver/1.16 - update = merge diff --git a/PATCHES.md b/PATCHES.md index 4504044c..62013a2c 100644 --- a/PATCHES.md +++ b/PATCHES.md @@ -56,7 +56,6 @@ # Patches | server | Fix lead fall dmg config | tr7zw | | | server | Fix recipe crash | Ivan Pekov | | | server | Fix the dead lagging the server | William Blake Galbreath | | -| server | Fix vanilla generation deadlock | Aikar | | | server | Giants AI settings | William Blake Galbreath | | | server | Global Eula file | tr7zw | | | server | Heavily optimize furnance fuel and recipe lookups | tr7zw | | diff --git a/Tuinity b/Tuinity index a218f5d9..e59b60b7 160000 --- a/Tuinity +++ b/Tuinity @@ -1 +1 @@ -Subproject commit a218f5d9795d023ab3b640ac94c58a3a77eb0401 +Subproject commit e59b60b7e6ca5c8c9bf58f5e265695c7bc87f727 diff --git a/patches/server/0001-Yatopia-Server-Fixes.patch b/patches/server/0001-Yatopia-Server-Fixes.patch index 40785bd9..8c908ee3 100644 --- a/patches/server/0001-Yatopia-Server-Fixes.patch +++ b/patches/server/0001-Yatopia-Server-Fixes.patch @@ -733,7 +733,7 @@ index 8347faf8a7ee62d27cf5eb9f285695fddadfa624..00000000000000000000000000000000 - - AttributeDefaults.a(); diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 1a72560add8fd717bd2476afd6bd41d0aac58ea5..bb6b25c4708b05837132b4a47ad091595b8dcb23 100644 +index 6219bc3961e124a3db7493d1193e8e7cb034b794..5e4744e856596f1ef234e2c3b1e5d15a3adbd32a 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -442,7 +442,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -754,7 +754,7 @@ index 1a72560add8fd717bd2476afd6bd41d0aac58ea5..bb6b25c4708b05837132b4a47ad09159 } public void resetPortalCooldown() { -@@ -2376,7 +2376,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -2377,7 +2377,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke WorldServer worldserver1 = minecraftserver.getWorldServer(resourcekey); if (true && !this.isPassenger() && this.portalTicks++ >= i) { // CraftBukkit @@ -763,7 +763,7 @@ index 1a72560add8fd717bd2476afd6bd41d0aac58ea5..bb6b25c4708b05837132b4a47ad09159 this.portalTicks = i; this.resetPortalCooldown(); // CraftBukkit start -@@ -2386,7 +2386,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -2387,7 +2387,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke this.b(worldserver1); } // CraftBukkit end @@ -772,7 +772,7 @@ index 1a72560add8fd717bd2476afd6bd41d0aac58ea5..bb6b25c4708b05837132b4a47ad09159 } this.inPortal = false; -@@ -2769,14 +2769,14 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -2770,14 +2770,14 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke } // Paper end if (this.world instanceof WorldServer && !this.dead) { @@ -789,7 +789,7 @@ index 1a72560add8fd717bd2476afd6bd41d0aac58ea5..bb6b25c4708b05837132b4a47ad09159 ShapeDetectorShape shapedetectorshape = (location == null) ? this.a(worldserver) : new ShapeDetectorShape(new Vec3D(location.getX(), location.getY(), location.getZ()), Vec3D.a, this.yaw, this.pitch, worldserver, null); // CraftBukkit if (shapedetectorshape == null) { -@@ -2809,10 +2809,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -2810,10 +2810,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke } this.bM(); @@ -802,7 +802,7 @@ index 1a72560add8fd717bd2476afd6bd41d0aac58ea5..bb6b25c4708b05837132b4a47ad09159 return entity; } } else { -@@ -3047,7 +3047,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -3048,7 +3048,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke entity.a(entity1, Entity::teleportAndSync); } diff --git a/patches/server/0027-Fix-lead-fall-dmg-config.patch b/patches/server/0027-Fix-lead-fall-dmg-config.patch index b56b6293..c4af5b5e 100644 --- a/patches/server/0027-Fix-lead-fall-dmg-config.patch +++ b/patches/server/0027-Fix-lead-fall-dmg-config.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix lead fall dmg config diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index bb6b25c4708b05837132b4a47ad091595b8dcb23..954e2b1c7f377a2c461a6be9bfd73082e8f0f4f8 100644 +index 5e4744e856596f1ef234e2c3b1e5d15a3adbd32a..9f9e564ebf2c052bc378ad93a2b03fb322e7dcdb 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1266,6 +1266,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/patches/server/0035-lithium-collision-optimizations.patch b/patches/server/0035-lithium-collision-optimizations.patch index 3fc6b69a..94e19b76 100644 --- a/patches/server/0035-lithium-collision-optimizations.patch +++ b/patches/server/0035-lithium-collision-optimizations.patch @@ -826,7 +826,7 @@ index ac6e5e3309affc830d4db07fd9b8d809c3085033..37a3b26cdeb02acb8051f0a99313de79 } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 954e2b1c7f377a2c461a6be9bfd73082e8f0f4f8..8aca5580ca3dc19d38279eb779f964e86ee59ad8 100644 +index 9f9e564ebf2c052bc378ad93a2b03fb322e7dcdb..961ef2981f228460e9d6de8e9f7dae587d0e9d6b 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -75,7 +75,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/patches/server/0039-Load-also-the-chunk-that-you-re-teleporting-to.patch b/patches/server/0039-Load-also-the-chunk-that-you-re-teleporting-to.patch index ab1dfd8f..9bb2457a 100644 --- a/patches/server/0039-Load-also-the-chunk-that-you-re-teleporting-to.patch +++ b/patches/server/0039-Load-also-the-chunk-that-you-re-teleporting-to.patch @@ -27,7 +27,7 @@ index db2666d2cb03b5f8c714249ab9ebffa783fde334..adda64b92b7ea1a62d18ebe81c9a5bc5 // Tuinity end diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index f1710a53fa0440281013221b4c518ecaf1707fc4..8b9aae9e3b5e7b2e74b7f9fadc0118c328ba92db 100644 +index 407c03408a312d54ab16a80ccdee5308af43c62f..f938732a64e8672873b8387d20776a5a73f4c01b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -545,7 +545,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/0041-Fix-vanilla-generation-deadlock.patch b/patches/server/0041-Fix-vanilla-generation-deadlock.patch deleted file mode 100644 index 776d55c7..00000000 --- a/patches/server/0041-Fix-vanilla-generation-deadlock.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Aikar -Date: Wed, 2 Sep 2020 09:26:00 +0300 -Subject: [PATCH] Fix vanilla generation deadlock - -Comment from ivan: expect this to be dropped when paper ports this - -diff --git a/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java b/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java -index e9fbeaf309735ea5fcb0c53b8b2485b0c5dd43be..23341b06b3a2bc98829520045308e006afe29f21 100644 ---- a/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java -+++ b/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java -@@ -379,6 +379,6 @@ public class RegionLimitedWorldAccess implements GeneratorAccessSeed { - - @Override - public Stream> a(SectionPosition sectionposition, StructureGenerator structuregenerator) { -- return this.f.a(sectionposition, structuregenerator); -+ return this.f.getStructureManager().a(this).a(sectionposition, structuregenerator); // Yatopia - } - } diff --git a/patches/server/0042-Nuke-streams-off-BlockPosition.patch b/patches/server/0041-Nuke-streams-off-BlockPosition.patch similarity index 99% rename from patches/server/0042-Nuke-streams-off-BlockPosition.patch rename to patches/server/0041-Nuke-streams-off-BlockPosition.patch index d599c41a..d805d231 100644 --- a/patches/server/0042-Nuke-streams-off-BlockPosition.patch +++ b/patches/server/0041-Nuke-streams-off-BlockPosition.patch @@ -89,7 +89,7 @@ index e6b5a21c523c598f53207d024322301fbae74825..5e0aa6e35b1d4e23fdf42add15420665 return a(MathHelper.floor(axisalignedbb.minX), MathHelper.floor(axisalignedbb.minY), MathHelper.floor(axisalignedbb.minZ), MathHelper.floor(axisalignedbb.maxX), MathHelper.floor(axisalignedbb.maxY), MathHelper.floor(axisalignedbb.maxZ)); } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 8aca5580ca3dc19d38279eb779f964e86ee59ad8..ee4ed15a926a2913959158499782b3f7f915d8bc 100644 +index 961ef2981f228460e9d6de8e9f7dae587d0e9d6b..344177bc815264e07a3695d9f0c3a1cd90899aa7 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -804,11 +804,25 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/patches/server/0043-Nuke-streams-off-SectionPosition.patch b/patches/server/0042-Nuke-streams-off-SectionPosition.patch similarity index 100% rename from patches/server/0043-Nuke-streams-off-SectionPosition.patch rename to patches/server/0042-Nuke-streams-off-SectionPosition.patch diff --git a/scripts/fetchUpstream.sh b/scripts/fetchUpstream.sh index 5994448a..a137f006 100755 --- a/scripts/fetchUpstream.sh +++ b/scripts/fetchUpstream.sh @@ -19,14 +19,14 @@ function updateAll { update Origami 1.16 update Purpur ver/1.16.2 update Rainforest ver/1.16 - update Tuinity 1.16.2tmp + update Tuinity ver/1.16.2 git submodule update --recursive } if [ -z "$1" ]; then updateAll elif [ "$1" == "true" ]; then - update Tuinity 1.16.2tmp + update Tuinity ver/1.16.2 git submodule update --recursive elif [ "$1" == "false" ]; then if [ "$2" == "true" ]; then @@ -36,7 +36,7 @@ elif [ "$1" == "false" ]; then git clean -fx git clean -fd git fetch - git reset --hard origin/1.16.2tmp + git reset --hard origin/ver/1.16.2 git submodule update --init --recursive -f else updateAll