andrew
/
ace-of-shades-2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed to make extra logic completely optional.

This commit is contained in:
Andrew Lalis 2022-08-05 17:35:02 +02:00
parent c10dd7cd02
commit c4a4479602
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/src/main/java/nl/andrewl/aos2_server/Server.java
View File

@ -86,15 +86,18 @@ public class Server implements Runnable {
running = true; running = true;
new Thread(new UdpReceiver(datagramSocket, this::handleUdpMessage)).start(); new Thread(new UdpReceiver(datagramSocket, this::handleUdpMessage)).start();
new Thread(worldUpdater).start(); new Thread(worldUpdater).start();
ScheduledExecutorService executorService = Executors.newSingleThreadScheduledExecutor(); ScheduledExecutorService executorService = null;
var registryUpdater = new RegistryUpdater(this); if (config.registries != null && config.registries.length > 0) {
executorService.scheduleAtFixedRate(registryUpdater::sendUpdates, 0, 30, TimeUnit.SECONDS); executorService = Executors.newSingleThreadScheduledExecutor();
var registryUpdater = new RegistryUpdater(this);
executorService.scheduleAtFixedRate(registryUpdater::sendUpdates, 0, 30, TimeUnit.SECONDS);
}
System.out.printf("Started AoS2 Server on TCP/UDP port %d; now accepting connections.%n", serverSocket.getLocalPort()); System.out.printf("Started AoS2 Server on TCP/UDP port %d; now accepting connections.%n", serverSocket.getLocalPort());
while (running) { while (running) {
acceptClientConnection(); acceptClientConnection();
} }
System.out.println("Shutting down the server."); System.out.println("Shutting down the server.");
executorService.shutdown(); if (executorService != null) executorService.shutdown();
playerManager.deregisterAll(); playerManager.deregisterAll();
worldUpdater.shutdown(); worldUpdater.shutdown();
datagramSocket.close(); // Shuts down the UdpReceiver. datagramSocket.close(); // Shuts down the UdpReceiver.