ForgePatch/patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch

37 lines
1.7 KiB
Diff

--- a/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/net/minecraft/server/dedicated/DedicatedServer.java
@@ -111,6 +111,7 @@
LOGGER.warn("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\"");
}
+ net.minecraftforge.fml.server.ServerModLoader.begin(this);
LOGGER.info("Loading properties");
this.settings = new PropertyManager(new File("server.properties"));
this.eula = new ServerEula(new File("eula.txt"));
@@ -182,6 +183,7 @@
if (!PreYggdrasilConverter.tryConvert(this.settings)) {
return false;
} else {
+ net.minecraftforge.fml.server.ServerModLoader.end();
this.setPlayerList(new DedicatedPlayerList(this));
long j = Util.func_211178_c();
if (this.getFolderName() == null) {
@@ -219,6 +221,7 @@
TileEntitySkull.setProfileCache(this.getPlayerProfileCache());
TileEntitySkull.setSessionService(this.getMinecraftSessionService());
PlayerProfileCache.setOnlineMode(this.isServerInOnlineMode());
+ if (!net.minecraftforge.fml.server.ServerLifecycleHooks.handleServerAboutToStart(this)) return false;
LOGGER.info("Preparing level \"{}\"", (Object)this.getFolderName());
JsonObject jsonobject = new JsonObject();
if (worldtype == WorldType.FLAT) {
@@ -258,7 +261,8 @@
}
Items.AIR.getSubItems(ItemGroup.SEARCH, NonNullList.create());
- return true;
+ // <3 you Grum for this, saves us ~30 patch files! --^
+ return net.minecraftforge.fml.server.ServerLifecycleHooks.handleServerStarting(this);
}
}
}