From 938bd972558bca03fef81a538860a38accdcb8c1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 23 Apr 2020 01:37:30 -0400 Subject: [PATCH] Don't fire BlockFade on worldgen threads - Fixes #3208 Caused a deadlock --- ...t-fire-BlockFade-on-worldgen-threads.patch | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 Spigot-Server-Patches/0491-Don-t-fire-BlockFade-on-worldgen-threads.patch diff --git a/Spigot-Server-Patches/0491-Don-t-fire-BlockFade-on-worldgen-threads.patch b/Spigot-Server-Patches/0491-Don-t-fire-BlockFade-on-worldgen-threads.patch new file mode 100644 index 0000000000..cb302c0067 --- /dev/null +++ b/Spigot-Server-Patches/0491-Don-t-fire-BlockFade-on-worldgen-threads.patch @@ -0,0 +1,22 @@ +From 492da5a6f36c3344dccb916e62ddf9968c2e5f2e Mon Sep 17 00:00:00 2001 +From: Aikar +Date: Thu, 23 Apr 2020 01:36:39 -0400 +Subject: [PATCH] Don't fire BlockFade on worldgen threads + +Caused a deadlock + +diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java +index b41de95a63..9e501514f3 100644 +--- a/src/main/java/net/minecraft/server/BlockFire.java ++++ b/src/main/java/net/minecraft/server/BlockFire.java +@@ -44,6 +44,7 @@ public class BlockFire extends Block { + @Override + public IBlockData updateState(IBlockData iblockdata, EnumDirection enumdirection, IBlockData iblockdata1, GeneratorAccess generatoraccess, BlockPosition blockposition, BlockPosition blockposition1) { + // CraftBukkit start ++ if (!(generatoraccess instanceof WorldServer)) return this.canPlace(iblockdata, generatoraccess, blockposition) ? (IBlockData) this.a((IBlockAccess) generatoraccess, blockposition).set(BlockFire.AGE, iblockdata.get(BlockFire.AGE)) : Blocks.AIR.getBlockData(); // Paper - don't fire events in world generation + if (!iblockdata.canPlace(generatoraccess, blockposition)) { + CraftBlockState blockState = CraftBlockState.getBlockState(generatoraccess, blockposition); + blockState.setData(Blocks.AIR.getBlockData()); +-- +2.25.1 +