Skip to content

Commit

Permalink
Repair dispatch event null error
Browse files Browse the repository at this point in the history
  • Loading branch information
@ls9512
ls9512 committed Jul 17, 2023
1 parent bc3e0bd commit cb6da2c
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions CSharp/Script/EventDispatcher.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ public List<EventHandler> GetListeners<T>(object target)
for (var i = 0; i < eventHandlers.Count; i++)
{
var eventHandler = eventHandlers[i];
if (eventHandler.Target == target)
if (target.Equals(eventHandler.Target))
{
result.Add(eventHandler);
}
Expand Down Expand Up @@ -327,7 +327,7 @@ public List<EventHandler> GetListeners<T>(T eventType, object target)
for (var i = 0; i < eventHandlers.Count; i++)
{
var eventHandler = eventHandlers[i];
if (eventHandler.Target == target)
if (target.Equals(eventHandler.Target))
{
result.Add(eventHandler);
}
Expand All @@ -353,7 +353,7 @@ public void RemoveListener<T>(Action action)
for (var i = eventHandlers.Count - 1; i >= 0; i--)
{
var eventHandler = eventHandlers[i];
if (eventHandler.Action.Equals(action))
if (action.Equals(eventHandler.Action))
{
eventHandlerGroup.Remove(eventHandler);
}
Expand All @@ -373,7 +373,7 @@ public void RemoveListener<T>(Action<T> action)
for (var i = eventHandlers.Count - 1; i >= 0; i--)
{
if (!(eventHandlers[i] is EventHandler<T> eventHandler)) continue;
if (eventHandler.ActionT.Equals(action))
if (action.Equals(eventHandler.ActionT))
{
eventHandlerGroup.Remove(eventHandler);
}
Expand All @@ -393,7 +393,7 @@ public void RemoveListener<T>(Action<T, object[]> action)
for (var i = eventHandlers.Count - 1; i >= 0; i--)
{
if (!(eventHandlers[i] is EventHandler<T> eventHandler)) continue;
if (eventHandler.ActionTArgs.Equals(action))
if (action.Equals(eventHandler.ActionTArgs))
{
eventHandlerGroup.Remove(eventHandler);
}
Expand All @@ -413,7 +413,7 @@ public void RemoveListener<T>(Action<object[]> action)
for (var i = eventHandlers.Count - 1; i >= 0; i--)
{
if (!(eventHandlers[i] is EventHandler<T> eventHandler)) continue;
if (eventHandler.ActionArgs.Equals(action))
if (action.Equals(eventHandler.ActionArgs))
{
eventHandlerGroup.Remove(eventHandler);
}
Expand All @@ -433,7 +433,7 @@ public void RemoveListener<T>(object target, MethodInfo method)
for (var i = eventHandlers.Count - 1; i >= 0; i--)
{
var eventHandler = eventHandlers[i];
if (eventHandler.Target == null || (eventHandler.Target.Equals(target) && eventHandler.Method.Equals(method)))
if (target.Equals(eventHandler.Target) && method.Equals(eventHandler.Method))
{
eventHandlerGroup.Remove(eventHandler);
}
Expand All @@ -457,7 +457,7 @@ public void RemoveListener<T>(T eventType, Action action)
for (var i = eventHandlers.Count - 1; i >= 0; i--)
{
var eventHandler = eventHandlers[i];
if (eventHandler.Action.Equals(action))
if (action.Equals(eventHandler.Action))
{
eventHandlerGroup.Remove(eventHandler);
}
Expand All @@ -477,7 +477,7 @@ public void RemoveListener<T>(T eventType, Action<T> action)
for (var i = eventHandlers.Count - 1; i >= 0; i--)
{
if (!(eventHandlers[i] is EventHandler<T> eventHandler)) continue;
if (eventHandler.ActionT.Equals(action))
if (action.Equals(eventHandler.ActionT))
{
eventHandlerGroup.Remove(eventHandler);
}
Expand All @@ -497,7 +497,7 @@ public void RemoveListener<T>(T eventType, Action<T, object[]> action)
for (var i = eventHandlers.Count - 1; i >= 0; i--)
{
if (!(eventHandlers[i] is EventHandler<T> eventHandler)) continue;
if (eventHandler.ActionTArgs.Equals(action))
if (action.Equals(eventHandler.ActionTArgs))
{
eventHandlerGroup.Remove(eventHandler);
}
Expand All @@ -517,7 +517,7 @@ public void RemoveListener<T>(T eventType, Action<object[]> action)
for (var i = eventHandlers.Count - 1; i >= 0; i--)
{
if (!(eventHandlers[i] is EventHandler<T> eventHandler)) continue;
if (eventHandler.ActionArgs.Equals(action))
if (action.Equals(eventHandler.ActionArgs))
{
eventHandlerGroup.Remove(eventHandler);
}
Expand All @@ -537,7 +537,7 @@ public void RemoveListener<T>(T eventType, object target, MethodInfo method)
for (var i = eventHandlers.Count - 1; i >= 0; i--)
{
var eventHandler = eventHandlers[i];
if (eventHandler.Target == null || (eventHandler.Target.Equals(target) && eventHandler.Method.Equals(method)))
if (target.Equals(eventHandler.Target) && method.Equals(eventHandler.Method))
{
eventHandlerGroup.Remove(eventHandler);
}
Expand Down Expand Up @@ -616,7 +616,7 @@ public void DispatchTo<T>(T eventType, object target, params object[] args)
{
var eventHandler = eventHandlers[i];
var condition1 = eventHandler.Target == null && target == null;
var condition2 = eventHandler.Target != null && eventHandler.Target.Equals(target);
var condition2 = target != null && target.Equals(eventHandler.Target);
var check = condition1 || condition2;
if (!check) continue;
eventHandler.Invoke(eventType, args);
Expand Down Expand Up @@ -663,7 +663,7 @@ public void DispatchGroup<T>(T eventType, object group, params object[] args)
{
var eventHandler = eventHandlers[i];
var condition1 = eventHandler.Group == null && group == null;
var condition2 = eventHandler.Group != null && eventHandler.Group.Equals(group);
var condition2 = group != null && group.Equals(eventHandler.Group);
var check = condition1 || condition2;
if (!check) continue;
eventHandler.Invoke(eventType, args);
Expand Down

0 comments on commit cb6da2c

Please sign in to comment.