From 32375df62ed4d3abb5a699235d37a8e0208c8656 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Thu, 6 Jan 2022 00:19:12 -0500 Subject: [PATCH] Misc fixes --- .../Constants/Movement/MovementConst.cs | 3 +- .../Constants/Spells/SpellAuraConst.cs | 2 +- Source/Game/Entities/Creature/CreatureData.cs | 2 +- Source/Game/Entities/Totem.cs | 2 +- Source/Scripts/Spells/Quest.cs | 31 ++++++++++++++++--- Source/WorldServer/WorldServer.conf.dist | 6 ++-- 6 files changed, 34 insertions(+), 12 deletions(-) diff --git a/Source/Framework/Constants/Movement/MovementConst.cs b/Source/Framework/Constants/Movement/MovementConst.cs index b30909a93..cb954dbe0 100644 --- a/Source/Framework/Constants/Movement/MovementConst.cs +++ b/Source/Framework/Constants/Movement/MovementConst.cs @@ -68,8 +68,9 @@ namespace Framework.Constants Update = 0x1, // Update in progress StaticInitializationPending = 0x2, // Static movement (MOTION_SLOT_DEFAULT) hasn't been initialized InitializationPending = 0x4, // MotionMaster is stalled until signaled + Initializing = 0x8, // MotionMaster is initializing - Delayed = StaticInitializationPending | InitializationPending + Delayed = Update | InitializationPending } public enum MotionMasterDelayedActionType diff --git a/Source/Framework/Constants/Spells/SpellAuraConst.cs b/Source/Framework/Constants/Spells/SpellAuraConst.cs index 9debf6806..1012c0084 100644 --- a/Source/Framework/Constants/Spells/SpellAuraConst.cs +++ b/Source/Framework/Constants/Spells/SpellAuraConst.cs @@ -69,7 +69,7 @@ namespace Framework.Constants TrackResources = 45, Unk46 = 46, // Ignore All Gear Test Spells ModParryPercent = 47, - Unk48 = 48, // One Periodic Spell + PeriodicTriggerSpellFromClient = 48, // One Periodic Spell ModDodgePercent = 49, ModCriticalHealingAmount = 50, ModBlockPercent = 51, diff --git a/Source/Game/Entities/Creature/CreatureData.cs b/Source/Game/Entities/Creature/CreatureData.cs index 7977e41c4..60cd7c7dd 100644 --- a/Source/Game/Entities/Creature/CreatureData.cs +++ b/Source/Game/Entities/Creature/CreatureData.cs @@ -414,7 +414,7 @@ namespace Game.Entities public ushort aiAnimKit; public ushort movementAnimKit; public ushort meleeAnimKit; - public uint[] auras; + public List auras = new(); public VisibilityDistanceType visibilityDistanceType; } diff --git a/Source/Game/Entities/Totem.cs b/Source/Game/Entities/Totem.cs index a207c05c3..a667c10c9 100644 --- a/Source/Game/Entities/Totem.cs +++ b/Source/Game/Entities/Totem.cs @@ -71,7 +71,7 @@ namespace Game.Entities if (totemDisplayId != 0) SetDisplayId(totemDisplayId); else - Log.outError(LogFilter.Misc, $"Totem with entry {GetEntry()}, does not have a specialized model for spell {m_unitData.CreatedBySpell} and race {owner.GetRace()}. Set to default."); + Log.outDebug(LogFilter.Misc, $"Totem with entry {GetEntry()}, does not have a specialized model for spell {m_unitData.CreatedBySpell} and race {owner.GetRace()}. Set to default."); } base.InitStats(duration); diff --git a/Source/Scripts/Spells/Quest.cs b/Source/Scripts/Spells/Quest.cs index ba93f9eec..b7fb5c9b1 100644 --- a/Source/Scripts/Spells/Quest.cs +++ b/Source/Scripts/Spells/Quest.cs @@ -1739,8 +1739,29 @@ namespace Scripts.Spells.Quest } } - // 48682 - Escape from Silverbrook - Periodic Dummy [Script] + class spell_q11896_weakness_to_lightning_46444 : SpellScript + { + void HandleScript(uint effIndex) + { + Unit target = GetHitUnit(); + if (target != null) + { + Unit owner = target.GetOwner(); + if (owner != null) + { + target.CastSpell(owner, (uint)GetEffectValue(), true); + } + } + } + + public override void Register() + { + OnEffectHitTarget.Add(new EffectHandler(HandleScript, 0, SpellEffectName.ScriptEffect)); + } + } + + [Script] // 48682 - Escape from Silverbrook - Periodic Dummy class spell_q12308_escape_from_silverbrook : SpellScript { public override bool Validate(SpellInfo spellInfo) @@ -1759,8 +1780,8 @@ namespace Scripts.Spells.Quest } } - // 48681 - Summon Silverbrook Worgen - [Script] + + [Script] // 48681 - Summon Silverbrook Worgen class spell_q12308_escape_from_silverbrook_summon_worgen : SpellScript { void ModDest(ref SpellDestination dest) @@ -1778,8 +1799,8 @@ namespace Scripts.Spells.Quest } } - // 51858 - Siphon of Acherus - [Script] + + [Script] // 51858 - Siphon of Acherus class spell_q12641_death_comes_from_on_high : SpellScript { public override bool Validate(SpellInfo spellInfo) diff --git a/Source/WorldServer/WorldServer.conf.dist b/Source/WorldServer/WorldServer.conf.dist index dd0885cd5..8fec848e0 100644 --- a/Source/WorldServer/WorldServer.conf.dist +++ b/Source/WorldServer/WorldServer.conf.dist @@ -448,10 +448,10 @@ LogDB.Opt.ClearTime = 1209600 # # MaxCoreStuckTime (NYI) # Description: Time (in seconds) before the server is forced to crash if it is frozen. -# Default: 0 - (Disabled) -# 10+ - (Enabled, Recommended 10+) +# Default: 60 - (Enabled, Recommended 10+) +# 0 - (Disabled) -MaxCoreStuckTime = 0 +MaxCoreStuckTime = 60 # # AddonChannel