Fix issues with server connections.

This commit is contained in:
Andrew Steinborn
2018-10-29 19:25:51 -04:00
parent 2b53d14461
commit f423169449
3 changed files with 11 additions and 12 deletions

View File

@@ -4,8 +4,10 @@ import com.google.common.base.Preconditions;
import com.velocitypowered.api.event.ResultedEvent;
import com.velocitypowered.api.proxy.Player;
import com.velocitypowered.api.proxy.server.RegisteredServer;
import java.util.Optional;
import net.kyori.text.Component;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
/**
* Fired when a player is kicked from a server. You may either allow Velocity to kick the player
@@ -16,15 +18,15 @@ public final class KickedFromServerEvent implements
private final Player player;
private final RegisteredServer server;
private final Component originalReason;
private final @Nullable Component originalReason;
private final boolean duringServerConnect;
private ServerKickResult result;
public KickedFromServerEvent(Player player, RegisteredServer server, Component originalReason,
boolean duringServerConnect, Component fancyReason) {
public KickedFromServerEvent(Player player, RegisteredServer server,
@Nullable Component originalReason, boolean duringServerConnect, Component fancyReason) {
this.player = Preconditions.checkNotNull(player, "player");
this.server = Preconditions.checkNotNull(server, "server");
this.originalReason = Preconditions.checkNotNull(originalReason, "originalReason");
this.originalReason = originalReason;
this.duringServerConnect = duringServerConnect;
this.result = new Notify(fancyReason);
}
@@ -47,8 +49,8 @@ public final class KickedFromServerEvent implements
return server;
}
public Component getOriginalReason() {
return originalReason;
public Optional<Component> getOriginalReason() {
return Optional.ofNullable(originalReason);
}
/**