From 0e1e5d22c2e7e095dca3ae42382f5b0e007424ba Mon Sep 17 00:00:00 2001 From: duhui Date: Wed, 17 May 2023 11:08:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E6=9C=8D=E6=B5=8B=E8=AF=952?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/player/PlayerLogic.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java index b143de3bf..f9b381829 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java @@ -1777,6 +1777,17 @@ public class PlayerLogic { if (rpcString == null) { return null; } + // 合服 + String localRpc = RedisUtil.getInstence().getObject(RedisKey.LOGIC_SERVER_INFO, String.valueOf(GameApplication.serverId), String.class, -1); + if (localRpc != null && localRpc.equals(rpcString)) { + try { + return UserManager.getUser(uid, true); + } catch (Exception e) { + LOGGER.info("getUserByRpc Exception uid={} e={}", uid, e); + return null; + } + } + String[] split = rpcString.split(":"); if (split.length < 4) { LOGGER.error("获取玩家rpc地址,长度错误,rpc:{},玩家id:{},服务器id:{}", rpcString, uid, serverId);