Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Core/Creatures: Split creature_addon and creature_template_addon's byte columns into seperate ones

Browse Source 
* Instead of dumping raw byte values into these fields, we now only allow setting values which should be accessible to database devs. The remaining byte values should be handled by core internals and spells (pet talents and shapeshifting for example)
This commit is contained in:
Ovahlord committed 2023-01-10 16:23:21 +01:00
1 parent b8a2e7496c
commit 7d646a7ed2
5 files changed
+152 -82
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/game/Globals/ObjectMgr.cpp
+66 -20
View File
@@ -564,8 +564,8 @@ void ObjectMgr::LoadCreatureTemplateAddons()
{
uint32 oldMSTime = getMSTime();
// 0 1 2 3 4 5 6 7 8 9 10 11
QueryResult result = WorldDatabase.Query("SELECT entry, waypointPathId, cyclicSplinePathId, mount, bytes1, bytes2, emote, aiAnimKit, movementAnimKit, meleeAnimKit, visibilityDistanceType, auras FROM creature_template_addon");
// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14
QueryResult result = WorldDatabase.Query("SELECT entry, waypointPathId, cyclicSplinePathId, mount, StandState, AnimTier, VisFlags, SheathState, PvPFlags, emote, aiAnimKit, movementAnimKit, meleeAnimKit, visibilityDistanceType, auras FROM creature_template_addon");
if (!result)
{
@@ -591,15 +591,18 @@ void ObjectMgr::LoadCreatureTemplateAddons()
creatureAddon.waypointPathId = fields[1].GetUInt32();
creatureAddon.cyclicSplinePathId = fields[2].GetUInt32();
creatureAddon.mount = fields[3].GetUInt32();
creatureAddon.bytes1 = fields[4].GetUInt32();
creatureAddon.bytes2 = fields[5].GetUInt32();
creatureAddon.emote = fields[6].GetUInt32();
creatureAddon.aiAnimKit = fields[7].GetUInt16();
creatureAddon.movementAnimKit = fields[8].GetUInt16();
creatureAddon.meleeAnimKit = fields[9].GetUInt16();
creatureAddon.visibilityDistanceType = VisibilityDistanceType(fields[10].GetUInt8());
creatureAddon.standState = fields[4].GetUInt8();
creatureAddon.animTier = fields[5].GetUInt8();
creatureAddon.visFlags = fields[6].GetUInt8();
creatureAddon.sheathState = fields[7].GetUInt8();
creatureAddon.pvpFlags = fields[8].GetUInt8();
creatureAddon.emote = fields[9].GetUInt32();
creatureAddon.aiAnimKit = fields[10].GetUInt16();
creatureAddon.movementAnimKit = fields[11].GetUInt16();
creatureAddon.meleeAnimKit = fields[12].GetUInt16();
creatureAddon.visibilityDistanceType = VisibilityDistanceType(fields[13].GetUInt8());
Tokenizer tokens(fields[11].GetString(), ' ');
Tokenizer tokens(fields[14].GetString(), ' ');
uint8 i = 0;
creatureAddon.auras.resize(tokens.size());
for (Tokenizer::const_iterator itr = tokens.begin(); itr != tokens.end(); ++itr)
@@ -632,6 +635,26 @@ void ObjectMgr::LoadCreatureTemplateAddons()
}
}
if (creatureAddon.standState >= MAX_UNIT_STAND_STATE)
{
TC_LOG_ERROR("sql.sql", "Creature (Entry: %u) has invalid unit stand state (%u) defined in `creature_template_addon`. Truncated to 0.", entry, creatureAddon.standState);
creatureAddon.standState = 0;
}
if (AnimationTier(creatureAddon.animTier) >= AnimationTier::Max)
{
TC_LOG_ERROR("sql.sql", "Creature (Entry: %u) has invalid animation tier (%u) defined in `creature_template_addon`. Truncated to 0.", entry, creatureAddon.animTier);
creatureAddon.animTier = 0;
}
if (creatureAddon.sheathState >= MAX_SHEATH_STATE)
{
TC_LOG_ERROR("sql.sql", "Creature (Entry: %u) has invalid sheath state (%u) defined in `creature_template_addon`. Truncated to 0.", entry, creatureAddon.sheathState);
creatureAddon.sheathState = 0;
}
// PvPFlags don't need any checking for the time being since they cover the entire range of a byte
if (!sEmotesStore.LookupEntry(creatureAddon.emote))
{
TC_LOG_ERROR("sql.sql", "Creature (Entry: %u) has invalid emote (%u) defined in `creature_template_addon`.", entry, creatureAddon.emote);
@@ -1148,8 +1171,8 @@ void ObjectMgr::LoadCreatureAddons()
{
uint32 oldMSTime = getMSTime();
// 0 1 2 3 4 5 6 7 8 9 10 11
QueryResult result = WorldDatabase.Query("SELECT guid, waypointPathId, cyclicSplinePathId, mount, bytes1, bytes2, emote, aiAnimKit, movementAnimKit, meleeAnimKit, visibilityDistanceType, auras FROM creature_addon");
// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14
QueryResult result = WorldDatabase.Query("SELECT guid, waypointPathId, cyclicSplinePathId, mount, StandState, AnimTier, VisFlags, SheathState, PvPFlags, emote, aiAnimKit, movementAnimKit, meleeAnimKit, visibilityDistanceType, auras FROM creature_addon");
if (!result)
{
@@ -1203,15 +1226,18 @@ void ObjectMgr::LoadCreatureAddons()
}
creatureAddon.mount = fields[3].GetUInt32();
creatureAddon.bytes1 = fields[4].GetUInt32();
creatureAddon.bytes2 = fields[5].GetUInt32();
creatureAddon.emote = fields[6].GetUInt32();
creatureAddon.aiAnimKit = fields[7].GetUInt16();
creatureAddon.movementAnimKit = fields[8].GetUInt16();
creatureAddon.meleeAnimKit = fields[9].GetUInt16();
creatureAddon.visibilityDistanceType = VisibilityDistanceType(fields[10].GetUInt8());
creatureAddon.standState = fields[4].GetUInt8();
creatureAddon.animTier = fields[5].GetUInt8();
creatureAddon.visFlags = fields[6].GetUInt8();
creatureAddon.sheathState = fields[7].GetUInt8();
creatureAddon.pvpFlags = fields[8].GetUInt8();
creatureAddon.emote = fields[9].GetUInt32();
creatureAddon.aiAnimKit = fields[10].GetUInt16();
creatureAddon.movementAnimKit = fields[11].GetUInt16();
creatureAddon.meleeAnimKit = fields[12].GetUInt16();
creatureAddon.visibilityDistanceType = VisibilityDistanceType(fields[13].GetUInt8());
Tokenizer tokens(fields[11].GetString(), ' ');
Tokenizer tokens(fields[14].GetString(), ' ');
uint8 i = 0;
creatureAddon.auras.resize(tokens.size());
for (Tokenizer::const_iterator itr = tokens.begin(); itr != tokens.end(); ++itr)
@@ -1244,6 +1270,26 @@ void ObjectMgr::LoadCreatureAddons()
}
}
if (creatureAddon.standState >= MAX_UNIT_STAND_STATE)
{
TC_LOG_ERROR("sql.sql", "Creature (GUID: %u) has invalid unit stand state (%u) defined in `creature_addon`. Truncated to 0.", guid, creatureAddon.standState);
creatureAddon.standState = 0;
}
if (AnimationTier(creatureAddon.animTier) >= AnimationTier::Max)
{
TC_LOG_ERROR("sql.sql", "Creature (GUID: %u) has invalid animation tier (%u) defined in `creature_addon`. Truncated to 0.", guid, creatureAddon.animTier);
creatureAddon.animTier = 0;
}
if (creatureAddon.sheathState >= MAX_SHEATH_STATE)
{
TC_LOG_ERROR("sql.sql", "Creature (GUID: %u) has invalid sheath state (%u) defined in `creature_addon`. Truncated to 0.", guid, creatureAddon.sheathState);
creatureAddon.sheathState = 0;
}
// PvPFlags don't need any checking for the time being since they cover the entire range of a byte
if (!sEmotesStore.LookupEntry(creatureAddon.emote))
{
TC_LOG_ERROR("sql.sql", "Creature (GUID: %u) has invalid emote (%u) defined in `creature_addon`.", guid, creatureAddon.emote);