From 00307085090acddecceabbe3c09617951f79b477 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 19 Jul 2018 16:55:27 -0500 Subject: [PATCH] Move decomp fix from last up to fixes patch --- Spigot-Server-Patches/0003-MC-Dev-fixes.patch | 59 ++++++++++++++++++- .../0129-Fix-Old-Sign-Conversion.patch | 55 +---------------- ...llow-entities-to-ride-themselves-572.patch | 4 +- .../0174-Fix-block-break-desync.patch | 4 +- ...PI-for-Reason-Source-Triggering-play.patch | 4 +- .../0176-Cap-Entity-Collisions.patch | 4 +- ...e-CraftScheduler-Async-Task-Debugger.patch | 4 +- .../0178-Shame-on-you-Mojang.patch | 4 +- ...more-aggressive-in-the-chunk-unload-.patch | 4 +- .../0180-Do-not-let-armorstands-drown.patch | 4 +- ...le-async-calls-to-restart-the-server.patch | 4 +- ...property-to-disable-book-size-limits.patch | 4 +- 12 files changed, 79 insertions(+), 75 deletions(-) diff --git a/Spigot-Server-Patches/0003-MC-Dev-fixes.patch b/Spigot-Server-Patches/0003-MC-Dev-fixes.patch index 435437e4c7..594c48a316 100644 --- a/Spigot-Server-Patches/0003-MC-Dev-fixes.patch +++ b/Spigot-Server-Patches/0003-MC-Dev-fixes.patch @@ -1,4 +1,4 @@ -From f25c458df3c7d564f49697dbdcf59faea5375903 Mon Sep 17 00:00:00 2001 +From 1b41bf7f810b3bd6c90db0a7c4ee15776bc6f832 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 30 Mar 2016 19:36:20 -0400 Subject: [PATCH] MC Dev fixes @@ -56,6 +56,61 @@ index 002da2a19..121a137f3 100644 ++this.j; } +diff --git a/src/main/java/net/minecraft/server/DefinedStructure.java b/src/main/java/net/minecraft/server/DefinedStructure.java +index 65910508f..15c7cc170 100644 +--- a/src/main/java/net/minecraft/server/DefinedStructure.java ++++ b/src/main/java/net/minecraft/server/DefinedStructure.java +@@ -88,7 +88,7 @@ public class DefinedStructure { + } + + private void a(World world, BlockPosition blockposition, BlockPosition blockposition1) { +- List list = world.a(Entity.class, new AxisAlignedBB(blockposition, blockposition1), (entity) -> { ++ List list = world.a(Entity.class, new AxisAlignedBB(blockposition, blockposition1),(Predicate) (entity) -> { // Paper - decompile fix + return !(entity instanceof EntityHuman); + }); + +@@ -285,21 +285,24 @@ public class DefinedStructure { + voxelshapebitset.a(blockposition3.getX() - i2, blockposition3.getY() - j2, blockposition3.getZ() - l1, true, true); + } + +- voxelshapebitset.a((enumdirection, i, j, k) -> { +- BlockPosition blockposition = new BlockPosition(l + i, i1 + j, j1 + k); +- BlockPosition blockposition1 = blockposition.shift(enumdirection); +- IBlockData iblockdata = generatoraccess.getType(blockposition); ++ // Paper start - decompile fixes ++ int finalL = l1; ++ voxelshapebitset.a((enumdirection, i_, j_, k_) -> { ++ BlockPosition innerBlockposition = new BlockPosition(i2 + i_, j2 + j_, finalL + k_); ++ BlockPosition blockposition1 = innerBlockposition.shift(enumdirection); ++ IBlockData iblockdata = generatoraccess.getType(innerBlockposition); + IBlockData iblockdata1 = generatoraccess.getType(blockposition1); +- IBlockData iblockdata2 = iblockdata.updateState(enumdirection, iblockdata1, generatoraccess, blockposition, blockposition1); ++ IBlockData iblockdata2 = iblockdata.updateState(enumdirection, iblockdata1, generatoraccess, innerBlockposition, blockposition1); + + if (iblockdata != iblockdata2) { +- generatoraccess.setTypeAndData(blockposition, iblockdata2, k1 & -2 | 16); ++ generatoraccess.setTypeAndData(innerBlockposition, iblockdata2, i & -2 | 16); + } + +- IBlockData iblockdata3 = iblockdata1.updateState(enumdirection.opposite(), iblockdata2, generatoraccess, blockposition1, blockposition); ++ IBlockData iblockdata3 = iblockdata1.updateState(enumdirection.opposite(), iblockdata2, generatoraccess, blockposition1, innerBlockposition); + + if (iblockdata1 != iblockdata3) { +- generatoraccess.setTypeAndData(blockposition1, iblockdata3, k1 & -2 | 16); ++ generatoraccess.setTypeAndData(blockposition1, iblockdata3, i & -2 | 16); ++ // Paper end - decompile fixes + } + + }); +@@ -734,7 +737,7 @@ public class DefinedStructure { + public IBlockData a(int i) { + IBlockData iblockdata = (IBlockData) this.b.fromId(i); + +- return iblockdata == null ? DefinedStructure.a.a : iblockdata; ++ return iblockdata == null ? a : iblockdata; // Paper - decompile error - Blocks.AIR.getBlockData() + } + + public Iterator iterator() { -- -2.18.0 +2.17.1 diff --git a/Spigot-Server-Patches/0129-Fix-Old-Sign-Conversion.patch b/Spigot-Server-Patches/0129-Fix-Old-Sign-Conversion.patch index d2d378c3e2..fb27b26e3d 100644 --- a/Spigot-Server-Patches/0129-Fix-Old-Sign-Conversion.patch +++ b/Spigot-Server-Patches/0129-Fix-Old-Sign-Conversion.patch @@ -1,4 +1,4 @@ -From 717f1583e8a53256e87359d2956d13e9f0501ce0 Mon Sep 17 00:00:00 2001 +From 6b3f4ff9f1bbc1a21ec0b323e444cf24e6582eb9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 17 Jun 2016 20:50:11 -0400 Subject: [PATCH] Fix Old Sign Conversion @@ -9,18 +9,9 @@ Subject: [PATCH] Fix Old Sign Conversion This causes Igloos and such to render broken signs. We fix this by ignoring sign conversion for Defined Structures diff --git a/src/main/java/net/minecraft/server/DefinedStructure.java b/src/main/java/net/minecraft/server/DefinedStructure.java -index 65910508f..2109f316d 100644 +index 15c7cc170..2109f316d 100644 --- a/src/main/java/net/minecraft/server/DefinedStructure.java +++ b/src/main/java/net/minecraft/server/DefinedStructure.java -@@ -88,7 +88,7 @@ public class DefinedStructure { - } - - private void a(World world, BlockPosition blockposition, BlockPosition blockposition1) { -- List list = world.a(Entity.class, new AxisAlignedBB(blockposition, blockposition1), (entity) -> { -+ List list = world.a(Entity.class, new AxisAlignedBB(blockposition, blockposition1),(Predicate) (entity) -> { // Paper - decompile fix - return !(entity instanceof EntityHuman); - }); - @@ -218,9 +218,11 @@ public class DefinedStructure { definedstructure_blockinfo1.c.setInt("x", blockposition1.getX()); definedstructure_blockinfo1.c.setInt("y", blockposition1.getY()); @@ -33,48 +24,6 @@ index 65910508f..2109f316d 100644 } } -@@ -285,21 +287,24 @@ public class DefinedStructure { - voxelshapebitset.a(blockposition3.getX() - i2, blockposition3.getY() - j2, blockposition3.getZ() - l1, true, true); - } - -- voxelshapebitset.a((enumdirection, i, j, k) -> { -- BlockPosition blockposition = new BlockPosition(l + i, i1 + j, j1 + k); -- BlockPosition blockposition1 = blockposition.shift(enumdirection); -- IBlockData iblockdata = generatoraccess.getType(blockposition); -+ // Paper start - decompile fixes -+ int finalL = l1; -+ voxelshapebitset.a((enumdirection, i_, j_, k_) -> { -+ BlockPosition innerBlockposition = new BlockPosition(i2 + i_, j2 + j_, finalL + k_); -+ BlockPosition blockposition1 = innerBlockposition.shift(enumdirection); -+ IBlockData iblockdata = generatoraccess.getType(innerBlockposition); - IBlockData iblockdata1 = generatoraccess.getType(blockposition1); -- IBlockData iblockdata2 = iblockdata.updateState(enumdirection, iblockdata1, generatoraccess, blockposition, blockposition1); -+ IBlockData iblockdata2 = iblockdata.updateState(enumdirection, iblockdata1, generatoraccess, innerBlockposition, blockposition1); - - if (iblockdata != iblockdata2) { -- generatoraccess.setTypeAndData(blockposition, iblockdata2, k1 & -2 | 16); -+ generatoraccess.setTypeAndData(innerBlockposition, iblockdata2, i & -2 | 16); - } - -- IBlockData iblockdata3 = iblockdata1.updateState(enumdirection.opposite(), iblockdata2, generatoraccess, blockposition1, blockposition); -+ IBlockData iblockdata3 = iblockdata1.updateState(enumdirection.opposite(), iblockdata2, generatoraccess, blockposition1, innerBlockposition); - - if (iblockdata1 != iblockdata3) { -- generatoraccess.setTypeAndData(blockposition1, iblockdata3, k1 & -2 | 16); -+ generatoraccess.setTypeAndData(blockposition1, iblockdata3, i & -2 | 16); -+ // Paper end - decompile fixes - } - - }); -@@ -734,7 +739,7 @@ public class DefinedStructure { - public IBlockData a(int i) { - IBlockData iblockdata = (IBlockData) this.b.fromId(i); - -- return iblockdata == null ? DefinedStructure.a.a : iblockdata; -+ return iblockdata == null ? a : iblockdata; // Paper - decompile error - Blocks.AIR.getBlockData() - } - - public Iterator iterator() { diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java index 8cab71c0e..2cfe2202e 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java diff --git a/Spigot-Server-Patches/0173-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0173-Don-t-allow-entities-to-ride-themselves-572.patch index 3f9b65cd3b..5a8283ed3b 100644 --- a/Spigot-Server-Patches/0173-Don-t-allow-entities-to-ride-themselves-572.patch +++ b/Spigot-Server-Patches/0173-Don-t-allow-entities-to-ride-themselves-572.patch @@ -1,4 +1,4 @@ -From 3798ecd4669a3bb7d592d3cc5834b4f717f97cce Mon Sep 17 00:00:00 2001 +From 9998cb5e703231aa7a957c741909a28c120e59dd Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Sun, 8 Jan 2017 04:31:36 +0000 Subject: [PATCH] Don't allow entities to ride themselves - #572 @@ -17,5 +17,5 @@ index eb2a693af..b47bf9738 100644 throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)"); } else { -- -2.18.0 +2.17.1 diff --git a/Spigot-Server-Patches/0174-Fix-block-break-desync.patch b/Spigot-Server-Patches/0174-Fix-block-break-desync.patch index 04985407af..a8c3956c54 100644 --- a/Spigot-Server-Patches/0174-Fix-block-break-desync.patch +++ b/Spigot-Server-Patches/0174-Fix-block-break-desync.patch @@ -1,4 +1,4 @@ -From feaed1650da900539a197d0403b66ca40a450f76 Mon Sep 17 00:00:00 2001 +From 9d17fa0376681765789ccddcb32b0310bdf1ed67 Mon Sep 17 00:00:00 2001 From: Michael Himing Date: Sun, 8 Jan 2017 18:50:35 +1100 Subject: [PATCH] Fix block break desync @@ -18,5 +18,5 @@ index f26636e30..aa93b5945 100644 } else if (blockposition.getY() >= this.minecraftServer.getMaxBuildHeight()) { return; -- -2.18.0 +2.17.1 diff --git a/Spigot-Server-Patches/0175-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/0175-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch index 5eb8ca6c57..30f0285f21 100644 --- a/Spigot-Server-Patches/0175-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch +++ b/Spigot-Server-Patches/0175-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch @@ -1,4 +1,4 @@ -From a960bbf4893aca1c08b525a125a9059811080a53 Mon Sep 17 00:00:00 2001 +From abf8017373127327e7990e5f9b1b7c301168a769 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 16:31:46 -0500 Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player @@ -257,5 +257,5 @@ index 3a09cab3d..3302af0e4 100644 public EntityExperienceOrb getHandle() { return (EntityExperienceOrb) entity; -- -2.18.0 +2.17.1 diff --git a/Spigot-Server-Patches/0176-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0176-Cap-Entity-Collisions.patch index 3126128432..ab9ed74570 100644 --- a/Spigot-Server-Patches/0176-Cap-Entity-Collisions.patch +++ b/Spigot-Server-Patches/0176-Cap-Entity-Collisions.patch @@ -1,4 +1,4 @@ -From 696285387c1d5a59682cfa9871b34daf2a0d9ec2 Mon Sep 17 00:00:00 2001 +From 796e78c652161c2fddc66e41eb1342230dbf757b Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 22 Jan 2017 18:07:56 -0500 Subject: [PATCH] Cap Entity Collisions @@ -56,5 +56,5 @@ index 3a38f384e..8e45b557e 100644 this.C(entity); } -- -2.18.0 +2.17.1 diff --git a/Spigot-Server-Patches/0177-Remove-CraftScheduler-Async-Task-Debugger.patch b/Spigot-Server-Patches/0177-Remove-CraftScheduler-Async-Task-Debugger.patch index f272c93d28..d7e015fc3f 100644 --- a/Spigot-Server-Patches/0177-Remove-CraftScheduler-Async-Task-Debugger.patch +++ b/Spigot-Server-Patches/0177-Remove-CraftScheduler-Async-Task-Debugger.patch @@ -1,4 +1,4 @@ -From 3c7ffb3fef36441da8f59ccf6c81417fa9f778d0 Mon Sep 17 00:00:00 2001 +From dac6c2c4e9dc1417cda683cf1ec54f22774da31c Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 5 Feb 2017 00:04:04 -0500 Subject: [PATCH] Remove CraftScheduler Async Task Debugger @@ -58,5 +58,5 @@ index 26753fac5..a2fadaf82 100644 @Deprecated -- -2.18.0 +2.17.1 diff --git a/Spigot-Server-Patches/0178-Shame-on-you-Mojang.patch b/Spigot-Server-Patches/0178-Shame-on-you-Mojang.patch index 390748f29e..11229e57c2 100644 --- a/Spigot-Server-Patches/0178-Shame-on-you-Mojang.patch +++ b/Spigot-Server-Patches/0178-Shame-on-you-Mojang.patch @@ -1,4 +1,4 @@ -From 21ca8f525d11b73f64bc64b3017576d4d203c250 Mon Sep 17 00:00:00 2001 +From 17d230338982a4a23f4e00da04d055e05a6f884f Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 5 Feb 2017 19:17:28 -0500 Subject: [PATCH] Shame on you Mojang @@ -34,5 +34,5 @@ index 1181d45fa..d081166d8 100644 } } -- -2.18.0 +2.17.1 diff --git a/Spigot-Server-Patches/0179-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/Spigot-Server-Patches/0179-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch index 494b33aa0b..26b90fc196 100644 --- a/Spigot-Server-Patches/0179-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch +++ b/Spigot-Server-Patches/0179-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch @@ -1,4 +1,4 @@ -From faf6f763e5a248c321b43f9227a7f2d89d0e48be Mon Sep 17 00:00:00 2001 +From 31b95b88c25e4b25cf7ef32ff4692d1bf937b679 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Tue, 7 Feb 2017 16:55:35 -0600 Subject: [PATCH] Make targetSize more aggressive in the chunk unload queue @@ -18,5 +18,5 @@ index ef35eb7ec..70790386e 100644 LongIterator longiterator = this.unloadQueue.iterator(); -- -2.18.0 +2.17.1 diff --git a/Spigot-Server-Patches/0180-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0180-Do-not-let-armorstands-drown.patch index 8a24eca22f..c430af6045 100644 --- a/Spigot-Server-Patches/0180-Do-not-let-armorstands-drown.patch +++ b/Spigot-Server-Patches/0180-Do-not-let-armorstands-drown.patch @@ -1,4 +1,4 @@ -From 3be96fb3c8235713a60358332f0d6b8f54158997 Mon Sep 17 00:00:00 2001 +From 8cf96bc08605c275cb7d93a65c94983dcb8e6a37 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 18 Feb 2017 19:29:58 -0600 Subject: [PATCH] Do not let armorstands drown @@ -41,5 +41,5 @@ index 8e45b557e..f4a766800 100644 if (this.getAirTicks() == -20) { this.setAirTicks(0); -- -2.18.0 +2.17.1 diff --git a/Spigot-Server-Patches/0181-Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/0181-Properly-handle-async-calls-to-restart-the-server.patch index 78cdd136ff..79ef83c306 100644 --- a/Spigot-Server-Patches/0181-Properly-handle-async-calls-to-restart-the-server.patch +++ b/Spigot-Server-Patches/0181-Properly-handle-async-calls-to-restart-the-server.patch @@ -1,4 +1,4 @@ -From 03f4427d9e549ee29a7bb47b9a1493bcebbf6f8d Mon Sep 17 00:00:00 2001 +From b502589f3799987378d72bfd7fd843b6e888b490 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 12 May 2017 23:34:11 -0500 Subject: [PATCH] Properly handle async calls to restart the server @@ -306,5 +306,5 @@ index 947c43a5d..f15fd9f37 100644 } } -- -2.18.0 +2.17.1 diff --git a/Spigot-Server-Patches/0182-Add-system-property-to-disable-book-size-limits.patch b/Spigot-Server-Patches/0182-Add-system-property-to-disable-book-size-limits.patch index 074df68f29..bb1c7a5888 100644 --- a/Spigot-Server-Patches/0182-Add-system-property-to-disable-book-size-limits.patch +++ b/Spigot-Server-Patches/0182-Add-system-property-to-disable-book-size-limits.patch @@ -1,4 +1,4 @@ -From ab71ec1b00d9f4ae7cac3170b138661f31b89fa5 Mon Sep 17 00:00:00 2001 +From 7212abfc785954f473b1ae2c683b2a87852d5b8a Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 13 May 2017 20:11:21 -0500 Subject: [PATCH] Add system property to disable book size limits @@ -57,5 +57,5 @@ index 6ff1a2dcd..64a939952 100644 } -- -2.18.0 +2.17.1