diff options
Diffstat (limited to 'nms-patches/EntityTNTPrimed.patch')
| -rw-r--r-- | nms-patches/EntityTNTPrimed.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nms-patches/EntityTNTPrimed.patch b/nms-patches/EntityTNTPrimed.patch index f894a23b..9167c320 100644 --- a/nms-patches/EntityTNTPrimed.patch +++ b/nms-patches/EntityTNTPrimed.patch @@ -1,5 +1,5 @@ ---- ../work/decompile-8eb82bde//net/minecraft/server/EntityTNTPrimed.java 2014-11-28 17:43:43.169707433 +0000 -+++ src/main/java/net/minecraft/server/EntityTNTPrimed.java 2014-11-28 17:38:21.000000000 +0000 +--- /home/matt/mc-dev-private//net/minecraft/server/EntityTNTPrimed.java 2015-02-26 22:40:22.707608138 +0000 ++++ src/main/java/net/minecraft/server/EntityTNTPrimed.java 2015-02-26 22:40:22.711608138 +0000 @@ -1,9 +1,13 @@ package net.minecraft.server; @@ -21,7 +21,7 @@ - this.die(); + // CraftBukkit start - Need to reverse the order of the explosion and the entity death so we have a location for the event + // this.die(); - if (!this.world.isStatic) { + if (!this.world.isClientSide) { this.explode(); } + this.die(); @@ -36,10 +36,10 @@ - float f = 4.0F; + // CraftBukkit start + // float f = 4.0F; - -- this.world.explode(this, this.locX, this.locY + (double) (this.length / 2.0F), this.locZ, f, true); ++ + org.bukkit.craftbukkit.CraftServer server = this.world.getServer(); -+ + +- this.world.explode(this, this.locX, this.locY + (double) (this.length / 16.0F), this.locZ, f, true); + ExplosionPrimeEvent event = new ExplosionPrimeEvent((org.bukkit.entity.Explosive) org.bukkit.craftbukkit.entity.CraftEntity.getEntity(server, this)); + server.getPluginManager().callEvent(event); + |