From 55b60646bc2ecb74888c093fdffdfab29cf1b329 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 7 May 2019 13:16:22 +0100 Subject: [PATCH] Don't double set air in BlockFire --- Spigot-Server-Patches/Add-TNTPrimeEvent.patch | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Spigot-Server-Patches/Add-TNTPrimeEvent.patch b/Spigot-Server-Patches/Add-TNTPrimeEvent.patch index ed7119d60..7c64421b5 100644 --- a/Spigot-Server-Patches/Add-TNTPrimeEvent.patch +++ b/Spigot-Server-Patches/Add-TNTPrimeEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add TNTPrimeEvent diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java -index 73190ccbaa..4086d5ed2d 100644 +index 73190ccba..dfb546820 100644 --- a/src/main/java/net/minecraft/server/BlockFire.java +++ b/src/main/java/net/minecraft/server/BlockFire.java @@ -0,0 +0,0 @@ package net.minecraft.server; @@ -34,13 +34,12 @@ index 73190ccbaa..4086d5ed2d 100644 + if (!new TNTPrimeEvent(tntBlock, TNTPrimeEvent.PrimeReason.FIRE, null).callEvent()) { + return; + } -+ BlockTNT.a(world, blockposition);; // setair after non cancelled event, it would usually be air by now + // Paper end BlockTNT.a(world, blockposition); } } diff --git a/src/main/java/net/minecraft/server/BlockTNT.java b/src/main/java/net/minecraft/server/BlockTNT.java -index 8cb36ed3a4..88d0238718 100644 +index 8cb36ed3a..88d023871 100644 --- a/src/main/java/net/minecraft/server/BlockTNT.java +++ b/src/main/java/net/minecraft/server/BlockTNT.java @@ -0,0 +0,0 @@ @@ -114,7 +113,7 @@ index 8cb36ed3a4..88d0238718 100644 world.a(blockposition, false); } diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java -index b0651a7086..6d51413d18 100644 +index b0651a708..6d51413d1 100644 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java @@ -0,0 +0,0 @@ import org.bukkit.craftbukkit.block.CraftBlock;