diff --git a/Source/Game/Entities/Player/Player.cs b/Source/Game/Entities/Player/Player.cs index 444263b07..cd2c39400 100644 --- a/Source/Game/Entities/Player/Player.cs +++ b/Source/Game/Entities/Player/Player.cs @@ -1605,7 +1605,7 @@ namespace Game.Entities if (rep == 0) continue; - if (quest.RewardFactionCapIn[i] != 0 && rep > 0 && (uint)GetReputationMgr().GetRank(factionEntry) >= quest.RewardFactionCapIn[i]) + if (quest.RewardFactionCapIn[i] != 0 && rep > 0 && (int)GetReputationMgr().GetRank(factionEntry) >= quest.RewardFactionCapIn[i]) continue; if (quest.IsDaily()) diff --git a/Source/Game/Quest/Quest.cs b/Source/Game/Quest/Quest.cs index ce0e052b9..63392ce87 100644 --- a/Source/Game/Quest/Quest.cs +++ b/Source/Game/Quest/Quest.cs @@ -95,7 +95,7 @@ namespace Game RewardFactionId[i] = fields.Read(69 + i * 4); RewardFactionValue[i] = fields.Read(70 + i * 4); RewardFactionOverride[i] = fields.Read(71 + i * 4); - RewardFactionCapIn[i] = fields.Read(72 + i * 4); + RewardFactionCapIn[i] = fields.Read(72 + i * 4); } RewardReputationMask = fields.Read(89); @@ -374,7 +374,7 @@ namespace Game rewards.FactionID[i] = RewardFactionId[i]; rewards.FactionOverride[i] = RewardFactionOverride[i]; rewards.FactionValue[i] = RewardFactionValue[i]; - rewards.FactionCapIn[i] = (int)RewardFactionCapIn[i]; + rewards.FactionCapIn[i] = RewardFactionCapIn[i]; } for (int i = 0; i < SharedConst.QuestRewardCurrencyCount; ++i) @@ -529,7 +529,7 @@ namespace Game QueryData.Info.RewardFactionID[i] = RewardFactionId[i]; QueryData.Info.RewardFactionValue[i] = RewardFactionValue[i]; QueryData.Info.RewardFactionOverride[i] = RewardFactionOverride[i]; - QueryData.Info.RewardFactionCapIn[i] = (int)RewardFactionCapIn[i]; + QueryData.Info.RewardFactionCapIn[i] = RewardFactionCapIn[i]; } QueryData.Info.POIContinent = POIContinent; @@ -634,7 +634,7 @@ namespace Game public uint[] RewardFactionId = new uint[SharedConst.QuestRewardReputationsCount]; public int[] RewardFactionValue = new int[SharedConst.QuestRewardReputationsCount]; public int[] RewardFactionOverride = new int[SharedConst.QuestRewardReputationsCount]; - public uint[] RewardFactionCapIn = new uint[SharedConst.QuestRewardReputationsCount]; + public int[] RewardFactionCapIn = new int[SharedConst.QuestRewardReputationsCount]; public uint RewardReputationMask; public uint[] RewardCurrencyId = new uint[SharedConst.QuestRewardCurrencyCount]; public uint[] RewardCurrencyCount = new uint[SharedConst.QuestRewardCurrencyCount]; diff --git a/sql/updates/world/master/2020_12_16_00_world.sql b/sql/updates/world/master/2020_12_16_00_world.sql new file mode 100644 index 000000000..2203a9375 --- /dev/null +++ b/sql/updates/world/master/2020_12_16_00_world.sql @@ -0,0 +1,6 @@ +ALTER TABLE `quest_template` +CHANGE COLUMN `RewardFactionCapIn1` `RewardFactionCapIn1` INT(10) NOT NULL DEFAULT '0' AFTER `RewardFactionOverride1`, +CHANGE COLUMN `RewardFactionCapIn2` `RewardFactionCapIn2` INT(10) NOT NULL DEFAULT '0' AFTER `RewardFactionOverride2`, +CHANGE COLUMN `RewardFactionCapIn3` `RewardFactionCapIn3` INT(10) NOT NULL DEFAULT '0' AFTER `RewardFactionOverride3`, +CHANGE COLUMN `RewardFactionCapIn4` `RewardFactionCapIn4` INT(10) NOT NULL DEFAULT '0' AFTER `RewardFactionOverride4`, +CHANGE COLUMN `RewardFactionCapIn5` `RewardFactionCapIn5` INT(10) NOT NULL DEFAULT '0' AFTER `RewardFactionOverride5`;