From 14b5fa63b194c5b627a4a9ba6c9cfbba62c9573d Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 11 Jul 2016 16:21:57 +0000 Subject: [PATCH] Allow logout if GM is fighting. --- .../gameserver/network/clientpackets/Logout.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java index 9ee6753b21..770242b012 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -66,14 +66,12 @@ public final class Logout implements IClientIncomingPacket // Don't allow leaving if player is fighting if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(player)) { - if (player.isGM() && Config.GM_RESTART_FIGHTING) + if (!player.isGM() || (player.isGM() && !Config.GM_RESTART_FIGHTING)) { + player.sendPacket(SystemMessageId.YOU_CANNOT_EXIT_THE_GAME_WHILE_IN_COMBAT); + player.sendPacket(ActionFailed.STATIC_PACKET); return; } - - player.sendPacket(SystemMessageId.YOU_CANNOT_EXIT_THE_GAME_WHILE_IN_COMBAT); - player.sendPacket(ActionFailed.STATIC_PACKET); - return; } if (L2Event.isParticipant(player))