[12777] Fix issue with afk playerin duel logout request from client a…

…fter 30 mins. We can logout during duel. Btw during duel we must be in combat for some timer without any action. Also change message from "duel cancel" to "duel FLED"
cmangos · Nov 11, 2014 · cc542de · cc542de
1 parent 43caf20
commit cc542de
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/src/game/MiscHandler.cpp b/src/game/MiscHandler.cpp
@@ -273,7 +273,6 @@ void WorldSession::HandleLogoutRequestOpcode(WorldPacket& /*recv_data*/)
 
     // Can not logout if...
     if (GetPlayer()->isInCombat() ||                        //...is in combat
-            GetPlayer()->duel         ||                    //...is in Duel
             //...is jumping ...is falling
             GetPlayer()->m_movementInfo.HasMovementFlag(MovementFlags(MOVEFLAG_FALLING | MOVEFLAG_FALLINGFAR)))
     {

diff --git a/src/game/Player.cpp b/src/game/Player.cpp
@@ -610,7 +610,7 @@ void Player::CleanupsBeforeDelete()
     if (m_uint32Values)                                     // only for fully created Object
     {
         TradeCancel(false);
-        DuelComplete(DUEL_INTERRUPTED);
+        DuelComplete(DUEL_FLED);
     }
 
     // notify zone scripts for player logout

diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "12776"
+ #define REVISION_NR "12777"
 #endif // __REVISION_NR_H__