From a7971bf343357d703c78d11486240918bf289c68 Mon Sep 17 00:00:00 2001 From: Joris Guffens Date: Tue, 25 Jan 2022 13:51:10 +0100 Subject: [PATCH] Fixed nullpointer when unloading a dependent extention that was already unloaded (#601) --- .../net/minestom/server/extensions/ExtensionManager.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minestom/server/extensions/ExtensionManager.java b/src/main/java/net/minestom/server/extensions/ExtensionManager.java index d1d5c1210..b703ad6de 100644 --- a/src/main/java/net/minestom/server/extensions/ExtensionManager.java +++ b/src/main/java/net/minestom/server/extensions/ExtensionManager.java @@ -715,8 +715,10 @@ public class ExtensionManager { for (String dependentID : dependents) { Extension dependentExt = extensions.get(dependentID.toLowerCase()); - LOGGER.info("Unloading dependent extension {} (because it depends on {})", dependentID, extensionName); - unload(dependentExt); + if ( dependentExt != null ) { // check if extension isn't already unloaded. + LOGGER.info("Unloading dependent extension {} (because it depends on {})", dependentID, extensionName); + unload(dependentExt); + } } LOGGER.info("Unloading extension {}", extensionName);