Browse Source

No explosion.exploder? Ignore it!

master
Robotia 9 years ago
parent
commit
15d23e1324
  1. 10
      patches/net/minecraftforge/event/world/ExplosionEvent.java.patch

10
patches/net/minecraftforge/event/world/ExplosionEvent.java.patch

@ -30,7 +30,7 @@
public ExplosionEvent(World world, Explosion explosion) public ExplosionEvent(World world, Explosion explosion)
{ {
@@ -39,10 +46,38 @@ @@ -39,10 +46,42 @@
@Cancelable @Cancelable
public static class Start extends ExplosionEvent public static class Start extends ExplosionEvent
{ {
@ -42,7 +42,11 @@
+ // float f = 4.0F; + // float f = 4.0F;
+ if(exploder_fake == null) { exploder_fake = FakePlayerFactory.get( (WorldServer) world, exploder_profile); } + if(exploder_fake == null) { exploder_fake = FakePlayerFactory.get( (WorldServer) world, exploder_profile); }
+ org.bukkit.craftbukkit.CraftServer server = world.getServer(); + 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) + if(ce == null)
+ { + {
+ ce = org.bukkit.craftbukkit.entity.CraftEntity.getEntity(server, new EntityTNTPrimed(world, explosion.explosionX, explosion.explosionY, explosion.explosionZ, exploder_fake )); + 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.<br> /** ExplosionEvent.Detonate is fired once the explosion has a list of affected blocks and entities. These lists can be modified to change the outcome.<br>
@@ -73,4 +108,4 @@ @@ -73,4 +112,4 @@
return entityList; return entityList;
} }
} }

Loading…
Cancel
Save