diff options
| -rwxr-xr-x | src/server/game/Entities/Player/Player.cpp | 7 | ||||
| -rw-r--r-- | src/server/game/Movement/Spline/MoveSpline.cpp | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 80f2ecb47b4..6d48761a852 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -23507,7 +23507,7 @@ WorldObject* Player::GetViewpoint() const bool Player::CanUseBattlegroundObject(GameObject* gameobject) { - // It is possible to call this method will a null pointer, only skipping faction check. + // It is possible to call this method with a null pointer, only skipping faction check. if (gameobject) { FactionTemplateEntry const* playerFaction = getFactionTemplateEntry(); @@ -23527,9 +23527,8 @@ bool Player::CanUseBattlegroundObject(GameObject* gameobject) bool Player::CanCaptureTowerPoint() { return (!HasStealthAura() && // not stealthed - !HasInvisibilityAura() && // not invisible - isAlive() // live player -); + !HasInvisibilityAura() && // not invisible + isAlive()); // live player } uint32 Player::GetBarberShopCost(uint8 newhairstyle, uint8 newhaircolor, uint8 newfacialhair, BarberShopStyleEntry const* newSkin) diff --git a/src/server/game/Movement/Spline/MoveSpline.cpp b/src/server/game/Movement/Spline/MoveSpline.cpp index 5bd80ef54e6..65de999c5a7 100644 --- a/src/server/game/Movement/Spline/MoveSpline.cpp +++ b/src/server/game/Movement/Spline/MoveSpline.cpp @@ -201,7 +201,7 @@ bool MoveSplineInitArgs::Validate(Unit* unit) const #define CHECK(exp) \ if (!(exp))\ {\ - sLog->outError(LOG_FILTER_GENERAL, "MoveSplineInitArgs::Validate: expression '%s' failed for %u", #exp, unit->GetGUIDLow());\ + sLog->outError(LOG_FILTER_GENERAL, "MoveSplineInitArgs::Validate: expression '%s' failed for GUID: %u", #exp, unit->GetTypeId() == TYPEID_PLAYER ? unit->GetGUIDLow() : unit->ToCreature()->GetDBTableGUIDLow());\ return false;\ } CHECK(path.size() > 1); |