diff options
| author | Shauren <shauren.trinity@gmail.com> | 2022-03-29 23:07:07 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-03-29 23:07:07 +0200 |
| commit | e334fdf3ade7c3df8df9e5730434b67fe1ed019a (patch) | |
| tree | d0d9475591a3dc3f3e75576aca8e27495bdc31e3 /src/server/game/Entities/Player | |
| parent | d611925dc7ab2b3f19c5ee9e0f75b8dfb6de1291 (diff) | |
Core/Units: Reduce differences between branches part 1 - object class
Diffstat (limited to 'src/server/game/Entities/Player')
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 7 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.h | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 2ab7e8f9b92..8eb22328511 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -17194,9 +17194,6 @@ bool Player::LoadFromDB(ObjectGuid guid, CharacterDatabaseQueryHolder const& hol return false; } - // overwrite possible wrong/corrupted guid - SetGuidValue(OBJECT_FIELD_GUID, guid); - Gender gender = Gender(fields[5].GetUInt8()); if (!IsValidGender(gender)) { @@ -17871,7 +17868,7 @@ bool Player::LoadFromDB(ObjectGuid guid, CharacterDatabaseQueryHolder const& hol return true; } -bool Player::isAllowedToLoot(Creature const* creature) +bool Player::isAllowedToLoot(Creature const* creature) const { if (!creature->isDead() || !creature->IsDamageEnoughForLootingAndReward()) return false; @@ -17888,7 +17885,7 @@ bool Player::isAllowedToLoot(Creature const* creature) if (loot->loot_type == LOOT_SKINNING) return creature->GetLootRecipientGUID() == GetGUID(); - Group* thisGroup = GetGroup(); + Group const* thisGroup = GetGroup(); if (!thisGroup) return this == creature->GetLootRecipient(); else if (thisGroup != creature->GetLootRecipientGroup()) diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index b4aafb4c65c..b08fd00b72b 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -2116,7 +2116,7 @@ class TC_GAME_API Player : public Unit, public GridObject<Player> void SetMap(Map* map) override; void ResetMap() override; - bool isAllowedToLoot(Creature const* creature); + bool isAllowedToLoot(Creature const* creature) const; DeclinedName const* GetDeclinedNames() const { return m_declinedname; } uint8 GetRunesState() const { return m_runes->runeState; } |