Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-02-06 07:21:32 +01:00
Code Issues Projects Releases Wiki Activity

Print exceptions properly during server tick

Browse Source
This commit is contained in:
themode 2020-12-28 12:27:25 +01:00
parent 22aa9d01ed
commit 924fac562b
4 changed files with 52 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/main/java/net/minestom/server/UpdateManager.java
View File

@ -53,32 +53,36 @@ public final class UpdateManager {
final EntityManager entityManager = MinecraftServer.getEntityManager();
updateExecutionService.scheduleAtFixedRate(() -> {
if (stopRequested) {
updateExecutionService.shutdown();
return;
try {
if (stopRequested) {
updateExecutionService.shutdown();
return;
}
long currentTime = System.nanoTime();
final long tickStart = System.currentTimeMillis();
// Tick start callbacks
doTickCallback(tickStartCallbacks, tickStart);
// Waiting players update (newly connected clients waiting to get into the server)
entityManager.updateWaitingPlayers();
// Keep Alive Handling
entityManager.handleKeepAlive(tickStart);
// Server tick (chunks/entities)
serverTick(tickStart);
// the time that the tick took in nanoseconds
final long tickTime = System.nanoTime() - currentTime;
// Tick end callbacks
doTickCallback(tickEndCallbacks, tickTime / 1000000L);
} catch (Exception e) {
e.printStackTrace();
}
long currentTime = System.nanoTime();
final long tickStart = System.currentTimeMillis();
// Tick start callbacks
doTickCallback(tickStartCallbacks, tickStart);
// Waiting players update (newly connected clients waiting to get into the server)
entityManager.updateWaitingPlayers();
// Keep Alive Handling
entityManager.handleKeepAlive(tickStart);
// Server tick (chunks/entities)
serverTick(tickStart);
// the time that the tick took in nanoseconds
final long tickTime = System.nanoTime() - currentTime;
// Tick end callbacks
doTickCallback(tickEndCallbacks, tickTime / 1000000L);
}, 0, MinecraftServer.TICK_MS, TimeUnit.MILLISECONDS);
}

4
src/main/java/net/minestom/server/entity/EntityManager.java
View File

@ -10,12 +10,12 @@ import net.minestom.server.instance.Instance;
import net.minestom.server.network.ConnectionManager;
import net.minestom.server.network.packet.server.play.KeepAlivePacket;
import net.minestom.server.network.player.PlayerConnection;
import net.minestom.server.utils.async.AsyncUtils;
import net.minestom.server.utils.validate.Check;
import org.jetbrains.annotations.NotNull;
import java.util.Queue;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer;
public final class EntityManager {
@ -90,7 +90,7 @@ public final class EntityManager {
playerInitialization.accept(player);
}
CompletableFuture.runAsync(() -> {
AsyncUtils.runAsync(() -> {
// Call pre login event
AsyncPlayerPreLoginEvent asyncPlayerPreLoginEvent = new AsyncPlayerPreLoginEvent(player, player.getUsername(), player.getUuid());
player.callEvent(AsyncPlayerPreLoginEvent.class, asyncPlayerPreLoginEvent);

4
src/main/java/net/minestom/server/network/packet/client/login/EncryptionResponsePacket.java
View File

@ -9,13 +9,13 @@ import net.minestom.server.extras.mojangAuth.MojangCrypt;
import net.minestom.server.network.packet.client.ClientPreplayPacket;
import net.minestom.server.network.player.NettyPlayerConnection;
import net.minestom.server.network.player.PlayerConnection;
import net.minestom.server.utils.async.AsyncUtils;
import net.minestom.server.utils.binary.BinaryReader;
import org.jetbrains.annotations.NotNull;
import javax.crypto.SecretKey;
import java.math.BigInteger;
import java.util.Arrays;
import java.util.concurrent.CompletableFuture;
public class EncryptionResponsePacket implements ClientPreplayPacket {
@ -31,7 +31,7 @@ public class EncryptionResponsePacket implements ClientPreplayPacket {
}
final NettyPlayerConnection nettyConnection = (NettyPlayerConnection) connection;
CompletableFuture.runAsync(() -> {
AsyncUtils.runAsync(() -> {
try {
final String loginUsername = nettyConnection.getLoginUsername();
if (!Arrays.equals(nettyConnection.getNonce(), getNonce())) {

19
src/main/java/net/minestom/server/utils/async/AsyncUtils.java Normal file
View File

@ -0,0 +1,19 @@
package net.minestom.server.utils.async;
import org.jetbrains.annotations.NotNull;
import java.util.concurrent.CompletableFuture;
public final class AsyncUtils {
public static void runAsync(@NotNull Runnable runnable) {
CompletableFuture.runAsync(() -> {
try {
runnable.run();
} catch (Exception e) {
e.printStackTrace();
}
});
}
}