From 02d05a23390f77f9c5f4dca47047935f4fea8609 Mon Sep 17 00:00:00 2001
From: balrok <der-coole-carl@gmx.net>
Date: Thu, 26 Mar 2009 23:16:15 +0100
Subject: [PATCH] [7551] apply deserter debuff also if player leaves the bg in
 preparation phase

prior this deserter debuff was only applied at status_in_progress
---
 src/game/Player.cpp      | 9 +++++----
 src/shared/revision_nr.h | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index bfc356f67..aadf62113 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -17504,13 +17504,14 @@ void Player::LeaveBattleground(bool teleportToEntryPoint)
 {
     if(BattleGround *bg = GetBattleGround())
     {
-        bool need_debuf = bg->isBattleGround() && (bg->GetStatus() == STATUS_IN_PROGRESS) && sWorld.getConfig(CONFIG_BATTLEGROUND_CAST_DESERTER);
-
         bg->RemovePlayerAtLeave(GetGUID(), teleportToEntryPoint, true);
 
         // call after remove to be sure that player resurrected for correct cast
-        if(need_debuf)
-            CastSpell(this, 26013, true);                   // Deserter
+        if( bg->isBattleGround() && sWorld.getConfig(CONFIG_BATTLEGROUND_CAST_DESERTER) )
+        {
+            if( bg->GetStatus() == STATUS_IN_PROGRESS || bg->GetStatus() == STATUS_WAIT_JOIN )
+                CastSpell(this, 26013, true);               // Deserter
+        }
     }
 }
 
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 01a740f20..429126562 100644
--- 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 "7550"
+ #define REVISION_NR "7551"
 #endif // __REVISION_NR_H__