yuriy/2009scape
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Attempt to fix server hanging on shutdown

Browse Source
This commit is contained in:
ceikry
2021-07-22 22:18:33 -05:00
parent 65b4113ffb
commit d4d4727cf3
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/java/core/game/system/SystemTermination.java
+2
View File
@@ -4,6 +4,7 @@ import core.game.ge.GrandExchangeDatabase;
import core.game.interaction.object.dmc.DMCHandler; import core.game.interaction.object.dmc.DMCHandler;
import core.game.node.entity.player.Player; import core.game.node.entity.player.Player;
import core.game.node.entity.player.info.login.PlayerParser; import core.game.node.entity.player.info.login.PlayerParser;
import rs09.Server;
import rs09.ServerConstants; import rs09.ServerConstants;
import rs09.game.ge.OfferManager; import rs09.game.ge.OfferManager;
import rs09.game.system.SystemLogger; import rs09.game.system.SystemLogger;
@@ -57,6 +58,7 @@ public final class SystemTermination {
if (!file.isDirectory()) { if (!file.isDirectory()) {
file.mkdirs(); file.mkdirs();
} }
Server.getReactor().terminate();
for (Iterator<Player> it = Repository.getPlayers().iterator(); it.hasNext();) { for (Iterator<Player> it = Repository.getPlayers().iterator(); it.hasNext();) {
try { try {
Player p = it.next(); Player p = it.next();
Server/src/main/kotlin/rs09/Server.kt
+3 -1
View File
@@ -40,6 +40,7 @@ object Server {
/** /**
* The NIO reactor. * The NIO reactor.
*/ */
@JvmStatic
var reactor: NioReactor? = null var reactor: NioReactor? = null
/** /**
@@ -72,7 +73,8 @@ object Server {
Runtime.getRuntime().addShutdownHook(ServerConstants.SHUTDOWN_HOOK) Runtime.getRuntime().addShutdownHook(ServerConstants.SHUTDOWN_HOOK)
SystemLogger.logInfo("Starting networking...") SystemLogger.logInfo("Starting networking...")
try { try {
NioReactor.configure(43594 + GameWorld.settings?.worldId!!).start() reactor = NioReactor.configure(43594 + GameWorld.settings?.worldId!!)
reactor!!.start()
} catch (e: BindException) { } catch (e: BindException) {
SystemLogger.logErr("Port " + (43594 + GameWorld.settings?.worldId!!) + " is already in use!") SystemLogger.logErr("Port " + (43594 + GameWorld.settings?.worldId!!) + " is already in use!")
throw e throw e