suppress enchantment projectile hit messages from cloak procs (#3873)

ACEmulator · Jul 13, 2022 · 3d5ff41 · 3d5ff41
1 parent ce782ce
commit 3d5ff41
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/Source/ACE.Server/WorldObjects/SpellProjectile.cs b/Source/ACE.Server/WorldObjects/SpellProjectile.cs
@@ -313,7 +313,7 @@ public override void OnCollideObject(WorldObject target)
                 if (Spell.MetaSpellType == ACE.Entity.Enum.SpellType.EnchantmentProjectile)
                 {
                     // handle EnchantmentProjectile successfully landing on target
-                    ProjectileSource.CreateEnchantment(creatureTarget, ProjectileSource, ProjectileLauncher, Spell);
+                    ProjectileSource.CreateEnchantment(creatureTarget, ProjectileSource, ProjectileLauncher, Spell, false, FromProc);
                 }
                 else
                 {

diff --git a/Source/ACE.Server/WorldObjects/WorldObject_Magic.cs b/Source/ACE.Server/WorldObjects/WorldObject_Magic.cs
@@ -370,7 +370,7 @@ protected void DoSpellEffects(Spell spell, WorldObject caster, WorldObject targe
         /// Handles casting SpellType.Enchantment / FellowEnchantment spells
         /// this is also called if SpellType.EnchantmentProjectile successfully hits
         /// </summary>
-        public void CreateEnchantment(WorldObject target, WorldObject caster, WorldObject weapon, Spell spell, bool equip = false)
+        public void CreateEnchantment(WorldObject target, WorldObject caster, WorldObject weapon, Spell spell, bool equip = false, bool fromProc = false)
         {
             // weird itemCaster -> caster collapsing going on here -- fixme
 
@@ -393,6 +393,14 @@ public void CreateEnchantment(WorldObject target, WorldObject caster, WorldObjec
                     cloakProc = true;
                 }
             }
+            else if (fromProc)
+            {
+                // fromProc is assumed to be cloakProc currently
+                // todo: change fromProc from bool to WorldObject
+                // do we need separate concepts for itemCaster and fromProc objects?
+                caster = this;
+                cloakProc = true;
+            }
 
             // create enchantment
             var addResult = target.EnchantmentManager.Add(spell, caster, weapon, equip);