From e6349334310efcd1848bc23da95673b4706c2680 Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Wed, 20 Apr 2022 14:44:14 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B8=A2=E5=87=BA=E5=85=AC=E4=BC=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/logic/family/GuildLogic.java | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java index 3e8cbe86a..decd5fc1c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java @@ -703,20 +703,12 @@ public class GuildLogic { targetUser.getGuildMyInfo().clearOfLevelGuild(); addGuildLog(guildInfo.getId(),GuildDef.Log.KICK,targetUser.getPlayerInfoManager().getNickName()); -// int serverId = AreaManager.getInstance().getServerIdByUid(targetUid, GameApplication.serverId); -// if (serverId != GameApplication.serverId) { -// AyyncWorker ayyncWorker = new AyyncWorker(targetUser, true, new AyncWorkerRunnable(){ -// @Override -// public void work(User user) throws Exception { -// user.getPlayerInfoManager().setGuildId(0); -// user.getPlayerInfoManager().setWelfareRedPackets(clearRedPacketMap(user)); -// user.getGuildMyInfo().clearOfLevelGuild(); -// } -// }); -// String s = RedisUtil.getInstence().getGson().toJson(ayyncWorker); -// PlayerLogic.getInstance().updateUserInfo(serverId, targetUid, s); -// return; -// } + int serverId = AreaManager.getInstance().getServerIdByUid(targetUid, GameApplication.serverId); + if (serverId != GameApplication.serverId) { + String s = RedisUtil.getInstence().getGson().toJson(targetUser); + PlayerLogic.getInstance().updateUserInfo(serverId, targetUid, s, 2); + } + String title = SErrorCodeEerverConfig.getI18NMessage("family_kick_title"); String content = SErrorCodeEerverConfig.getI18NMessageNeedConvert("family_kick_txt",new Object[]{guildInfo.getName()},new int[]{0},"#"); MailLogic.getInstance().sendMail(targetUid,title,content,"",(int) (TimeUtils.now()/1000), Global.MAIL_EFFECTIVE_TIME);