From 18cec4f88d8e84bf257050f519367ced07e87215 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Sat, 22 Jul 2023 09:56:25 -0400 Subject: [PATCH] Fix NPE from config fixers Related: #174 --- .../java/org/embeddedt/modernfix/forge/config/ConfigFixer.java | 3 ++- .../org/embeddedt/modernfix/forge/config/NightConfigFixer.java | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/config/ConfigFixer.java b/forge/src/main/java/org/embeddedt/modernfix/forge/config/ConfigFixer.java index 2af232b4..ecd00a5d 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/forge/config/ConfigFixer.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/config/ConfigFixer.java @@ -50,7 +50,8 @@ public class ConfigFixer { this.actualHandler.accept(modConfigEvent); } } else { - ModernFix.LOGGER.warn("Unable to sync on a {} config object", modConfigEvent.getConfig().getConfigData().getClass().getName()); + if(modConfigEvent.getConfig().getConfigData() != null) + ModernFix.LOGGER.warn("Unable to sync on a {} config object", modConfigEvent.getConfig().getConfigData().getClass().getName()); this.actualHandler.accept(modConfigEvent); } } diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/config/NightConfigFixer.java b/forge/src/main/java/org/embeddedt/modernfix/forge/config/NightConfigFixer.java index 5fb11574..a6993a07 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/forge/config/NightConfigFixer.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/config/NightConfigFixer.java @@ -85,6 +85,8 @@ public class NightConfigFixer { private static final Set> UNKNOWN_FILE_CONFIG_CLASSES = Collections.synchronizedSet(new ReferenceOpenHashSet<>()); public static Object toWriteSyncConfig(Object config) { + if(config == null) + return null; try { if(WRITE_SYNC_CONFIG.isAssignableFrom(config.getClass())) { return config;