MiniDay/hamster-ball
1
0
Fork 0
Code Issues Pull Requests Actions Releases 9 Activity

feat: 修复跨服传送时的错误

Browse Source
This commit is contained in:
叁只仓鼠
2023-06-10 23:35:07 +08:00
parent 70fda95767
commit 1fec3fb429
4 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hamster-ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/listener/BallBukkitListener.java
View File

@@ -107,7 +107,7 @@ public class BallBukkitListener implements Listener, BallListener {
SendPlayerToPlayerEvent event = CoreUtils.GSON.fromJson(info.getContent(), SendPlayerToPlayerEvent.class); SendPlayerToPlayerEvent event = CoreUtils.GSON.fromJson(info.getContent(), SendPlayerToPlayerEvent.class);
Player toPlayer = Bukkit.getPlayer(event.getToPlayerUUID()); Player toPlayer = Bukkit.getPlayer(event.getToPlayerUUID());
if (toPlayer == null) { if (toPlayer == null) {
return; break;
} }
Location location = toPlayer.getLocation(); Location location = toPlayer.getLocation();
for (UUID uuid : event.getSendPlayerUUID()) { for (UUID uuid : event.getSendPlayerUUID()) {

17
hamster-ball-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/listener/BallBungeeCordListener.java
View File

@@ -100,6 +100,23 @@ public final class BallBungeeCordListener implements Listener, BallListener {
} }
break; break;
} }
case SendPlayerToPlayerEvent.ACTION: {
SendPlayerToPlayerEvent event = CoreUtils.GSON.fromJson(info.getContent(), SendPlayerToPlayerEvent.class);
UUID toPlayerUUID = event.getToPlayerUUID();
ProxiedPlayer toPlayer = ProxyServer.getInstance().getPlayer(toPlayerUUID);
if (toPlayer == null) {
HamsterBallPlugin.getInstance().getLogger().warning("试图传送玩家时失败: 目标玩家 " + toPlayerUUID + " 不在线！");
break;
}
ServerInfo toServer = toPlayer.getServer().getInfo();
for (UUID uuid : event.getSendPlayerUUID()) {
ProxiedPlayer sendPlayer = ProxyServer.getInstance().getPlayer(uuid);
if (sendPlayer.getServer().getInfo().getName().equals(toServer.getName())) {
continue;
}
sendPlayer.connect(toServer);
}
}
} }
} }

2
hamster-ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/connector/BallServerChannelInitializer.java
View File

@@ -58,7 +58,7 @@ public class BallServerChannelInitializer extends ChannelInitializer<SocketChann
} }
channel.pipeline() channel.pipeline()
.addLast(new IdleStateHandler(10, 0, 0, TimeUnit.SECONDS)) .addLast(new IdleStateHandler(60, 0, 0, TimeUnit.SECONDS))
.addLast(new BallServerKeepAliveHandler()) .addLast(new BallServerKeepAliveHandler())
.addLast(new LengthFieldPrepender(8)) .addLast(new LengthFieldPrepender(8))
.addLast(new LengthFieldBasedFrameDecoder(Integer.MAX_VALUE, 0, 8, 0, 8)) .addLast(new LengthFieldBasedFrameDecoder(Integer.MAX_VALUE, 0, 8, 0, 8))

2
hamster-ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/connector/BallServerKeepAliveHandler.java
View File

@@ -13,10 +13,10 @@ public class BallServerKeepAliveHandler extends SimpleUserEventChannelHandler<Id
@Override @Override
protected void eventReceived(ChannelHandlerContext context, IdleStateEvent event) { protected void eventReceived(ChannelHandlerContext context, IdleStateEvent event) {
context.close();
synchronized (BallServerChannelInitializer.CHANNELS) { synchronized (BallServerChannelInitializer.CHANNELS) {
BallServerChannelInitializer.CHANNELS.remove(context.channel()); BallServerChannelInitializer.CHANNELS.remove(context.channel());
} }
context.close();
LOGGER.warn("由于无法验证连接存活，与服务器 {} 的连接已断开.", context.channel().remoteAddress()); LOGGER.warn("由于无法验证连接存活，与服务器 {} 的连接已断开.", context.channel().remoteAddress());
} }
} }