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

Kicks player instead of redirect when forced is true

Browse Source
This commit is contained in:
Adrian Bergqvist 2022-08-05 19:02:33 +02:00
parent 56034ec165
commit a6abe53edd
No known key found for this signature in database
GPG Key ID: FAE7D8EDE225E686
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,22 +8,17 @@ import com.velocitypowered.api.event.player.KickedFromServerEvent;
import com.velocitypowered.api.event.player.ServerLoginPluginMessageEvent; import com.velocitypowered.api.event.player.ServerLoginPluginMessageEvent;
import com.velocitypowered.api.proxy.LoginPhaseConnection; import com.velocitypowered.api.proxy.LoginPhaseConnection;
import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.Player;
import com.velocitypowered.api.proxy.ProxyServer;
import com.velocitypowered.api.proxy.messages.ChannelIdentifier; import com.velocitypowered.api.proxy.messages.ChannelIdentifier;
import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier; import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier;
import com.velocitypowered.api.proxy.server.RegisteredServer; import com.velocitypowered.api.proxy.server.RegisteredServer;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
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.TranslatableComponent;
import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.NamedTextColor;
import org.adde0109.ambassador.Ambassador; import org.adde0109.ambassador.Ambassador;
import org.adde0109.ambassador.AmbassadorConfig;
import org.slf4j.Logger;
public class ForgeHandshakeHandler { public class ForgeHandshakeHandler {
@ -126,11 +121,16 @@ public class ForgeHandshakeHandler {
@Subscribe @Subscribe
public void onKickedFromServerEvent(KickedFromServerEvent event, Continuation continuation) { public void onKickedFromServerEvent(KickedFromServerEvent event, Continuation continuation) {
if (event.getServerKickReason().isPresent()) { Optional<ForgeConnection> forgeConnectionOptional = getForgeConnection(event.getPlayer());
if (forgeConnectionOptional.isPresent()) {
if (forgeConnectionOptional.get().isForced() && event.getResult() instanceof KickedFromServerEvent.RedirectPlayer) {
event.setResult(KickedFromServerEvent.DisconnectPlayer.create(event.getServerKickReason().get()));
}
} else if (event.getServerKickReason().isPresent()) {
Component reason = event.getServerKickReason().get(); Component reason = event.getServerKickReason().get();
if (reason instanceof TranslatableComponent) if (reason instanceof TranslatableComponent)
if (((TranslatableComponent) reason).key().equals("multiplayer.disconnect.unexpected_query_response")) { if (((TranslatableComponent) reason).key().equals("multiplayer.disconnect.unexpected_query_response")) {
if (getForgeServerConnection(event.getServer()).isPresent() && getForgeConnection(event.getPlayer()).isEmpty()) { if (getForgeServerConnection(event.getServer()).isPresent()) {
//Turns out the server the vanilla client is connecting to is forge. Let's handle the connection error. //Turns out the server the vanilla client is connecting to is forge. Let's handle the connection error.
ambassador.logger.info("Vanilla player {} tried to connect to forge server {}. The connection error can be ignored.", ambassador.logger.info("Vanilla player {} tried to connect to forge server {}. The connection error can be ignored.",
event.getPlayer(),event.getServer().getServerInfo().getName()); event.getPlayer(),event.getServer().getServerInfo().getName());