nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-01 18:13:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Core/Misc: add support to calculate zoneId/areaId for creatures & gameojects (#1226)

Browse Source
This commit is contained in:
Nefertumm
2019-01-07 06:07:06 -03:00
committed by Viste(Кирилл)
parent 5ad58353f2
commit e51fe9e081
6 changed files with 50 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/Database/Implementation/WorldDatabase.cpp
View File

@@ -79,4 +79,6 @@ void WorldDatabaseConnection::DoPrepareStatements()
PrepareStatement(WORLD_INS_DISABLES, "INSERT INTO disables (entry, sourceType, flags, comment) VALUES (?, ?, ?, ?)", CONNECTION_ASYNC); PrepareStatement(WORLD_INS_DISABLES, "INSERT INTO disables (entry, sourceType, flags, comment) VALUES (?, ?, ?, ?)", CONNECTION_ASYNC);
PrepareStatement(WORLD_SEL_DISABLES, "SELECT entry FROM disables WHERE entry = ? AND sourceType = ?", CONNECTION_SYNCH); PrepareStatement(WORLD_SEL_DISABLES, "SELECT entry FROM disables WHERE entry = ? AND sourceType = ?", CONNECTION_SYNCH);
PrepareStatement(WORLD_DEL_DISABLES, "DELETE FROM disables WHERE entry = ? AND sourceType = ?", CONNECTION_ASYNC); PrepareStatement(WORLD_DEL_DISABLES, "DELETE FROM disables WHERE entry = ? AND sourceType = ?", CONNECTION_ASYNC);
PrepareStatement(WORLD_UPD_CREATURE_ZONE_AREA_DATA, "UPDATE creature SET zoneId = ?, areaId = ? WHERE guid = ?", CONNECTION_ASYNC);
PrepareStatement(WORLD_UPD_GAMEOBJECT_ZONE_AREA_DATA, "UPDATE gameobject SET zoneId = ?, areaId = ? WHERE guid = ?", CONNECTION_ASYNC);
} }

2
src/common/Database/Implementation/WorldDatabase.h
View File

@@ -100,6 +100,8 @@ enum WorldDatabaseStatements
WORLD_SEL_DISABLES, WORLD_SEL_DISABLES,
WORLD_INS_DISABLES, WORLD_INS_DISABLES,
WORLD_DEL_DISABLES, WORLD_DEL_DISABLES,
WORLD_UPD_CREATURE_ZONE_AREA_DATA,
WORLD_UPD_GAMEOBJECT_ZONE_AREA_DATA,
MAX_WORLDDATABASE_STATEMENTS MAX_WORLDDATABASE_STATEMENTS
}; };

28
src/server/game/Globals/ObjectMgr.cpp
View File

@@ -1780,6 +1780,20 @@ void ObjectMgr::LoadCreatures()
data.phaseMask = 1; data.phaseMask = 1;
} }
if (sWorld->getBoolConfig(CONFIG_CALCULATE_CREATURE_ZONE_AREA_DATA))
{
uint32 zoneId = sMapMgr->GetZoneId(data.mapid, data.posX, data.posY, data.posZ);
uint32 areaId = sMapMgr->GetAreaId(data.mapid, data.posX, data.posY, data.posZ);
PreparedStatement* stmt = WorldDatabase.GetPreparedStatement(WORLD_UPD_CREATURE_ZONE_AREA_DATA);
stmt->setUInt32(0, zoneId);
stmt->setUInt32(1, areaId);
stmt->setUInt64(2, guid);
WorldDatabase.Execute(stmt);
}
// Add to grid if not managed by the game event or pool system // Add to grid if not managed by the game event or pool system
if (gameEvent == 0 && PoolId == 0) if (gameEvent == 0 && PoolId == 0)
AddCreatureToGrid(guid, &data); AddCreatureToGrid(guid, &data);
@@ -2102,6 +2116,20 @@ void ObjectMgr::LoadGameobjects()
data.phaseMask = 1; data.phaseMask = 1;
} }
if (sWorld->getBoolConfig(CONFIG_CALCULATE_GAMEOBJECT_ZONE_AREA_DATA))
{
uint32 zoneId = sMapMgr->GetZoneId(data.mapid, data.posX, data.posY, data.posZ);
uint32 areaId = sMapMgr->GetAreaId(data.mapid, data.posX, data.posY, data.posZ);
PreparedStatement* stmt = WorldDatabase.GetPreparedStatement(WORLD_UPD_GAMEOBJECT_ZONE_AREA_DATA);
stmt->setUInt32(0, zoneId);
stmt->setUInt32(1, areaId);
stmt->setUInt64(2, guid);
WorldDatabase.Execute(stmt);
}
if (gameEvent == 0 && PoolId == 0) // if not this is to be managed by GameEvent System or Pool system if (gameEvent == 0 && PoolId == 0) // if not this is to be managed by GameEvent System or Pool system
AddGameobjectToGrid(guid, &data); AddGameobjectToGrid(guid, &data);
++count; ++count;

3
src/server/game/World/World.cpp
View File

@@ -1305,6 +1305,9 @@ void World::LoadConfigSettings(bool reload)
m_bool_configs[CONFIG_ENABLE_CONTINENT_TRANSPORT] = sConfigMgr->GetBoolDefault("IsContinentTransport.Enabled", true); m_bool_configs[CONFIG_ENABLE_CONTINENT_TRANSPORT] = sConfigMgr->GetBoolDefault("IsContinentTransport.Enabled", true);
m_bool_configs[CONFIG_ENABLE_CONTINENT_TRANSPORT_PRELOADING] = sConfigMgr->GetBoolDefault("IsPreloadedContinentTransport.Enabled", false); m_bool_configs[CONFIG_ENABLE_CONTINENT_TRANSPORT_PRELOADING] = sConfigMgr->GetBoolDefault("IsPreloadedContinentTransport.Enabled", false);
m_bool_configs[CONFIG_CALCULATE_CREATURE_ZONE_AREA_DATA] = sConfigMgr->GetBoolDefault("Calculate.Creature.Zone.Area.Data", false);
m_bool_configs[CONFIG_CALCULATE_GAMEOBJECT_ZONE_AREA_DATA] = sConfigMgr->GetBoolDefault("Calculate.Gameoject.Zone.Area.Data", false);
// call ScriptMgr if we're reloading the configuration // call ScriptMgr if we're reloading the configuration
sScriptMgr->OnAfterConfigLoad(reload); sScriptMgr->OnAfterConfigLoad(reload);
} }

2
src/server/game/World/World.h
View File

@@ -162,6 +162,8 @@ enum WorldBoolConfigs
CONFIG_ENABLE_CONTINENT_TRANSPORT, CONFIG_ENABLE_CONTINENT_TRANSPORT,
CONFIG_ENABLE_CONTINENT_TRANSPORT_PRELOADING, CONFIG_ENABLE_CONTINENT_TRANSPORT_PRELOADING,
CONFIG_MINIGOB_MANABONK, CONFIG_MINIGOB_MANABONK,
CONFIG_CALCULATE_CREATURE_ZONE_AREA_DATA,
CONFIG_CALCULATE_GAMEOBJECT_ZONE_AREA_DATA,
BOOL_CONFIG_VALUE_COUNT BOOL_CONFIG_VALUE_COUNT
}; };

13
src/server/worldserver/worldserver.conf.dist
View File

@@ -3164,6 +3164,19 @@ MoveMaps.Enable = 1
Minigob.Manabonk.Enable = 1 Minigob.Manabonk.Enable = 1
#
# Calculate.Creature.Zone.Area.Data
# Description: Calculate at loading creature zoneId / areaId and save in creature table (WARNING: SLOW WORLD SERVER STARTUP)
# Default: 0 - (Do not show)
Calculate.Creature.Zone.Area.Data = 0
#
# Calculate.Gameoject.Zone.Area.Data
# Description: Calculate at loading gameobject zoneId / areaId and save in gameobject table (WARNING: SLOW WORLD SERVER STARTUP)
# Default: 0 - (Do not show)
Calculate.Gameoject.Zone.Area.Data = 0
# #
################################################################################################### ###################################################################################################