Index: C:/eclipse-31m7/workspace/L2_GameServer/java/net/sf/l2j/gameserver/clientpackets/Logout.java
===================================================================
--- C:/eclipse-31m7/workspace/L2_GameServer/java/net/sf/l2j/gameserver/clientpackets/Logout.java (revision 831)
+++ C:/eclipse-31m7/workspace/L2_GameServer/java/net/sf/l2j/gameserver/clientpackets/Logout.java (working copy)
@@ -23,7 +23,9 @@
import net.sf.l2j.gameserver.ClientThread;
import net.sf.l2j.gameserver.model.L2PcInstance;
+import net.sf.l2j.gameserver.serverpackets.ActionFailed;
import net.sf.l2j.gameserver.serverpackets.LeaveWorld;
+import net.sf.l2j.gameserver.serverpackets.SystemMessage;
/**
* This class ...
@@ -48,20 +50,27 @@
void runImpl()
{
- // normally the server would send serveral "delete object" before "leaveWorld"
- // we skip that for now
-
- LeaveWorld ql = new LeaveWorld();
- sendPacket(ql);
-
// removing player from the world
L2PcInstance player = getClient().getActiveChar();
if (player != null)
{
+ if(player.isAttackingNow())
+ {
+ SystemMessage sm = new SystemMessage(101);
+ player.sendPacket(sm);
+ player.sendPacket(new ActionFailed()); //??
+ return;
+ }
player.deleteMe();
//save character
ClientThread.saveCharToDisk(player);
}
+
+ // normally the server would send serveral "delete object" before "leaveWorld"
+ // we skip that for now
+ LeaveWorld ql = new LeaveWorld();
+ sendPacket(ql);
+
}
/* (non-Javadoc)