mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-17 16:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[c12593] Fix a mistake from [12432]

Browse source
This commit is contained in:
Schmoozerd 2013-05-31 10:54:46 +01:00 • committed by Antz
parent 66581d99ff
commit c93ade7c59
3 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/game/CharacterHandler.cpp
View file

@ -723,7 +723,18 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder *holder)
} }
uint32 miscRequirement = 0; uint32 miscRequirement = 0;
AreaLockStatus lockStatus = pCurrChar->GetAreaTriggerLockStatus(sObjectMgr.GetMapEntranceTrigger(pCurrChar->GetMapId()), pCurrChar->GetDifficulty(pCurrChar->GetMap()->IsRaid()), miscRequirement); AreaLockStatus lockStatus = AREA_LOCKSTATUS_OK;
if (AreaTrigger const* at = sObjectMgr.GetMapEntranceTrigger(pCurrChar->GetMapId()))
lockStatus = pCurrChar->GetAreaTriggerLockStatus(at, pCurrChar->GetDifficulty(pCurrChar->GetMap()->IsRaid()), miscRequirement);
else
{
// Some basic checks in case of a map without areatrigger
MapEntry const* mapEntry = sMapStore.LookupEntry(pCurrChar->GetMapId());
if (!mapEntry)
lockStatus = AREA_LOCKSTATUS_UNKNOWN_ERROR;
else if (pCurrChar->GetSession()->Expansion() < mapEntry->Expansion())
lockStatus = AREA_LOCKSTATUS_INSUFFICIENT_EXPANSION;
}
if (lockStatus != AREA_LOCKSTATUS_OK || !pCurrChar->GetMap()->Add(pCurrChar)) if (lockStatus != AREA_LOCKSTATUS_OK || !pCurrChar->GetMap()->Add(pCurrChar))
{ {
// normal delayed teleport protection not applied (and this correct) for this case (Player object just created) // normal delayed teleport protection not applied (and this correct) for this case (Player object just created)

4
src/game/LootMgr.cpp
View file

@ -337,12 +337,12 @@ bool LootStoreItem::IsValid(LootStore const& store, uint32 entry) const
{ {
if (needs_quest) if (needs_quest)
{ {
sLog.outErrorDb("Table '%s' entry %d item %d: negative chance is specified for a reference, skipped", store.GetName(), entry, itemid); sLog.outErrorDb("Table '%s' entry %d item %d: negative chance is given for a reference, skipped", store.GetName(), entry, itemid);
return false; return false;
} }
else if (chance == 0) // no chance for the reference else if (chance == 0) // no chance for the reference
{ {
sLog.outErrorDb("Table '%s' entry %d item %d: zero chance is specified for a reference, skipped", store.GetName(), entry, itemid); sLog.outErrorDb("Table '%s' entry %d item %d: zero chance is given for a reference, reference will never be used, skipped", store.GetName(), entry, itemid);
return false; return false;
} }
} }

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "12592" #define REVISION_NR "12593"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__