Fix logging NPE and change log level of BlockTransformListener (#1096)

Signed-off-by: KingSimon <[email protected]>
PGMDev · Nov 5, 2022 · 87f944c · 87f944c
1 parent ad78001
commit 87f944c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/core/src/main/java/tc/oc/pgm/listeners/BlockTransformListener.java b/core/src/main/java/tc/oc/pgm/listeners/BlockTransformListener.java
@@ -200,7 +200,7 @@ private void callEvent(final BlockTransformEvent event, boolean checked) {
         handleDoor(event, (Door) newData);
       }
     }
-    logger.fine("Generated event " + event);
+    logger.finest("Generated event " + event);
     currentEvents.put(event.getCause(), event);
   }
 

diff --git a/util/src/main/java/tc/oc/pgm/util/ClassLogger.java b/util/src/main/java/tc/oc/pgm/util/ClassLogger.java
@@ -113,6 +113,17 @@ private ClassLogger(@Nullable Logger parent, Class<?> klass, @Nullable String in
     this.setLevel(null);
   }
 
+  public Level getEffectiveLevel() {
+    Level level = this.getLevel();
+    Logger someParent = this.getParent();
+    while (level == null) {
+      level = someParent.getLevel();
+      someParent = someParent.getParent();
+    }
+
+    return level;
+  }
+
   @Override
   public void log(LogRecord record) {
     record.setMessage(this.prefix + record.getMessage());
@@ -121,7 +132,7 @@ public void log(LogRecord record) {
     // Check the level ourselves and then promote the record
     // to make sure it gets through.
     if (record.getLevel().intValue() < Level.INFO.intValue()
-        && record.getLevel().intValue() >= this.getLevel().intValue()) {
+        && record.getLevel().intValue() >= this.getEffectiveLevel().intValue()) {
 
       record.setLevel(Level.INFO);
     }