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

Small fix

Browse Source
This commit is contained in:
Adrian Bergqvist 2022-10-09 15:29:47 +02:00
parent c3452fa501
commit fd8fb5ae37
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/adde0109/ambassador/forge/ForgeFML2ClientConnectionPhase.java
View File

@ -109,7 +109,7 @@ public class ForgeFML2ClientConnectionPhase implements VelocityForgeClientConnec
} }
public void handleKick(KickedFromServerEvent event) { public void handleKick(KickedFromServerEvent event) {
if (backupServer != null) { if (backupServer != null && !(event.getResult() instanceof KickedFromServerEvent.RedirectPlayer)) {
net.kyori.adventure.text.Component reason = event.getServerKickReason().orElse(null); net.kyori.adventure.text.Component reason = event.getServerKickReason().orElse(null);
event.setResult(KickedFromServerEvent.RedirectPlayer.create(backupServer,reason)); event.setResult(KickedFromServerEvent.RedirectPlayer.create(backupServer,reason));
} }

3
src/main/java/org/adde0109/ambassador/velocity/VelocityEventHandler.java
View File

@ -1,6 +1,7 @@
package org.adde0109.ambassador.velocity; package org.adde0109.ambassador.velocity;
import com.velocitypowered.api.event.Continuation; import com.velocitypowered.api.event.Continuation;
import com.velocitypowered.api.event.PostOrder;
import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.Subscribe;
import com.velocitypowered.api.event.permission.PermissionsSetupEvent; import com.velocitypowered.api.event.permission.PermissionsSetupEvent;
import com.velocitypowered.api.event.player.KickedFromServerEvent; import com.velocitypowered.api.event.player.KickedFromServerEvent;
@ -31,7 +32,7 @@ public class VelocityEventHandler {
player.getConnection().eventLoop().submit(() -> phase.handleLogin(player,null,continuation)); player.getConnection().eventLoop().submit(() -> phase.handleLogin(player,null,continuation));
} }
@Subscribe @Subscribe(order = PostOrder.LAST)
public void onKickedFromServerEvent(KickedFromServerEvent event, Continuation continuation) { public void onKickedFromServerEvent(KickedFromServerEvent event, Continuation continuation) {
if (((ConnectedPlayer) event.getPlayer()).getPhase() instanceof ForgeFML2ClientConnectionPhase phase) { if (((ConnectedPlayer) event.getPlayer()).getPhase() instanceof ForgeFML2ClientConnectionPhase phase) {
phase.handleKick(event); phase.handleKick(event);