Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 09:17:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/AdventureJournal: Fix broken hotfix database structure from 3addbe7dd4

Browse Source
This commit is contained in:
Shauren
2021-03-14 01:05:32 +01:00
parent 3addbe7dd4
commit c15cf8b424
4 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
sql/updates/hotfixes/master/2021_03_14_00_hotfixes.sql
View File

@@ -6,32 +6,32 @@ DROP TABLE IF EXISTS `adventure_journal`;
/*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `adventure_journal` (
`ID` int(10) unsigned NOT NULL DEFAULT '0',
`Name` text DEFAULT NULL,
`Description` text DEFAULT NULL,
`ButtonText` text DEFAULT NULL,
`RewardDescription` text DEFAULT NULL,
`ContinueDescription` text DEFAULT NULL,
`Name` text,
`Description` text,
`ButtonText` text,
`RewardDescription` text,
`ContinueDescription` text,
`Type` tinyint(3) unsigned NOT NULL DEFAULT '0',
`PlayerConditionId` int(10) unsigned NOT NULL DEFAULT '0',
`PlayerConditionID` int(10) unsigned NOT NULL DEFAULT '0',
`Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
`ButtonActionType` tinyint(3) unsigned NOT NULL DEFAULT '0',
`TextureFileDataId` int(11) NOT NULL DEFAULT '0',
`LfgDungeonId` smallint(5) unsigned NOT NULL DEFAULT '0',
`QuestId` smallint(5) unsigned NOT NULL DEFAULT '0',
`BattleMasterListId` smallint(5) unsigned NOT NULL DEFAULT '0',
`TextureFileDataID` int(11) NOT NULL DEFAULT '0',
`LfgDungeonID` smallint(5) unsigned NOT NULL DEFAULT '0',
`QuestID` int(11) NOT NULL DEFAULT '0',
`BattleMasterListID` smallint(5) unsigned NOT NULL DEFAULT '0',
`PriorityMin` tinyint(3) unsigned NOT NULL DEFAULT '0',
`PriorityMax` tinyint(3) unsigned NOT NULL DEFAULT '0',
`ItemId` int(11) NOT NULL DEFAULT '0',
`ItemID` int(11) NOT NULL DEFAULT '0',
`ItemQuantity` int(10) unsigned NOT NULL DEFAULT '0',
`CurrencyType` smallint(5) unsigned NOT NULL DEFAULT '0',
`CurrencyQuantity` tinyint(3) unsigned NOT NULL DEFAULT '0',
`UiMapId` smallint(5) unsigned NOT NULL DEFAULT '0',
`BonusPlayerConditionId1` int(11) NOT NULL DEFAULT '0',
`BonusPlayerConditionId2` int(11) NOT NULL DEFAULT '0',
`CurrencyQuantity` int(10) unsigned NOT NULL DEFAULT '0',
`UiMapID` smallint(5) unsigned NOT NULL DEFAULT '0',
`BonusPlayerConditionID1` int(10) unsigned NOT NULL DEFAULT '0',
`BonusPlayerConditionID2` int(10) unsigned NOT NULL DEFAULT '0',
`BonusValue1` tinyint(3) unsigned NOT NULL DEFAULT '0',
`BonusValue2` tinyint(3) unsigned NOT NULL DEFAULT '0',
`VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
PRIMARY KEY (`ID`)
`VerifiedBuild` int(11) NOT NULL DEFAULT '0',
PRIMARY KEY (`ID`,`VerifiedBuild`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -44,13 +44,13 @@ DROP TABLE IF EXISTS `adventure_journal_locale`;
CREATE TABLE `adventure_journal_locale` (
`ID` int(10) unsigned NOT NULL DEFAULT '0',
`locale` varchar(4) NOT NULL,
`Name_lang` text DEFAULT NULL,
`Description_lang` text DEFAULT NULL,
`ButtonText_lang` text DEFAULT NULL,
`RewardDescription_lang` text DEFAULT NULL,
`ContinueDescription_lang` text DEFAULT NULL,
`VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
PRIMARY KEY (`ID`,`locale`)
`Name_lang` text,
`Description_lang` text,
`ButtonText_lang` text,
`RewardDescription_lang` text,
`ContinueDescription_lang` text,
`VerifiedBuild` int(11) NOT NULL DEFAULT '0',
PRIMARY KEY (`ID`,`locale`,`VerifiedBuild`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
/*!50500 PARTITION BY LIST COLUMNS(locale)
(PARTITION deDE VALUES IN ('deDE') ENGINE = InnoDB,

4
src/server/database/Database/Implementation/HotfixDatabase.cpp
View File

@@ -45,8 +45,8 @@ void HotfixDatabaseConnection::DoPrepareStatements()
// AdventureJournal.db2
PrepareStatement(HOTFIX_SEL_ADVENTURE_JOURNAL, "SELECT ID, Name, Description, ButtonText, RewardDescription, ContinueDescription, Type, "
"PlayerConditionId, Flags, ButtonActionType, TextureFileDataId, LfgDungeonId, QuestId, BattleMasterListId, PriorityMin, PriorityMax, ItemId, "
"ItemQuantity, CurrencyType, CurrencyQuantity, UiMapId, BonusPlayerConditionId1, BonusPlayerConditionId2, BonusValue1, BonusValue2"
"PlayerConditionID, Flags, ButtonActionType, TextureFileDataID, LfgDungeonID, QuestID, BattleMasterListID, PriorityMin, PriorityMax, ItemID, "
"ItemQuantity, CurrencyType, CurrencyQuantity, UiMapID, BonusPlayerConditionID1, BonusPlayerConditionID2, BonusValue1, BonusValue2"
" FROM adventure_journal WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
PREPARE_MAX_ID_STMT(HOTFIX_SEL_ADVENTURE_JOURNAL, "SELECT MAX(ID) + 1 FROM adventure_journal", CONNECTION_SYNCH);
PREPARE_LOCALE_STMT(HOTFIX_SEL_ADVENTURE_JOURNAL, "SELECT ID, Name_lang, Description_lang, ButtonText_lang, RewardDescription_lang, "

18
src/server/game/DataStores/DB2LoadInfo.h
View File

@@ -66,22 +66,22 @@ struct AdventureJournalLoadInfo
{ false, FT_STRING, "RewardDescription" },
{ false, FT_STRING, "ContinueDescription" },
{ false, FT_BYTE, "Type" },
{ false, FT_INT, "PlayerConditionId" },
{ false, FT_INT, "PlayerConditionID" },
{ false, FT_BYTE, "Flags" },
{ false, FT_BYTE, "ButtonActionType" },
{ true, FT_INT, "TextureFileDataId" },
{ false, FT_SHORT, "LfgDungeonId" },
{ true, FT_INT, "QuestId" },
{ false, FT_SHORT, "BattleMasterListId" },
{ true, FT_INT, "TextureFileDataID" },
{ false, FT_SHORT, "LfgDungeonID" },
{ true, FT_INT, "QuestID" },
{ false, FT_SHORT, "BattleMasterListID" },
{ false, FT_BYTE, "PriorityMin" },
{ false, FT_BYTE, "PriorityMax" },
{ true, FT_INT, "ItemId" },
{ true, FT_INT, "ItemID" },
{ false, FT_INT, "ItemQuantity" },
{ false, FT_SHORT, "CurrencyType" },
{ false, FT_INT, "CurrencyQuantity" },
{ false, FT_SHORT, "UiMapId" },
{ false, FT_INT, "BonusPlayerConditionId1" },
{ false, FT_INT, "BonusPlayerConditionId2" },
{ false, FT_SHORT, "UiMapID" },
{ false, FT_INT, "BonusPlayerConditionID1" },
{ false, FT_INT, "BonusPlayerConditionID2" },
{ false, FT_BYTE, "BonusValue1" },
{ false, FT_BYTE, "BonusValue2" },
};

2
src/server/game/DataStores/DB2Structure.h
View File

@@ -69,7 +69,7 @@ struct AdventureJournalEntry
uint16 CurrencyType;
uint32 CurrencyQuantity;
uint16 UiMapID;
int32 BonusPlayerConditionID[2];
uint32 BonusPlayerConditionID[2];
uint8 BonusValue[2];
};