OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-17 06:48:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Don't double set air in BlockFire

Browse source
This commit is contained in:
Shane Freeder 2019-05-07 13:16:22 +01:00
parent 71b1db46b1
commit 55b60646bc
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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;