infiniteserver/fabric
1
0
Fork 0
forked from FabricMC/fabric
Code Pull requests Activity

Run the STOP event before shutdown, rather than after it.

Browse source
This commit is contained in:
SquidDev 2018-12-20 18:37:04 +00:00
parent ac954f6e08
commit 9b4050d122
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/net/fabricmc/fabric/mixin/events/server/MixinMinecraftServer.java
View file

@ -35,11 +35,8 @@ public class MixinMinecraftServer {
}
}
@Inject(
at = @At(value = "INVOKE", target = "Lnet/minecraft/server/MinecraftServer;exit()V", shift = At.Shift.BY, by = -2, ordinal = 0),
method = "run"
)
public void beforeExitServer(CallbackInfo info) {
@Inject(at = @At("HEAD"), method = "shutdown")
public void beforeShutdownServer(CallbackInfo info) {
for (Consumer<MinecraftServer> handler : ((HandlerArray<Consumer<MinecraftServer>>) ServerEvent.STOP).getBackingArray()) {
handler.accept((MinecraftServer) (Object) this);
}

2
src/test/java/net/fabricmc/fabric/events/ServerEventMod.java
View file

@ -10,6 +10,6 @@ public class ServerEventMod implements ModInitializer {
@Override
public void onInitialize() {
ServerEvent.START.register(server -> LOGGER.info("Server starting (" + server + ")"));
ServerEvent.STOP.register(server -> LOGGER.info("Server stopped (" + server + ")"));
ServerEvent.STOP.register(server -> LOGGER.info("Server stopping (" + server + ")"));
}
}