Use FMLServerStartingEvent to register command

Conflicts: build.gradle src/main/java/ljfa/tntutils/TNTUtils.java
ljfa-ag · May 7, 2016 · 87283eb · 87283eb
1 parent 9d12565
commit 87283eb
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/src/main/java/ljfa/tntutils/TNTUtils.java b/src/main/java/ljfa/tntutils/TNTUtils.java
@@ -9,11 +9,9 @@
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.event.FMLServerStartedEvent;
+import cpw.mods.fml.common.event.FMLServerStartingEvent;
 import ljfa.tntutils.command.CommandExplosion;
 import ljfa.tntutils.proxy.CommonProxy;
-import net.minecraft.command.ServerCommandManager;
-import net.minecraft.server.MinecraftServer;
 
 @Mod(modid = Reference.MODID, name = Reference.MODNAME, version = Reference.VERSION, acceptableRemoteVersions = "*",
     guiFactory = Reference.GUI_FACTORY_CLASS, dependencies = "required-after:tnt_utilities_core")
@@ -46,11 +44,9 @@ public void postInit(FMLPostInitializationEvent event) {
     }
 
     @Mod.EventHandler
-    public void serverStarted(FMLServerStartedEvent event) {
+    public void serverStarting(FMLServerStartingEvent event) {
         if(Config.explosionCommand) {
-            MinecraftServer server = MinecraftServer.getServer();
-            ServerCommandManager commandManager = (ServerCommandManager)server.getCommandManager();
-            commandManager.registerCommand(new CommandExplosion());
+            event.registerServerCommand(new CommandExplosion());
         }
     }
 }