mirror of
https://github.com/mangosfour/server.git
synced 2025-12-12 01:37:00 +00:00
Some more startup bypasses
This commit is contained in:
parent
ff99651246
commit
f820460d27
4 changed files with 31 additions and 30 deletions
|
|
@ -39,7 +39,7 @@ option(BUILD_MANGOSD "Build the main server" ON)
|
|||
option(BUILD_REALMD "Build the login server" ON)
|
||||
option(BUILD_TOOLS "Build the map/vmap/mmap extractors" ON)
|
||||
option(SCRIPT_LIB_ELUNA "Compile with support for Eluna scripts" OFF)
|
||||
option(SCRIPT_LIB_SD3 "Compile with support for ScriptDev3 scripts" ON)
|
||||
option(SCRIPT_LIB_SD3 "Compile with support for ScriptDev3 scripts" OFF)
|
||||
#option(PLAYERBOTS "Enable Player Bots" OFF)
|
||||
option(SOAP "Enable remote access via SOAP" OFF)
|
||||
# Hidden option to enable/disable PCH. DEV ONLY!
|
||||
|
|
|
|||
|
|
@ -5289,43 +5289,43 @@ bool SpellArea::IsFitToRequirements(Player const* player, uint32 newZone, uint32
|
|||
}
|
||||
}
|
||||
else // This block will be removed
|
||||
{
|
||||
if (gender != GENDER_NONE)
|
||||
{
|
||||
// not in expected gender
|
||||
if (!player || gender != player->getGender())
|
||||
if (gender != GENDER_NONE)
|
||||
{
|
||||
return false;
|
||||
// not in expected gender
|
||||
if (!player || gender != player->getGender())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (raceMask)
|
||||
{
|
||||
// not in expected race
|
||||
if (!player || !(raceMask & player->getRaceMask()))
|
||||
if (raceMask)
|
||||
{
|
||||
return false;
|
||||
// not in expected race
|
||||
if (!player || !(raceMask & player->getRaceMask()))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (questStart)
|
||||
{
|
||||
// not in expected required quest state
|
||||
if (!player || (!questStartCanActive || !player->IsActiveQuest(questStart)) && !player->GetQuestRewardStatus(questStart))
|
||||
if (questStart)
|
||||
{
|
||||
return false;
|
||||
// not in expected required quest state
|
||||
if (!player || (!questStartCanActive || !player->IsActiveQuest(questStart)) && !player->GetQuestRewardStatus(questStart))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (questEnd)
|
||||
{
|
||||
// not in expected forbidden quest state
|
||||
if (!player || player->GetQuestRewardStatus(questEnd))
|
||||
if (questEnd)
|
||||
{
|
||||
return false;
|
||||
// not in expected forbidden quest state
|
||||
if (!player || player->GetQuestRewardStatus(questEnd))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (areaId)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1603,9 +1603,10 @@ void World::SetInitialWorldSettings()
|
|||
sLog.outString("Calculate random battleground reset time...");
|
||||
InitRandomBGResetTime();
|
||||
|
||||
sLog.outString("Starting Game Event system...");
|
||||
uint32 nextGameEvent = sGameEventMgr.Initialize();
|
||||
m_timers[WUPDATE_EVENTS].SetInterval(nextGameEvent); // depend on next event
|
||||
sLog.outString("Starting Game Event system...BROKEN");
|
||||
// TODO: Needs Fixing
|
||||
// uint32 nextGameEvent = sGameEventMgr.Initialize();
|
||||
// m_timers[WUPDATE_EVENTS].SetInterval(nextGameEvent); // depend on next event
|
||||
|
||||
// ToDo: requires fix after the latest updates
|
||||
//sLog.outString("Loading grids for active creatures or transports...");
|
||||
|
|
|
|||
|
|
@ -38,6 +38,6 @@
|
|||
|
||||
#define WORLD_DB_VERSION_NR 21
|
||||
#define WORLD_DB_STRUCTURE_NR 11
|
||||
#define WORLD_DB_CONTENT_NR 012
|
||||
#define WORLD_DB_UPDATE_DESCRIPTION "gossip_option_condition"
|
||||
#define WORLD_DB_CONTENT_NR 041
|
||||
#define WORLD_DB_UPDATE_DESCRIPTION "initial_cleanup_part3"
|
||||
#endif // __REVISION_H__
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue