wisplite/distant-horizons-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
coolGi
2023-02-19 21:39:05 +10:30
parent 1ebcd49601 7ca81fe281
commit 8d1c5e4b5b
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
coreSubProjects
+1 -1
Submodule coreSubProjects updated: e695c18871...a97f9cf9b4
fabric/src/main/java/com/seibel/lod/fabric/FabricServerProxy.java
+2 -2
View File
@@ -73,11 +73,11 @@ public class FabricServerProxy {
// ServerWorldLoadEvent
//TODO: Check if both of this use the correct timed events. (i.e. is it 'ed' or 'ing' one?)
ServerLifecycleEvents.SERVER_STARTING.register((server) -> {
if (isValidTime()) ServerApi.INSTANCE.serverWorldLoadEvent(isDedicated);
if (isValidTime()) ServerApi.INSTANCE.serverLoadEvent(isDedicated);
});
// ServerWorldUnloadEvent
ServerLifecycleEvents.SERVER_STOPPED.register((server) -> {
if (isValidTime()) ServerApi.INSTANCE.serverWorldUnloadEvent();
if (isValidTime()) ServerApi.INSTANCE.serverUnloadEvent();
});
// ServerLevelLoadEvent
forge/src/main/java/com/seibel/lod/forge/ForgeServerProxy.java
+2 -2
View File
@@ -55,13 +55,13 @@ public class ForgeServerProxy {
// ServerWorldLoadEvent
@SubscribeEvent
private void dedicatedWorldLoadEvent(ServerStartedEvent event) {
if (isValidTime()) serverApi.serverWorldLoadEvent(isDedicated);
if (isValidTime()) serverApi.serverLoadEvent(isDedicated);
}
// ServerWorldUnloadEvent
@SubscribeEvent
private void serverWorldUnloadEvent(ServerStoppingEvent event) {
if (isValidTime()) serverApi.serverWorldUnloadEvent();
if (isValidTime()) serverApi.serverUnloadEvent();
}
// ServerLevelLoadEvent