mirror/Velocity
2
0
Fork 0
mirror of https://github.com/PaperMC/Velocity.git synced 2025-03-19 16:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Correctly handle rapid disconnects. Fixes

Browse Source
This commit is contained in:
Andrew Steinborn 2018-08-11 06:46:40 -04:00
parent 8068f72729
commit 21e72556c9
3 changed files with 23 additions and 7 deletions
proxy/src/main/java/com/velocitypowered/proxy/connection
MinecraftConnection.java
backend
BackendPlaySessionHandler.java
client
ConnectedPlayer.java

15
proxy/src/main/java/com/velocitypowered/proxy/connection/MinecraftConnection.java

@ -104,18 +104,21 @@ public class MinecraftConnection extends ChannelInboundHandlerAdapter {
}
public void write(Object msg) {
ensureOpen();
channel.writeAndFlush(msg, channel.voidPromise());
if (channel.isActive()) {
channel.writeAndFlush(msg, channel.voidPromise());
}
}
public void delayedWrite(Object msg) {
ensureOpen();
channel.write(msg, channel.voidPromise());
if (channel.isActive()) {
channel.write(msg, channel.voidPromise());
}
}
public void flush() {
ensureOpen();
channel.flush();
if (channel.isActive()) {
channel.flush();
}
}
public void closeWith(Object msg) {

14
proxy/src/main/java/com/velocitypowered/proxy/connection/backend/BackendPlaySessionHandler.java

@ -18,6 +18,13 @@ public class BackendPlaySessionHandler implements MinecraftSessionHandler {
@Override
public void handle(MinecraftPacket packet) {
if (!connection.getProxyPlayer().isActive()) {
// Connection was left open accidentally. Close it so as to avoid "You logged in from another location"
// errors.
connection.getMinecraftConnection().close();
return;
}
ClientPlaySessionHandler playerHandler =
(ClientPlaySessionHandler) connection.getProxyPlayer().getConnection().getSessionHandler();
if (packet instanceof KeepAlive) {
@ -69,6 +76,13 @@ public class BackendPlaySessionHandler implements MinecraftSessionHandler {
@Override
public void handleUnknown(ByteBuf buf) {
if (!connection.getProxyPlayer().isActive()) {
// Connection was left open accidentally. Close it so as to avoid "You logged in from another location"
// errors.
connection.getMinecraftConnection().close();
return;
}
ClientPlaySessionHandler playerHandler =
(ClientPlaySessionHandler) connection.getProxyPlayer().getConnection().getSessionHandler();
ByteBuf remapped = playerHandler.getIdRemapper().remap(buf, ProtocolConstants.Direction.CLIENTBOUND);

1
proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java

@ -132,7 +132,6 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
String error = ThrowableUtils.briefDescription(throwable);
String userMessage;
if (connectedServer != null && connectedServer.getServerInfo().equals(info)) {
logger.error("{}: exception occurred in connection to {}", this, info.getName(), throwable);
userMessage = "Exception in server " + info.getName();
} else {
logger.error("{}: unable to connect to server {}", this, info.getName(), throwable);