From 1a9827cc32544ec044ae787856df9808ccb37834 Mon Sep 17 00:00:00 2001
From: Brokkonaut <hannos17@gmx.de>
Date: Fri, 11 Jun 2021 04:03:37 +0200
Subject: [PATCH] Explosion logging: Move WitherSkull up, because it is a
 Fireball too

---
 .../LogBlock/listeners/ExplosionLogging.java  | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/main/java/de/diddiz/LogBlock/listeners/ExplosionLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/ExplosionLogging.java
index 1442362..ad46e9b 100644
--- a/src/main/java/de/diddiz/LogBlock/listeners/ExplosionLogging.java
+++ b/src/main/java/de/diddiz/LogBlock/listeners/ExplosionLogging.java
@@ -67,13 +67,25 @@ public class ExplosionLogging extends LoggingListener {
                 } else {
                     actor = new Actor("Creeper");
                 }
+            } else if (source instanceof Wither) {
+                if (!wcfg.isLogging(Logging.WITHER)) {
+                    return;
+                }
+                actor = Actor.actorFromEntity(source);
+            } else if (source instanceof WitherSkull) {
+                if (!wcfg.isLogging(Logging.WITHER_SKULL)) {
+                    return;
+                }
+                actor = Actor.actorFromEntity(source);
             } else if (source instanceof Fireball) {
                 Fireball fireball = (Fireball) source;
                 ProjectileSource shooter = fireball.getShooter();
                 if (shooter == null) {
-                    return;
-                }
-                if (shooter instanceof Ghast) {
+                    if (!wcfg.isLogging(Logging.MISCEXPLOSION)) {
+                        return;
+                    }
+                    actor = Actor.actorFromEntity(source);
+                } else if (shooter instanceof Ghast) {
                     if (!wcfg.isLogging(Logging.GHASTFIREBALLEXPLOSION)) {
                         return;
                     }
@@ -89,17 +101,6 @@ public class ExplosionLogging extends LoggingListener {
                     return;
                 }
                 actor = Actor.actorFromEntity(source);
-            } else if (source instanceof Wither) {
-                if (!wcfg.isLogging(Logging.WITHER)) {
-                    return;
-                }
-                actor = Actor.actorFromEntity(source);
-            } else if (source instanceof WitherSkull) {
-                if (!wcfg.isLogging(Logging.WITHER_SKULL)) {
-                    return;
-                }
-                actor = Actor.actorFromEntity(source);
-
             } else if (source instanceof EnderCrystal) {
                 if (!wcfg.isLogging(Logging.ENDERCRYSTALEXPLOSION)) {
                     return;