diff --git a/PATCHES.md b/PATCHES.md index d650c23d..b95f2414 100644 --- a/PATCHES.md +++ b/PATCHES.md @@ -57,7 +57,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 | Further improve tuinity's portal crash fix | Ivan Pekov | | | 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 e36359ed..483289c7 160000 --- a/Tuinity +++ b/Tuinity @@ -1 +1 @@ -Subproject commit e36359ed6bacdb92977c443bdc6315954245721e +Subproject commit 483289c76b88b5fcd05923e3a5dceacc0e5af0cc diff --git a/patches/server/0001-Yatopia-Server-Fixes.patch b/patches/server/0001-Yatopia-Server-Fixes.patch index 80c2bf05..4da0ec83 100644 --- a/patches/server/0001-Yatopia-Server-Fixes.patch +++ b/patches/server/0001-Yatopia-Server-Fixes.patch @@ -1596,7 +1596,7 @@ index d1016d22fbb2dd15042fd6ccdf2ee7848351e518..00000000000000000000000000000000 - - entitypigzombie.addEffect(new MobEffect(MobEffects.CONFUSION, 200, 0)); diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 5e0285023676c0e99880f126a456cd84713fb065..0e84f43a5001fbad8acd5677a1f1e26968766bde 100644 +index e41054e606a60319b5c2d98dcb166b5755d23867..06ec0b2e734f0192a74da49a692a9675b2d51bb8 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -765,11 +765,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -2243,7 +2243,7 @@ index 759862aba781ec6f1ae0c9a76c4ab6352d603a4c..00000000000000000000000000000000 - - if (chunkHolder.protoChunk != null) {try (Timing ignored2 = this.world.timings.chunkLoadLevelTimer.startTimingIfSync()) { // Paper start - timings // Paper - chunk is created async diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java -index 205f3f697e9c31674a4ac8db38467bb2e61cfe6b..6b2465bfe540af5d609160e6d232564b1d6c0617 100644 +index 9273fc22df2c9618efb09a8f95fd7e7f08652f88..67018d2abcca8f9dd71fc3a6bfff19c85e8bcef0 100644 --- a/src/main/java/net/minecraft/server/PortalTravelAgent.java +++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java @@ -23,15 +23,17 @@ public class PortalTravelAgent { diff --git a/patches/server/0031-Use-block-distance-in-portal-search-radius.patch b/patches/server/0031-Use-block-distance-in-portal-search-radius.patch index c25b6222..c2c253f8 100644 --- a/patches/server/0031-Use-block-distance-in-portal-search-radius.patch +++ b/patches/server/0031-Use-block-distance-in-portal-search-radius.patch @@ -28,7 +28,7 @@ index 7fc45446218ee6a31abca2e16d192efff5e4aaf9..39b9372eee675b4d9ec0f41d72f149aa } diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java -index 6b2465bfe540af5d609160e6d232564b1d6c0617..3c6fb2dfd4d7e8951ea5e0b93eb5b28d2078f51b 100644 +index 67018d2abcca8f9dd71fc3a6bfff19c85e8bcef0..d861368550a8811eb442c30c508023f6029daa4a 100644 --- a/src/main/java/net/minecraft/server/PortalTravelAgent.java +++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java @@ -29,6 +29,15 @@ public class PortalTravelAgent { diff --git a/patches/server/0040-Highly-optimize-VillagePlace-filtering.patch b/patches/server/0040-Highly-optimize-VillagePlace-filtering.patch index 6e0767a3..2a2d8e3f 100644 --- a/patches/server/0040-Highly-optimize-VillagePlace-filtering.patch +++ b/patches/server/0040-Highly-optimize-VillagePlace-filtering.patch @@ -114,7 +114,7 @@ index b46b20cae83e5e39ee2818c3d080b23b65bd1451..f724ca51511691f036cf03e07fea6065 Vec3D vec3d = Vec3D.a; diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java -index 3c6fb2dfd4d7e8951ea5e0b93eb5b28d2078f51b..0b44f23b3d345df49663f4135b4b6bbf7b75f54f 100644 +index d861368550a8811eb442c30c508023f6029daa4a..e337b62eafafba3dcb5d0bddf16237c78b8aa6e2 100644 --- a/src/main/java/net/minecraft/server/PortalTravelAgent.java +++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java @@ -28,7 +28,7 @@ public class PortalTravelAgent { diff --git a/patches/server/0045-Further-improve-tuinity-s-portal-crash-fix.patch b/patches/server/0045-Further-improve-tuinity-s-portal-crash-fix.patch deleted file mode 100644 index 347064d8..00000000 --- a/patches/server/0045-Further-improve-tuinity-s-portal-crash-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Ivan Pekov -Date: Wed, 9 Sep 2020 16:49:11 +0300 -Subject: [PATCH] Further improve tuinity's portal crash fix - -so we never have equal directions if the direction block property isn't present on the given block data - -diff --git a/src/main/java/net/minecraft/server/BlockPortalShape.java b/src/main/java/net/minecraft/server/BlockPortalShape.java -index a848447260f77b85e5f1bfaedeb16d7d068e00d8..993f58a2a0c168d705fc956e388c5a15c8bca31e 100644 ---- a/src/main/java/net/minecraft/server/BlockPortalShape.java -+++ b/src/main/java/net/minecraft/server/BlockPortalShape.java -@@ -228,6 +228,16 @@ public class BlockPortalShape { - BlockPosition blockposition = blockutil_rectangle.origin; - IBlockData iblockdata = worldserver.getType(blockposition); - EnumDirection.EnumAxis enumdirection_enumaxis1 = !iblockdata.contains(BlockProperties.E) ? enumdirection_enumaxis : (EnumDirection.EnumAxis) iblockdata.get(BlockProperties.E); // Tuinity - use provided direction if the block doesn't have one -+ // Yatopia start - improve tuinity's fix -+ // basically cycle thru the X and Z direction so we never have equal directions if we don't have that block property -+ if (!iblockdata.contains(BlockProperties.E)) { -+ if (enumdirection_enumaxis1 == EnumDirection.EnumAxis.X) { -+ enumdirection_enumaxis1 = EnumDirection.EnumAxis.Z; -+ } else if (enumdirection_enumaxis1 == EnumDirection.EnumAxis.Z || enumdirection_enumaxis == EnumDirection.EnumAxis.Y) { -+ enumdirection_enumaxis1 = EnumDirection.EnumAxis.X; -+ } -+ } -+ // Yatopia end - double d0 = (double) blockutil_rectangle.side1; - double d1 = (double) blockutil_rectangle.side2; - int i = enumdirection_enumaxis == enumdirection_enumaxis1 ? 0 : 90; diff --git a/patches/server/0046-Respect-permissions-when-constructing-InventoryEnder.patch b/patches/server/0045-Respect-permissions-when-constructing-InventoryEnder.patch similarity index 100% rename from patches/server/0046-Respect-permissions-when-constructing-InventoryEnder.patch rename to patches/server/0045-Respect-permissions-when-constructing-InventoryEnder.patch diff --git a/patches/server/0047-Fix-Unable-to-save-chunk-error.patch b/patches/server/0046-Fix-Unable-to-save-chunk-error.patch similarity index 100% rename from patches/server/0047-Fix-Unable-to-save-chunk-error.patch rename to patches/server/0046-Fix-Unable-to-save-chunk-error.patch