From 550328863a3ab580c8964207cc6e2ffc915abe1c Mon Sep 17 00:00:00 2001 From: Adrian Bergqvist Date: Mon, 22 Jan 2024 23:57:27 +0100 Subject: [PATCH] Fixed reset mechanism --- .../forge/VelocityForgeBackendConnectionPhase.java | 3 +++ .../forge/VelocityForgeClientConnectionPhase.java | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/adde0109/ambassador/forge/VelocityForgeBackendConnectionPhase.java b/src/main/java/org/adde0109/ambassador/forge/VelocityForgeBackendConnectionPhase.java index 3b275e4..e0ec0e1 100644 --- a/src/main/java/org/adde0109/ambassador/forge/VelocityForgeBackendConnectionPhase.java +++ b/src/main/java/org/adde0109/ambassador/forge/VelocityForgeBackendConnectionPhase.java @@ -83,11 +83,14 @@ public enum VelocityForgeBackendConnectionPhase implements BackendConnectionPhas if (clientPhase.getResetType() == VelocityForgeClientConnectionPhase.clientResetType.CRP || clientPhase.getResetType() == VelocityForgeClientConnectionPhase.clientResetType.SR) { clientPhase.resetConnectionPhase(player); + player.getConnection().write(message); + return; } //STILL WIP if (!Ambassador.getInstance().config.isDebugMode()) { + server.disconnect(); return; } diff --git a/src/main/java/org/adde0109/ambassador/forge/VelocityForgeClientConnectionPhase.java b/src/main/java/org/adde0109/ambassador/forge/VelocityForgeClientConnectionPhase.java index eae3d42..d1a5df5 100644 --- a/src/main/java/org/adde0109/ambassador/forge/VelocityForgeClientConnectionPhase.java +++ b/src/main/java/org/adde0109/ambassador/forge/VelocityForgeClientConnectionPhase.java @@ -101,7 +101,12 @@ public enum VelocityForgeClientConnectionPhase implements ClientConnectionPhase return true; } - public void complete(ConnectedPlayer player, boolean resettable) { } + @Override + public void complete(ConnectedPlayer player, clientResetType resetType) { + if (Ambassador.getInstance().config.isDebugMode()) { + player.sendMessage(Component.text("Forge -> Vanilla - Not resetting")); + } + } };