Skip to content

Fix Velocity-CTD Compatibility: call markLoginEventFired before LoginEvent #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
R00tB33rMan merged 1 commit into from
May 22, 2026
Merged

Fix Velocity-CTD Compatibility: call markLoginEventFired before LoginEvent #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions plugin/src/main/java/net/elytrium/limboapi/injection/login/LoginTasksQueue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
package net.elytrium.limboapi.injection.login;

import com.velocitypowered.api.event.EventManager;
import com.velocitypowered.api.event.connection.DisconnectEvent;
import com.velocitypowered.api.event.connection.LoginEvent;
import com.velocitypowered.api.event.connection.PostLoginEvent;
import com.velocitypowered.api.event.permission.PermissionsSetupEvent;
Expand Down Expand Up @@ -89,6 +88,7 @@ public class LoginTasksQueue {
private static final BiConsumer<Object, MinecraftConnection> MC_CONNECTION_SETTER;
private static final MethodHandle CONNECT_TO_INITIAL_SERVER_METHOD;
private static final MethodHandle SET_CLIENT_BRAND;
private static final MethodHandle MARK_LOGIN_EVENT_FIRED;
public static final BiConsumer<ClientConfigSessionHandler, String> BRAND_CHANNEL_SETTER;

private final LimboAPI plugin;
Expand Down Expand Up @@ -211,10 +211,12 @@ private void initialize(MinecraftConnection connection) throws Throwable {
}

Logger logger = LimboAPI.getLogger();

MARK_LOGIN_EVENT_FIRED.invokeExact(this.player);
this.server.getEventManager().fire(new LoginEvent(this.player, null)).thenAcceptAsync(event -> {
if (connection.isClosed()) {
// The player was disconnected.
this.server.getEventManager().fireAndForget(new DisconnectEvent(this.player, DisconnectEvent.LoginStatus.CANCELLED_BY_USER_BEFORE_COMPLETE));
// The player was disconnected during LoginEvent processing. The natural teardown path
// is in flight (or will be) and will fire DisconnectEvent + release the identity lock.
} else {
Optional<Component> reason = event.getResult().getReasonComponent();
if (reason.isPresent()) {
Expand Down Expand Up @@ -322,6 +324,9 @@ private void connectToServer(Logger logger, ConnectedPlayer player, MinecraftCon
SET_CLIENT_BRAND = MethodHandles.privateLookupIn(ConnectedPlayer.class, MethodHandles.lookup())
.findVirtual(ConnectedPlayer.class, "setClientBrand", MethodType.methodType(void.class, String.class));

MARK_LOGIN_EVENT_FIRED = MethodHandles.privateLookupIn(ConnectedPlayer.class, MethodHandles.lookup())
.findVirtual(ConnectedPlayer.class, "markLoginEventFired", MethodType.methodType(void.class));

Field brandChannelField = ClientConfigSessionHandler.class.getDeclaredField("brandChannel");
brandChannelField.setAccessible(true);
BRAND_CHANNEL_SETTER = LambdaUtil.setterOf(brandChannelField);
Expand Down
Loading