diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/server/game/Entities/Player/Player.cpp | 4 | ||||
| -rwxr-xr-x | src/server/game/Groups/Group.cpp | 2 | ||||
| -rwxr-xr-x | src/server/game/Guilds/Guild.cpp | 2 | ||||
| -rwxr-xr-x | src/server/game/Spells/SpellEffects.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 6a312c5a9b4..935b9ad4b70 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -17549,11 +17549,11 @@ void Player::_LoadBoundInstances(PreparedQueryResult result) Field* fields = result->Fetch(); bool perm = fields[1].GetBool(); - uint32 mapId = fields[2].GetUInt32(); + uint32 mapId = fields[2].GetUInt16(); uint32 instanceId = fields[0].GetUInt32(); uint8 difficulty = fields[3].GetUInt8(); - time_t resetTime = (time_t)fields[4].GetUInt64(); + time_t resetTime = time_t(fields[4].GetUInt32()); // the resettime for normal instances is only saved when the InstanceSave is unloaded // so the value read from the DB may be wrong here but only if the InstanceSave is loaded // and in that case it is not used diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 6c56c9c663a..cca876a3e1d 100755 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -160,7 +160,7 @@ bool Group::LoadGroupFromDB(const uint32 &groupGuid, QueryResult result, bool lo m_lootThreshold = ItemQualities(fields[3].GetUInt16()); for (uint8 i = 0; i < TARGETICONCOUNT; ++i) - m_targetIcons[i] = fields[4+i].GetUInt64(); + m_targetIcons[i] = fields[4+i].GetUInt32(); m_groupType = GroupType(fields[12].GetUInt8()); if (m_groupType & GROUPTYPE_RAID) diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index c80f6c28bf0..9e11e3507af 100755 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -591,7 +591,7 @@ bool Guild::Member::LoadFromDB(Field* fields) fields[21].GetUInt8(), fields[22].GetUInt32(), fields[23].GetUInt32()); - m_logoutTime = fields[24].GetUInt64(); + m_logoutTime = fields[24].GetUInt32(); if (!CheckStats()) return false; diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index afd0b7dc714..0a27601b6f5 100755 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -2705,7 +2705,7 @@ void Spell::SendLoot(uint64 guid, LootType loottype) if (gameObjTarget) { // Players shouldn't be able to loot gameobjects that are currently despawned - if (gameObjTarget->GetRespawnTime() > 0 && !player->isGameMaster()) + if (!gameObjTarget->isSpawned() && !player->isGameMaster()) { sLog->outError("Possible hacking attempt: Player %s [guid: %u] tried to loot a gameobject [entry: %u id: %u] which is on respawn time without being in GM mode!", player->GetName(), player->GetGUIDLow(), gameObjTarget->GetEntry(), gameObjTarget->GetGUIDLow()); |