R3944Realms/Ambassador
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix disconnect message when forge server is offline

Browse Source
This commit is contained in:
Adrian Bergqvist 2022-07-10 01:41:57 +02:00
parent 69ae2401af
commit 3cafdd6dfb
No known key found for this signature in database
GPG Key ID: FAE7D8EDE225E686
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/org/adde0109/ambassador/forge/ForgeHandshakeHandler.java
View File

@ -18,6 +18,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.TranslatableComponent;
import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.NamedTextColor;
import org.adde0109.ambassador.AmbassadorConfig; import org.adde0109.ambassador.AmbassadorConfig;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -114,20 +115,26 @@ public class ForgeHandshakeHandler {
@Subscribe @Subscribe
public void onKickedFromServerEvent(KickedFromServerEvent event, Continuation continuation) { public void onKickedFromServerEvent(KickedFromServerEvent event, Continuation continuation) {
if (getForgeServerConnection(event.getServer()).isPresent() && getForgeConnection(event.getPlayer()).isEmpty()) { if (event.getServerKickReason().isPresent()) {
//Turns out the server the vanilla client is connecting to is forge. Let's handle the connection error. Component reason = event.getServerKickReason().get();
logger.info("Vanilla player {} tried to connect to forge server {}. The connection error can be ignored.", if (reason instanceof TranslatableComponent)
event.getPlayer(),event.getServer().getServerInfo().getName()); if (((TranslatableComponent) reason).key().equals("multiplayer.disconnect.unexpected_query_response")) {
KickedFromServerEvent.ServerKickResult result = event.getResult(); if (getForgeServerConnection(event.getServer()).isPresent() && getForgeConnection(event.getPlayer()).isEmpty()) {
Component component = Component.text("The server you were trying to connect to requires Forge to be installed.", NamedTextColor.RED); //Turns out the server the vanilla client is connecting to is forge. Let's handle the connection error.
if (result instanceof KickedFromServerEvent.DisconnectPlayer) { logger.info("Vanilla player {} tried to connect to forge server {}. The connection error can be ignored.",
event.setResult(KickedFromServerEvent.DisconnectPlayer.create(component)); event.getPlayer(),event.getServer().getServerInfo().getName());
} else if (result instanceof KickedFromServerEvent.RedirectPlayer) { KickedFromServerEvent.ServerKickResult result = event.getResult();
RegisteredServer redirectServer = ((KickedFromServerEvent.RedirectPlayer)event.getResult()).getServer(); Component component = Component.text("The server you were trying to connect to requires Forge to be installed.", NamedTextColor.RED);
event.setResult(KickedFromServerEvent.RedirectPlayer.create(redirectServer,component)); if (result instanceof KickedFromServerEvent.DisconnectPlayer) {
} else if (result instanceof KickedFromServerEvent.Notify) { event.setResult(KickedFromServerEvent.DisconnectPlayer.create(component));
event.setResult(KickedFromServerEvent.Notify.create(component)); } else if (result instanceof KickedFromServerEvent.RedirectPlayer) {
} RegisteredServer redirectServer = ((KickedFromServerEvent.RedirectPlayer)event.getResult()).getServer();
event.setResult(KickedFromServerEvent.RedirectPlayer.create(redirectServer,component));
} else if (result instanceof KickedFromServerEvent.Notify) {
event.setResult(KickedFromServerEvent.Notify.create(component));
}
}
}
} }
continuation.resume(); continuation.resume();
} }