OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-27 22:38:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix NPE from location incorrectly being implemented in Explosion.

Browse source
This commit is contained in:
speakeasy 2011-01-22 11:29:47 +08:00 • committed by Warren
parent 8c91ee9c51
commit 10f46b5fea
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/net/minecraft/server/Explosion.java
View file

@ -29,10 +29,6 @@ public class Explosion {
public float f;
public Set g;
// CraftBukkit
// Retain where the explosion happened because the Entity no longer exists after explosion.
private Location location;
public Explosion(World world, Entity entity, double d1, double d2, double d3, float f1) {
a = false;
h = new Random();
@ -44,7 +40,6 @@ public class Explosion {
c = d2;
d = d3;
location = entity.getBukkitEntity().getLocation();
}
public void a() {
@ -189,6 +184,7 @@ public class Explosion {
Server server = ((WorldServer) i).getServer();
CraftWorld world = ((WorldServer) i).getWorld();
org.bukkit.entity.Entity splode = (e == null) ? null : e.getBukkitEntity();
Location location = new Location(world, b, c, d);
List<org.bukkit.block.Block> blocklist = new ArrayList<org.bukkit.block.Block>();
for (int j = arraylist.size() - 1; j >= 0; j--) {
@ -198,7 +194,7 @@ public class Explosion {
blocklist.add(blox);
}
}
org.bukkit.event.Event.Type eventType = EntityExplodeEvent.Type.ENTITY_EXPLODE;
EntityExplodeEvent eee = new EntityExplodeEvent(eventType, splode, location, blocklist);
server.getPluginManager().callEvent(eee);