Another attempt to fix travis build

Signed-off-by: Xfurry <xfurry.cmangos@outlook.com>
cmangos · Jan 8, 2018 · 7fe6e58 · 7fe6e58
1 parent 29d5b90
commit 7fe6e58
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/game/Battlefield/Battlefield.cpp b/src/game/Battlefield/Battlefield.cpp
@@ -408,7 +408,7 @@ void Battlefield::QuestCreditTeam(uint32 credit, Team team, WorldObject* source,
         if (!plr)
             continue;
 
-        if (plr->GetTeam() != team || source && radius > 0.0f && source->GetDistance2d(plr->GetPositionX(), plr->GetPositionY()) > radius)
+        if ((plr->GetTeam() != team || source) && radius > 0.0f && source->GetDistance2d(plr->GetPositionX(), plr->GetPositionY()) > radius)
             continue;
 
         plr->KilledMonsterCredit(credit);

diff --git a/src/game/Battlefield/BattlefieldHandler.cpp b/src/game/Battlefield/BattlefieldHandler.cpp
@@ -23,6 +23,7 @@
 #include "WorldPacket.h"
 #include "Log.h"
 #include "Server/Opcodes.h"
+#include "Entities/Player.h"
 
 /**
 Invite a player to join and teleport to a battlefield