diff options
4 files changed, 6 insertions, 5 deletions
diff --git a/sql/updates/hotfixes/master/2021_11_03_00_hotfixes.sql b/sql/updates/hotfixes/master/2021_11_03_00_hotfixes.sql new file mode 100644 index 00000000000..97d3c12fe03 --- /dev/null +++ b/sql/updates/hotfixes/master/2021_11_03_00_hotfixes.sql @@ -0,0 +1 @@ +ALTER TABLE `animation_data` CHANGE COLUMN `BehaviorID` `Fallback` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `ID`, CHANGE COLUMN `Fallback` `BehaviorID` INT(11) NOT NULL DEFAULT '0' AFTER `BehaviorTier`; diff --git a/src/server/database/Database/Implementation/HotfixDatabase.cpp b/src/server/database/Database/Implementation/HotfixDatabase.cpp index 4c3570616ed..62f83dbc5ad 100644 --- a/src/server/database/Database/Implementation/HotfixDatabase.cpp +++ b/src/server/database/Database/Implementation/HotfixDatabase.cpp @@ -66,7 +66,7 @@ void HotfixDatabaseConnection::DoPrepareStatements() " WHERE (`VerifiedBuild` > 0) = ? AND locale = ?", CONNECTION_SYNCH); // AnimationData.db2 - PrepareStatement(HOTFIX_SEL_ANIMATION_DATA, "SELECT ID, BehaviorID, BehaviorTier, Fallback, Flags1, Flags2 FROM animation_data" + PrepareStatement(HOTFIX_SEL_ANIMATION_DATA, "SELECT ID, Fallback, BehaviorTier, BehaviorID, Flags1, Flags2 FROM animation_data" " WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH); PREPARE_MAX_ID_STMT(HOTFIX_SEL_ANIMATION_DATA, "SELECT MAX(ID) + 1 FROM animation_data", CONNECTION_SYNCH); diff --git a/src/server/game/DataStores/DB2LoadInfo.h b/src/server/game/DataStores/DB2LoadInfo.h index 9a631bcc552..8efaf33a3c6 100644 --- a/src/server/game/DataStores/DB2LoadInfo.h +++ b/src/server/game/DataStores/DB2LoadInfo.h @@ -139,9 +139,9 @@ struct AnimationDataLoadInfo static DB2FieldMeta const fields[] = { { false, FT_INT, "ID" }, - { false, FT_SHORT, "BehaviorID" }, + { false, FT_SHORT, "Fallback" }, { false, FT_BYTE, "BehaviorTier" }, - { true, FT_INT, "Fallback" }, + { true, FT_INT, "BehaviorID" }, { true, FT_INT, "Flags1" }, { true, FT_INT, "Flags2" }, }; diff --git a/src/server/game/DataStores/DB2Structure.h b/src/server/game/DataStores/DB2Structure.h index 7245c5e1da9..30629f3147a 100644 --- a/src/server/game/DataStores/DB2Structure.h +++ b/src/server/game/DataStores/DB2Structure.h @@ -101,9 +101,9 @@ struct AdventureMapPOIEntry struct AnimationDataEntry { uint32 ID; - uint16 BehaviorID; + uint16 Fallback; uint8 BehaviorTier; - int32 Fallback; + int32 BehaviorID; int32 Flags[2]; }; |