warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Removed StunRequest and DisarmRequest EventSinks (#1781)

Browse source
This commit is contained in:
Marcelo Paez Sequeira 2024-05-19 18:12:58 -03:00 • committed by GitHub
parent f2a33706ab
commit 1cb798d807
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 8 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Projects/Server/Events/EventSink.cs
View file

@ -36,12 +36,6 @@ public static partial class EventSink
public static event Action<Mobile> HelpRequest; public static event Action<Mobile> HelpRequest;
public static void InvokeHelpRequest(Mobile m) => HelpRequest?.Invoke(m); public static void InvokeHelpRequest(Mobile m) => HelpRequest?.Invoke(m);
public static event Action<Mobile> DisarmRequest;
public static void InvokeDisarmRequest(Mobile m) => DisarmRequest?.Invoke(m);
public static event Action<Mobile> StunRequest;
public static void InvokeStunRequest(Mobile m) => StunRequest?.Invoke(m);
public static event Action<Mobile, int> OpenSpellbookRequest; public static event Action<Mobile, int> OpenSpellbookRequest;
public static void InvokeOpenSpellbookRequest(Mobile m, int type) => OpenSpellbookRequest?.Invoke(m, type); public static void InvokeOpenSpellbookRequest(Mobile m, int type) => OpenSpellbookRequest?.Invoke(m, type);

7
Projects/UOContent/Items/Weapons/Fists.cs
View file

@ -38,9 +38,6 @@ namespace Server.Items
public static void Initialize() public static void Initialize()
{ {
Mobile.DefaultWeapon = new Fists(); Mobile.DefaultWeapon = new Fists();
EventSink.DisarmRequest += EventSink_DisarmRequest;
EventSink.StunRequest += EventSink_StunRequest;
} }
public override double GetDefendSkillValue(Mobile attacker, Mobile defender) public override double GetDefendSkillValue(Mobile attacker, Mobile defender)
@ -195,7 +192,7 @@ namespace Server.Items
return item is null or Spellbook && m.FindItemOnLayer(Layer.TwoHanded) == null; return item is null or Spellbook && m.FindItemOnLayer(Layer.TwoHanded) == null;
} }
private static void EventSink_DisarmRequest(Mobile m) public static void DisarmRequest(Mobile m)
{ {
if (Core.AOS) if (Core.AOS)
{ {
@ -228,7 +225,7 @@ namespace Server.Items
} }
} }
private static void EventSink_StunRequest(Mobile m) public static void StunRequest(Mobile m)
{ {
if (Core.AOS || !DuelContext.AllowSpecialAbility(m, "Stun", true)) if (Core.AOS || !DuelContext.AllowSpecialAbility(m, "Stun", true))
{ {

3
Projects/UOContent/Mobiles/AI/MageAI.cs
View file

@ -1,4 +1,5 @@
using System; using System;
using Server.Items;
using Server.Spells; using Server.Spells;
using Server.Spells.Fifth; using Server.Spells.Fifth;
using Server.Spells.First; using Server.Spells.First;
@ -720,7 +721,7 @@ public class MageAI : BaseAI
if (!Core.AOS && SmartAI && !m_Mobile.StunReady && m_Mobile.Skills.Wrestling.Value >= 80.0 && if (!Core.AOS && SmartAI && !m_Mobile.StunReady && m_Mobile.Skills.Wrestling.Value >= 80.0 &&
m_Mobile.Skills.Anatomy.Value >= 80.0) m_Mobile.Skills.Anatomy.Value >= 80.0)
{ {
EventSink.InvokeStunRequest(m_Mobile); Fists.StunRequest(m_Mobile);
} }
if (!m_Mobile.InRange(c, m_Mobile.RangePerception)) if (!m_Mobile.InRange(c, m_Mobile.RangePerception))

2
Projects/UOContent/Mobiles/AI/ThiefAI.cs
View file

@ -69,7 +69,7 @@ public class ThiefAI : BaseAI
if (!Core.AOS && !m_Mobile.DisarmReady && m_Mobile.Skills.Wrestling.Value >= 80.0 && if (!Core.AOS && !m_Mobile.DisarmReady && m_Mobile.Skills.Wrestling.Value >= 80.0 &&
m_Mobile.Skills.ArmsLore.Value >= 80.0 && m_toDisarm != null) m_Mobile.Skills.ArmsLore.Value >= 80.0 && m_toDisarm != null)
{ {
EventSink.InvokeDisarmRequest(m_Mobile); Fists.DisarmRequest(m_Mobile);
} }
if (m_toDisarm?.IsChildOf(combatant.Backpack) == true && if (m_toDisarm?.IsChildOf(combatant.Backpack) == true &&

5
Projects/UOContent/Network/Packets/IncomingExtendedCommandPackets.cs
View file

@ -15,6 +15,7 @@
using System.Buffers; using System.Buffers;
using Server.ContextMenus; using Server.ContextMenus;
using Server.Items;
namespace Server.Network; namespace Server.Network;
@ -267,7 +268,7 @@ public static class IncomingExtendedCommandPackets
return; return;
} }
EventSink.InvokeStunRequest(from); Fists.StunRequest(from);
} }
public static void DisarmRequest(NetState state, SpanReader reader) public static void DisarmRequest(NetState state, SpanReader reader)
@ -279,7 +280,7 @@ public static class IncomingExtendedCommandPackets
return; return;
} }
EventSink.InvokeDisarmRequest(from); Fists.DisarmRequest(from);
} }
public static void StatLockChange(NetState state, SpanReader reader) public static void StatLockChange(NetState state, SpanReader reader)