core/testserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

remove burtned TNT blocks (Fixes #2808)

Browse source
This commit is contained in:
Shane Freeder 2019-12-30 12:49:48 +00:00
parent 92933b162c
commit 7530141468
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Spigot-Server-Patches/0268-Add-TNTPrimeEvent.patch
View file

@ -1,11 +1,11 @@
From abeb999a469ba9faf3872c1b4dcb155e9abe635f Mon Sep 17 00:00:00 2001 From e5230fca3c9f34ee93c4adcd1bff9768665d229b Mon Sep 17 00:00:00 2001
From: Mark Vainomaa <mikroskeem@mikroskeem.eu> From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
Date: Mon, 16 Jul 2018 00:05:05 +0300 Date: Mon, 16 Jul 2018 00:05:05 +0300
Subject: [PATCH] Add TNTPrimeEvent Subject: [PATCH] Add TNTPrimeEvent
diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java
index 0ece78d4dc..3400e7ce37 100644 index 0ece78d4dc..1c30a02501 100644
--- a/src/main/java/net/minecraft/server/BlockFire.java --- a/src/main/java/net/minecraft/server/BlockFire.java
+++ b/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; @@ -2,6 +2,7 @@ package net.minecraft.server;
@ -25,7 +25,7 @@ index 0ece78d4dc..3400e7ce37 100644
} }
Block block = iblockdata.getBlock(); 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) { if (block instanceof BlockTNT) {
BlockTNT blocktnt = (BlockTNT) block; BlockTNT blocktnt = (BlockTNT) block;
@ -34,6 +34,7 @@ index 0ece78d4dc..3400e7ce37 100644
+ if (!new TNTPrimeEvent(tntBlock, TNTPrimeEvent.PrimeReason.FIRE, null).callEvent()) { + if (!new TNTPrimeEvent(tntBlock, TNTPrimeEvent.PrimeReason.FIRE, null).callEvent()) {
+ return; + return;
+ } + }
+ world.setAir(blockposition, false);
+ // Paper end + // Paper end
BlockTNT.a(world, blockposition); BlockTNT.a(world, blockposition);
} }