From bc1b10ec02bc996c5503e16a93fe12b3b6fafd72 Mon Sep 17 00:00:00 2001 From: Caedis Date: Sat, 8 Jul 2023 10:38:44 -0500 Subject: [PATCH] Remove offline kick if hodgepodge is loaded Hodgepodge#221 added offline uuid mapping that requires the server to have been online before and an online user connected before letting them connect offline. --- src/main/java/de/katzenpapst/amunra/AmunRa.java | 3 ++- src/main/java/de/katzenpapst/amunra/proxy/ServerProxy.java | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/katzenpapst/amunra/AmunRa.java b/src/main/java/de/katzenpapst/amunra/AmunRa.java index 9cb480a4..d229713a 100755 --- a/src/main/java/de/katzenpapst/amunra/AmunRa.java +++ b/src/main/java/de/katzenpapst/amunra/AmunRa.java @@ -108,7 +108,8 @@ dependencies = "required-after:GalacticraftCore@[3.0.61-GTNH,);" + "required-after:GalacticraftMars;" + "after:dreamcraft;" + "after:IronChest;" - + "after:AdvancedSolarPanel", + + "after:AdvancedSolarPanel;" + + "after:Hodgepodge@[2.2.19,);", name = AmunRa.MODNAME) public class AmunRa { diff --git a/src/main/java/de/katzenpapst/amunra/proxy/ServerProxy.java b/src/main/java/de/katzenpapst/amunra/proxy/ServerProxy.java index 07d84734..f6bc543c 100755 --- a/src/main/java/de/katzenpapst/amunra/proxy/ServerProxy.java +++ b/src/main/java/de/katzenpapst/amunra/proxy/ServerProxy.java @@ -3,6 +3,7 @@ import net.minecraft.server.MinecraftServer; import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.event.FMLInitializationEvent; import de.katzenpapst.amunra.AmunRa; @@ -12,7 +13,9 @@ public class ServerProxy extends ARSidedProxy { public void init(final FMLInitializationEvent event) { try { final MinecraftServer s = MinecraftServer.getServer(); - if (s.isDedicatedServer() && !s.isServerInOnlineMode() && !AmunRa.isDevEnvironment()) { + if (!Loader.isModLoaded("hodgepodge") && s.isDedicatedServer() + && !s.isServerInOnlineMode() + && !AmunRa.isDevEnvironment()) { AmunRa.LOGGER.fatal("Server is running in offline mode. This is not supported."); FMLCommonHandler.instance().exitJava(-10, false); }