diff options
| author | Shane Freeder <[email protected]> | 2019-12-30 12:46:31 +0000 |
|---|---|---|
| committer | Shane Freeder <[email protected]> | 2019-12-30 12:46:31 +0000 |
| commit | 84048a8a361548105fb87166a17df8fd37747616 (patch) | |
| tree | a72e36c0fa489317b054415263947d5af4052398 | |
| parent | 1c384362669bd7636dfa341bcabdf7a523e287c9 (diff) | |
| download | Paper-84048a8a361548105fb87166a17df8fd37747616.tar.gz Paper-84048a8a361548105fb87166a17df8fd37747616.zip | |
remove burtned TNT blocks (Fixes #2808)
| -rw-r--r-- | Spigot-Server-Patches/0273-Add-TNTPrimeEvent.patch | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Spigot-Server-Patches/0273-Add-TNTPrimeEvent.patch b/Spigot-Server-Patches/0273-Add-TNTPrimeEvent.patch index 0ef6e18dc1..f4b43dffd8 100644 --- a/Spigot-Server-Patches/0273-Add-TNTPrimeEvent.patch +++ b/Spigot-Server-Patches/0273-Add-TNTPrimeEvent.patch @@ -1,11 +1,11 @@ -From e866f25ed159540cac7277d5ccd1a3785f7263a0 Mon Sep 17 00:00:00 2001 +From 7a83f596de224fc38d7b89ba59f1a7f59922c723 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa <[email protected]> Date: Mon, 16 Jul 2018 00:05:05 +0300 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 37e6a91520..135c6ae47e 100644 +index 37e6a91520..accdf0da4b 100644 --- a/src/main/java/net/minecraft/server/BlockFire.java +++ b/src/main/java/net/minecraft/server/BlockFire.java @@ -2,6 +2,7 @@ package net.minecraft.server; @@ -25,7 +25,7 @@ index 37e6a91520..135c6ae47e 100644 } Block block = iblockdata.getBlock(); -@@ -245,6 +246,12 @@ public class BlockFire extends Block { +@@ -245,6 +246,13 @@ public class BlockFire extends Block { if (block instanceof BlockTNT) { BlockTNT blocktnt = (BlockTNT) block; @@ -34,6 +34,7 @@ index 37e6a91520..135c6ae47e 100644 + if (!new TNTPrimeEvent(tntBlock, TNTPrimeEvent.PrimeReason.FIRE, null).callEvent()) { + return; + } ++ world.setAir(blockposition, false); // Paper + // Paper end BlockTNT.a(world, blockposition); } @@ -138,5 +139,5 @@ index 5fae347db2..c2f35f89d3 100644 this.world.a(blockposition, false); -- -2.22.0 +2.24.1 |