keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Fix Forge's internal handler being registered in wrong place. 

Fix double call to loader end.
This commit is contained in:
LexManos 2020-06-28 15:08:03 -07:00
parent 5f1a7326c7
commit 3b64ea6305
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch
View File

@ -39,25 +39,21 @@
if (serverproperties.field_219027_u != null) {
this.func_200252_aR().func_223585_a(GameRules.field_223620_w).func_223570_a(serverproperties.field_219027_u, this);
}
@@ -175,6 +181,7 @@
@@ -189,11 +195,12 @@
}
if (serverproperties.field_219030_x) {
+ net.minecraftforge.fml.server.ServerModLoader.end();
field_155771_h.info("Starting remote control listener");
this.field_71339_n = new MainThread(this);
this.field_71339_n.func_72602_a();
@@ -193,7 +200,8 @@
Items.field_190931_a.func_150895_a(ItemGroup.field_78027_g, NonNullList.func_191196_a());
+ // <3 you Grum for this, saves us ~30 patch files! --^
if (serverproperties.field_241079_P_) {
ServerInfoMBean.func_233490_a_(this);
}
- return true;
+ // <3 you Grum for this, saves us ~30 patch files! --^
+ return net.minecraftforge.fml.server.ServerLifecycleHooks.handleServerStarting(this);
}
}
@@ -506,6 +514,11 @@
@@ -506,6 +513,11 @@
return false;
}

7
src/main/java/net/minecraftforge/common/ForgeMod.java
View File

@ -123,6 +123,10 @@ public class ForgeMod implements WorldPersistenceHooks.WorldPersistenceHook
// Forge does not display problems when the remote is not matching.
ModLoadingContext.get().registerExtensionPoint(ExtensionPoint.DISPLAYTEST, ()-> Pair.of(()->"ANY", (remote, isServer)-> true));
StartupMessageManager.addModMessage("Forge version "+ForgeVersion.getVersion());
MinecraftForge.EVENT_BUS.addListener(VillagerTradingManager::loadTrades);
MinecraftForge.EVENT_BUS.register(MinecraftForge.INTERNAL_HANDLER);
MinecraftForge.EVENT_BUS.register(this);
}
public void preInit(FMLCommonSetupEvent evt)
@ -131,9 +135,6 @@ public class ForgeMod implements WorldPersistenceHooks.WorldPersistenceHook
CapabilityFluidHandler.register();
CapabilityAnimation.register();
CapabilityEnergy.register();
MinecraftForge.EVENT_BUS.addListener(VillagerTradingManager::loadTrades);
MinecraftForge.EVENT_BUS.register(MinecraftForge.INTERNAL_HANDLER);
MinecraftForge.EVENT_BUS.register(this);
VersionChecker.startVersionCheck();