aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKandera <KanderaDev@gmail.com>2012-03-09 09:45:44 -0500
committerKandera <KanderaDev@gmail.com>2012-08-20 13:48:52 -0400
commit7491926e0c800c71a6ee409129b4eb71190339cf (patch)
tree553c7cb5d9670fadaf798676096b9e11191909f0
parent00f88588380f5372cb66e31b67dae56e9da44de5 (diff)
Core/Battlefield: fix stupid mistakes. sorry!
-rw-r--r--src/server/game/Battlefield/Battlefield.cpp3
-rw-r--r--src/server/scripts/Commands/cs_bf.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/server/game/Battlefield/Battlefield.cpp b/src/server/game/Battlefield/Battlefield.cpp
index e55000df320..3b1036ef3bd 100644
--- a/src/server/game/Battlefield/Battlefield.cpp
+++ b/src/server/game/Battlefield/Battlefield.cpp
@@ -328,7 +328,8 @@ void Battlefield::StartBattle()
void Battlefield::EndBattle(bool endbytimer)
{
if (!m_BattlefieldActive)
- return false;
+ return;
+
m_BattlefieldActive = false;
m_StartGrouping = false;
diff --git a/src/server/scripts/Commands/cs_bf.cpp b/src/server/scripts/Commands/cs_bf.cpp
index d410ae890f9..4eee7c391b0 100644
--- a/src/server/scripts/Commands/cs_bf.cpp
+++ b/src/server/scripts/Commands/cs_bf.cpp
@@ -61,7 +61,7 @@ public:
Battlefield* bf = sBattlefieldMgr->GetBattlefieldByBattleId(battleid);
- if (!bf || bf->)
+ if (!bf)
return false;
bf->StartBattle();