From 56d4a0e1fef7d74a57008423bb19999b2904bfb5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 23 Jul 2018 20:16:48 -0400 Subject: [PATCH] rebuild patch and delete unused --- ...d-Safe-Iteration-of-Chunk-Scheduler.patch} | 2 +- ...sign-the-World-in-WorldGenStronghold.patch | 21 ---------------- ...ix-dragon-egg-falling-in-lazy-chunks.patch | 25 ------------------- 3 files changed, 1 insertion(+), 47 deletions(-) rename Spigot-Server-Patches/{0307-Thread-Safe-Iteration-of-Chunk-Scheduler.patch => 0308-Thread-Safe-Iteration-of-Chunk-Scheduler.patch} (96%) delete mode 100644 removed/server/0197-Assign-the-World-in-WorldGenStronghold.patch delete mode 100644 removed/server/0231-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch diff --git a/Spigot-Server-Patches/0307-Thread-Safe-Iteration-of-Chunk-Scheduler.patch b/Spigot-Server-Patches/0308-Thread-Safe-Iteration-of-Chunk-Scheduler.patch similarity index 96% rename from Spigot-Server-Patches/0307-Thread-Safe-Iteration-of-Chunk-Scheduler.patch rename to Spigot-Server-Patches/0308-Thread-Safe-Iteration-of-Chunk-Scheduler.patch index 205471a46..a9511d3b8 100644 --- a/Spigot-Server-Patches/0307-Thread-Safe-Iteration-of-Chunk-Scheduler.patch +++ b/Spigot-Server-Patches/0308-Thread-Safe-Iteration-of-Chunk-Scheduler.patch @@ -1,4 +1,4 @@ -From bdd76dbf6c7b71856f5edb1ea7cf572b76706cad Mon Sep 17 00:00:00 2001 +From c4f6d7b6868a203037dacc6d4dbcf8c065babf6e 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/removed/server/0197-Assign-the-World-in-WorldGenStronghold.patch b/removed/server/0197-Assign-the-World-in-WorldGenStronghold.patch deleted file mode 100644 index 84286abc8..000000000 --- a/removed/server/0197-Assign-the-World-in-WorldGenStronghold.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 9d2c2c0c6e0763a163a8a52d4e8323e853c19cb1 Mon Sep 17 00:00:00 2001 -From: Zach Brown -Date: Sat, 14 Jan 2017 01:22:07 -0600 -Subject: [PATCH] Assign the World in WorldGenStronghold - - -diff --git a/src/main/java/net/minecraft/server/WorldGenStronghold.java b/src/main/java/net/minecraft/server/WorldGenStronghold.java -index c93754704..a3b958e01 100644 ---- a/src/main/java/net/minecraft/server/WorldGenStronghold.java -+++ b/src/main/java/net/minecraft/server/WorldGenStronghold.java -@@ -56,6 +56,7 @@ public class WorldGenStronghold extends StructureGenerator { - } - - public BlockPosition getNearestGeneratedFeature(World world, BlockPosition blockposition, boolean flag) { -+ this.g = world; // Paper - if (!this.b) { - this.c(); - this.b = true; --- -2.18.0 - diff --git a/removed/server/0231-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch b/removed/server/0231-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch deleted file mode 100644 index 12db003ae..000000000 --- a/removed/server/0231-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ddb5420fbc247f84c5d4877b77716179535385ba Mon Sep 17 00:00:00 2001 -From: Brokkonaut -Date: Fri, 11 Aug 2017 03:29:26 +0200 -Subject: [PATCH] MC-94186 Fix dragon egg falling in lazy chunks - -Fixes falling dragon eggs in lazy chunks fall to the block below the last empty block and replacing that block with them. - -See also https://bugs.mojang.com/browse/MC-94186 - -diff --git a/src/main/java/net/minecraft/server/BlockDragonEgg.java b/src/main/java/net/minecraft/server/BlockDragonEgg.java -index ce186f825..291342c90 100644 ---- a/src/main/java/net/minecraft/server/BlockDragonEgg.java -+++ b/src/main/java/net/minecraft/server/BlockDragonEgg.java -@@ -44,7 +44,7 @@ public class BlockDragonEgg extends Block { - } - - if (blockposition1.getY() > 0) { -- world.setTypeAndData(blockposition1, this.getBlockData(), 2); -+ world.setTypeAndData(blockposition1.up(), this.getBlockData(), 2); // Paper - } - } - --- -2.18.0 -