Fixed explosion logging for explosions without entities
This commit is contained in:
1 parent
f31d4591db
commit
dd182f67d7
1 file changed
+7
-8
@@ -47,24 +47,23 @@ class LBEntityListener extends EntityListener
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEntityExplode(EntityExplodeEvent event) {
|
public void onEntityExplode(EntityExplodeEvent event) {
|
||||||
final WorldConfig wcfg = worlds.get(event.getEntity().getWorld().getName().hashCode());
|
final WorldConfig wcfg = worlds.get(event.getLocation().getWorld().getName().hashCode());
|
||||||
if (!event.isCancelled() && wcfg != null && wcfg.logExplosions) {
|
if (!event.isCancelled() && wcfg != null && wcfg.logExplosions) {
|
||||||
String name;
|
final String name;
|
||||||
if (event.getEntity() instanceof TNTPrimed)
|
if (event.getEntity() == null)
|
||||||
|
name = "Explosion";
|
||||||
|
else if (event.getEntity() instanceof TNTPrimed)
|
||||||
name = "TNT";
|
name = "TNT";
|
||||||
else if (event.getEntity() instanceof Creeper) {
|
else if (event.getEntity() instanceof Creeper) {
|
||||||
if (logCreeperExplosionsAsPlayer) {
|
if (logCreeperExplosionsAsPlayer) {
|
||||||
final Entity target = ((Creeper)event.getEntity()).getTarget();
|
final Entity target = ((Creeper)event.getEntity()).getTarget();
|
||||||
if (target instanceof Player)
|
name = target instanceof Player ? ((Player)target).getName() : "Creeper";
|
||||||
name = ((Player)target).getName();
|
|
||||||
else
|
|
||||||
name = "Creeper";
|
|
||||||
} else
|
} else
|
||||||
name = "Creeper";
|
name = "Creeper";
|
||||||
} else if (event.getEntity() instanceof Fireball)
|
} else if (event.getEntity() instanceof Fireball)
|
||||||
name = "Ghast";
|
name = "Ghast";
|
||||||
else
|
else
|
||||||
name = "Environment";
|
name = "Explosion";
|
||||||
for (final Block block : event.blockList()) {
|
for (final Block block : event.blockList()) {
|
||||||
final int type = block.getTypeId();
|
final int type = block.getTypeId();
|
||||||
if (wcfg.logSignTexts & (type == 63 || type == 68))
|
if (wcfg.logSignTexts & (type == 63 || type == 68))
|
||||||
|
|||||||
Reference in new issue
Block a user