diff options
| author | Machiavelli <machiavelli.trinity@gmail.com> | 2011-11-25 13:46:07 +0100 |
|---|---|---|
| committer | Machiavelli <machiavelli.trinity@gmail.com> | 2011-11-25 13:46:07 +0100 |
| commit | b4ac70f8cbcdb42e601778221dfa45c9ced117eb (patch) | |
| tree | c55342737ae38716d6422c3d8911ca6a2f1fe26f | |
| parent | cf0d5e4ec87b00baf19f89146e8c4a028a9a9038 (diff) | |
| parent | d2b4f331128e10748ad31d3dbc83b36eba5904ca (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.x
| -rw-r--r-- | .gitignore | 2 | ||||
| -rwxr-xr-x | src/server/game/Conditions/DisableMgr.cpp | 2 | ||||
| -rwxr-xr-x | src/server/game/Entities/Pet/Pet.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 02609aebbe7..5bceef179b9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -build/ +build*/ .directory .mailmap *.orig diff --git a/src/server/game/Conditions/DisableMgr.cpp b/src/server/game/Conditions/DisableMgr.cpp index 32c73027cba..982c0f16ffa 100755 --- a/src/server/game/Conditions/DisableMgr.cpp +++ b/src/server/game/Conditions/DisableMgr.cpp @@ -284,7 +284,7 @@ bool IsDisabledFor(DisableType type, uint32 entry, Unit const* unit, uint8 flags if ((spellFlags & SPELL_DISABLE_PLAYER && unit->GetTypeId() == TYPEID_PLAYER) || (unit->GetTypeId() == TYPEID_UNIT && ((unit->ToCreature()->isPet() && spellFlags & SPELL_DISABLE_PET) || spellFlags & SPELL_DISABLE_CREATURE))) { - if (flags & SPELL_DISABLE_MAP) + if (spellFlags & SPELL_DISABLE_MAP) { std::set<uint32> const& mapIds = itr->second.params[0]; if (mapIds.find(unit->GetMapId()) != mapIds.end()) diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index 1d9e4069065..990e5f8c958 100755 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -387,7 +387,7 @@ void Pet::SavePetToDB(PetSaveMode mode) CharacterDatabase.EscapeString(name); trans = CharacterDatabase.BeginTransaction(); // remove current data - trans->PAppend("DELETE FROM character_pet WHERE owner = '%u' AND id = '%u'", owner, m_charmInfo->GetPetNumber()); + trans->PAppend("DELETE FROM character_pet WHERE owner = '%u' AND id = '%u'", ownerLowGUID, m_charmInfo->GetPetNumber()); // prevent duplicate using slot (except PET_SAVE_NOT_IN_SLOT) if (mode <= PET_SAVE_LAST_STABLE_SLOT) |