Mirrors/Velocity
3
0
Fork 1
Mirror von https://github.com/PaperMC/Velocity.git synchronisiert 2024-11-17 05:20:14 +01:00
Code Issues Pakete Projekte Releases Wiki Aktivität

remove @NonNull, revert reindentation

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Leymooo 2018-09-11 17:42:24 +03:00
Ursprung 74bf246c39
Commit 79bb43468f
2 geänderte Dateien mit 22 neuen und 23 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

3
api/src/main/java/com/velocitypowered/api/event/connection/PostLoginEvent.java
Datei anzeigen

@ -2,7 +2,6 @@ package com.velocitypowered.api.event.connection;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.Player;
import org.checkerframework.checker.nullness.qual.NonNull;
/** /**
* This event is fired once the player has been successfully authenticated and * This event is fired once the player has been successfully authenticated and
@ -12,7 +11,7 @@ public class PostLoginEvent {
private final Player player; private final Player player;
public PostLoginEvent(@NonNull Player player) { public PostLoginEvent(Player player) {
this.player = Preconditions.checkNotNull(player, "player"); this.player = Preconditions.checkNotNull(player, "player");
} }

42
proxy/src/main/java/com/velocitypowered/proxy/connection/client/LoginSessionHandler.java
Datei anzeigen

@ -42,8 +42,8 @@ import java.util.concurrent.ThreadLocalRandom;
public class LoginSessionHandler implements MinecraftSessionHandler { public class LoginSessionHandler implements MinecraftSessionHandler {
private static final Logger logger = LogManager.getLogger(LoginSessionHandler.class); private static final Logger logger = LogManager.getLogger(LoginSessionHandler.class);
private static final String MOJANG_SERVER_AUTH_URL private static final String MOJANG_SERVER_AUTH_URL =
= "https://sessionserver.mojang.com/session/minecraft/hasJoined?username=%s&serverId=%s&ip=%s"; "https://sessionserver.mojang.com/session/minecraft/hasJoined?username=%s&serverId=%s&ip=%s";
private final VelocityServer server; private final VelocityServer server;
private final MinecraftConnection inbound; private final MinecraftConnection inbound;
@ -195,26 +195,26 @@ public class LoginSessionHandler implements MinecraftSessionHandler {
apiInbound.getVirtualHost().orElse(null)); apiInbound.getVirtualHost().orElse(null));
return server.getEventManager().fire(new PermissionsSetupEvent(player, ConnectedPlayer.DEFAULT_PERMISSIONS)) return server.getEventManager().fire(new PermissionsSetupEvent(player, ConnectedPlayer.DEFAULT_PERMISSIONS))
.thenCompose(event -> { .thenCompose(event -> {
// wait for permissions to load, then set the players permission function // wait for permissions to load, then set the players permission function
player.setPermissionFunction(event.createFunction(player)); player.setPermissionFunction(event.createFunction(player));
// then call & wait for the login event // then call & wait for the login event
return server.getEventManager().fire(new LoginEvent(player)); return server.getEventManager().fire(new LoginEvent(player));
}) })
// then complete the connection // then complete the connection
.thenAcceptAsync(event -> { .thenAcceptAsync(event -> {
if (inbound.isClosed()) { if (inbound.isClosed()) {
// The player was disconnected // The player was disconnected
return; return;
} }
if (!event.getResult().isAllowed()) { if (!event.getResult().isAllowed()) {
// The component is guaranteed to be provided if the connection was denied. // The component is guaranteed to be provided if the connection was denied.
inbound.closeWith(Disconnect.create(event.getResult().getReason().get())); inbound.closeWith(Disconnect.create(event.getResult().getReason().get()));
return; return;
} }
handleProxyLogin(player); handleProxyLogin(player);
}, inbound.getChannel().eventLoop()); }, inbound.getChannel().eventLoop());
}); });
} }