SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.8.3

Browse Source 
By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
CraftBukkit/Spigot
2015-02-26 22:41:06 +00:00
parent d789ce91d4
commit 85be409b13
347 changed files with 5027 additions and 5465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
paper-server/nms-patches/EntityTNTPrimed.patch
View File

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