From 15d23e1324fe9fab8c8ce51df5e46b9f901c8a61 Mon Sep 17 00:00:00 2001 From: Robotia Date: Wed, 27 Jan 2016 15:55:16 -0500 Subject: [PATCH] No explosion.exploder? Ignore it! --- .../event/world/ExplosionEvent.java.patch | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/patches/net/minecraftforge/event/world/ExplosionEvent.java.patch b/patches/net/minecraftforge/event/world/ExplosionEvent.java.patch index 5718aac..d9aa82e 100644 --- a/patches/net/minecraftforge/event/world/ExplosionEvent.java.patch +++ b/patches/net/minecraftforge/event/world/ExplosionEvent.java.patch @@ -30,7 +30,7 @@ public ExplosionEvent(World world, Explosion explosion) { -@@ -39,10 +46,38 @@ +@@ -39,10 +46,42 @@ @Cancelable public static class Start extends ExplosionEvent { @@ -42,7 +42,11 @@ + // float f = 4.0F; + if(exploder_fake == null) { exploder_fake = FakePlayerFactory.get( (WorldServer) world, exploder_profile); } + org.bukkit.craftbukkit.CraftServer server = world.getServer(); -+ org.bukkit.craftbukkit.entity.CraftEntity ce = org.bukkit.craftbukkit.entity.CraftEntity.getEntity(server, explosion.exploder); ++ org.bukkit.craftbukkit.entity.CraftEntity ce = null; ++ if(explosion.exploder != null) ++ { ++ ce = org.bukkit.craftbukkit.entity.CraftEntity.getEntity(server, explosion.exploder); ++ } + if(ce == null) + { + ce = org.bukkit.craftbukkit.entity.CraftEntity.getEntity(server, new EntityTNTPrimed(world, explosion.explosionX, explosion.explosionY, explosion.explosionZ, exploder_fake )); @@ -69,7 +73,7 @@ } /** ExplosionEvent.Detonate is fired once the explosion has a list of affected blocks and entities. These lists can be modified to change the outcome.
-@@ -73,4 +108,4 @@ +@@ -73,4 +112,4 @@ return entityList; } }