Proxies

TemporalOroboros · TemporalOroboros · commit dfdef77bcecf · 2025-02-04T14:37:19.000-08:00
diff --git a/Robust.Client/UserInterface/Controllers/UiController.Subscriptions.cs b/Robust.Client/UserInterface/Controllers/UiController.Subscriptions.cs
@@ -9,21 +9,21 @@ public abstract partial class UIController : IEntityEventSubscriber
     protected void SubscribeLocalEvent<T>(
         EntityEventHandler<T> handler,
         Type[]? before = null, Type[]? after = null)
-        where T : notnull
+        where T : notnull, allows ref struct
     {
         EntityManager.EventBus.SubscribeEvent(EventSource.Local, this, handler, GetType(), before, after);
     }
 
     protected void SubscribeLocalEvent<T>(
         EntityEventRefHandler<T> handler,
         Type[]? before = null, Type[]? after = null)
-        where T : notnull
+        where T : notnull, allows ref struct
     {
         EntityManager.EventBus.SubscribeEvent(EventSource.Local, this, handler, GetType(), before, after);
     }
 
     protected void UnSubscribeLocalEvent<T>()
-        where T : notnull
+        where T : notnull, allows ref struct
     {
         EntityManager.EventBus.UnsubscribeEvent<T>(EventSource.Local, this);
     }
@@ -37,7 +37,7 @@ protected void SubscribeNetworkEvent<T>(
     }
 
     protected void UnSubscribeNetworkEvent<T>()
-        where T : notnull
+        where T : notnull, allows ref struct
     {
         EntityManager.EventBus.UnsubscribeEvent<T>(EventSource.Network, this);
     }
@@ -51,7 +51,7 @@ protected void SubscribeAllEvent<T>(
     }
 
     protected void UnSubscribeAllEvent<T>()
-        where T : notnull
+        where T : notnull, allows ref struct
     {
         EntityManager.EventBus.UnsubscribeEvent<T>(EventSource.All, this);
     }
diff --git a/Robust.Shared/GameObjects/EntitySystem.Subscriptions.cs b/Robust.Shared/GameObjects/EntitySystem.Subscriptions.cs
@@ -19,7 +19,7 @@ public abstract partial class EntitySystem
         protected void SubscribeNetworkEvent<T>(
             EntityEventHandler<T> handler,
             Type[]? before = null, Type[]? after = null)
-            where T : notnull
+            where T : notnull, allows ref struct
         {
             SubEvent(EventSource.Network, handler, before, after);
         }
@@ -29,23 +29,23 @@ protected void SubscribeNetworkEvent<T>(
         protected void SubscribeLocalEvent<T>(
             EntityEventHandler<T> handler,
             Type[]? before = null, Type[]? after = null)
-            where T : notnull
+            where T : notnull, allows ref struct
         {
             SubEvent(EventSource.Local, handler, before, after);
         }
 
         protected void SubscribeLocalEvent<T>(
             EntityEventRefHandler<T> handler,
             Type[]? before = null, Type[]? after = null)
-            where T : notnull
+            where T : notnull, allows ref struct
         {
             SubEvent(EventSource.Local, handler, before, after);
         }
 
         protected void SubscribeAllEvent<T>(
             EntityEventHandler<T> handler,
             Type[]? before = null, Type[]? after = null)
-            where T : notnull
+            where T : notnull, allows ref struct
         {
             SubEvent(EventSource.All, handler, before, after);
         }
@@ -80,7 +80,7 @@ private void SubEvent<T>(
             EventSource src,
             EntityEventHandler<T> handler,
             Type[]? before, Type[]? after)
-            where T : notnull
+            where T : notnull, allows ref struct
         {
             EntityManager.EventBus.SubscribeEvent(src, this, handler, GetType(), before, after);
 
@@ -91,7 +91,7 @@ private void SubEvent<T>(
             EventSource src,
             EntityEventRefHandler<T> handler,
             Type[]? before, Type[]? after)
-            where T : notnull
+            where T : notnull, allows ref struct
         {
             EntityManager.EventBus.SubscribeEvent(src, this, handler, GetType(), before, after);
 
@@ -243,7 +243,7 @@ private abstract class SubBase
             public abstract void Unsubscribe(EntitySystem sys, IEventBus bus);
         }
 
-        private sealed class SubBroadcast<T> : SubBase where T : notnull
+        private sealed class SubBroadcast<T> : SubBase where T : notnull, allows ref struct
         {
             private readonly EventSource _source;
 
diff --git a/Robust.Shared/GameObjects/EntitySystem.cs b/Robust.Shared/GameObjects/EntitySystem.cs
@@ -95,12 +95,12 @@ public virtual void Shutdown()
 
         #region Event Proxy
 
-        protected void RaiseLocalEvent<T>(T message) where T : notnull
+        protected void RaiseLocalEvent<T>(T message) where T : notnull, allows ref struct
         {
             EntityManager.EventBus.RaiseEvent(EventSource.Local, message);
         }
 
-        protected void RaiseLocalEvent<T>(ref T message) where T : notnull
+        protected void RaiseLocalEvent<T>(ref T message) where T : notnull, allows ref struct
         {
             EntityManager.EventBus.RaiseEvent(EventSource.Local, ref message);
         }
@@ -154,7 +154,7 @@ protected void RaiseNetworkEvent(EntityEventArgs message, EntityUid recipient)
         }
 
         protected void RaiseLocalEvent<TEvent>(EntityUid uid, TEvent args, bool broadcast = false)
-            where TEvent : notnull
+            where TEvent : notnull, allows ref struct
         {
             EntityManager.EventBus.RaiseLocalEvent(uid, args, broadcast);
         }
@@ -165,7 +165,7 @@ protected void RaiseLocalEvent(EntityUid uid, object args, bool broadcast = fals
         }
 
         protected void RaiseLocalEvent<TEvent>(EntityUid uid, ref TEvent args, bool broadcast = false)
-            where TEvent : notnull
+            where TEvent : notnull, allows ref struct
         {
             EntityManager.EventBus.RaiseLocalEvent(uid, ref args, broadcast);
         }

Original file line number	Diff line number	Diff line change
`@@ -9,21 +9,21 @@ public abstract partial class UIController : IEntityEventSubscriber`
`9`	`9`	`protected void SubscribeLocalEvent<T>(`
`10`	`10`	`EntityEventHandler<T> handler,`
`11`	`11`	`Type[]? before = null, Type[]? after = null)`
`12`		`- where T : notnull`
	`12`	`+ where T : notnull, allows ref struct`
`13`	`13`	`{`
`14`	`14`	`EntityManager.EventBus.SubscribeEvent(EventSource.Local, this, handler, GetType(), before, after);`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`protected void SubscribeLocalEvent<T>(`
`18`	`18`	`EntityEventRefHandler<T> handler,`
`19`	`19`	`Type[]? before = null, Type[]? after = null)`
`20`		`- where T : notnull`
	`20`	`+ where T : notnull, allows ref struct`
`21`	`21`	`{`
`22`	`22`	`EntityManager.EventBus.SubscribeEvent(EventSource.Local, this, handler, GetType(), before, after);`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`protected void UnSubscribeLocalEvent<T>()`
`26`		`- where T : notnull`
	`26`	`+ where T : notnull, allows ref struct`
`27`	`27`	`{`
`28`	`28`	`EntityManager.EventBus.UnsubscribeEvent<T>(EventSource.Local, this);`
`29`	`29`	`}`
`@@ -37,7 +37,7 @@ protected void SubscribeNetworkEvent<T>(`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`protected void UnSubscribeNetworkEvent<T>()`
`40`		`- where T : notnull`
	`40`	`+ where T : notnull, allows ref struct`
`41`	`41`	`{`
`42`	`42`	`EntityManager.EventBus.UnsubscribeEvent<T>(EventSource.Network, this);`
`43`	`43`	`}`
`@@ -51,7 +51,7 @@ protected void SubscribeAllEvent<T>(`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`protected void UnSubscribeAllEvent<T>()`
`54`		`- where T : notnull`
	`54`	`+ where T : notnull, allows ref struct`
`55`	`55`	`{`
`56`	`56`	`EntityManager.EventBus.UnsubscribeEvent<T>(EventSource.All, this);`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public abstract partial class EntitySystem`
`19`	`19`	`protected void SubscribeNetworkEvent<T>(`
`20`	`20`	`EntityEventHandler<T> handler,`
`21`	`21`	`Type[]? before = null, Type[]? after = null)`
`22`		`- where T : notnull`
	`22`	`+ where T : notnull, allows ref struct`
`23`	`23`	`{`
`24`	`24`	`SubEvent(EventSource.Network, handler, before, after);`
`25`	`25`	`}`
`@@ -29,23 +29,23 @@ protected void SubscribeNetworkEvent<T>(`
`29`	`29`	`protected void SubscribeLocalEvent<T>(`
`30`	`30`	`EntityEventHandler<T> handler,`
`31`	`31`	`Type[]? before = null, Type[]? after = null)`
`32`		`- where T : notnull`
	`32`	`+ where T : notnull, allows ref struct`
`33`	`33`	`{`
`34`	`34`	`SubEvent(EventSource.Local, handler, before, after);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`protected void SubscribeLocalEvent<T>(`
`38`	`38`	`EntityEventRefHandler<T> handler,`
`39`	`39`	`Type[]? before = null, Type[]? after = null)`
`40`		`- where T : notnull`
	`40`	`+ where T : notnull, allows ref struct`
`41`	`41`	`{`
`42`	`42`	`SubEvent(EventSource.Local, handler, before, after);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`protected void SubscribeAllEvent<T>(`
`46`	`46`	`EntityEventHandler<T> handler,`
`47`	`47`	`Type[]? before = null, Type[]? after = null)`
`48`		`- where T : notnull`
	`48`	`+ where T : notnull, allows ref struct`
`49`	`49`	`{`
`50`	`50`	`SubEvent(EventSource.All, handler, before, after);`
`51`	`51`	`}`
`@@ -80,7 +80,7 @@ private void SubEvent<T>(`
`80`	`80`	`EventSource src,`
`81`	`81`	`EntityEventHandler<T> handler,`
`82`	`82`	`Type[]? before, Type[]? after)`
`83`		`- where T : notnull`
	`83`	`+ where T : notnull, allows ref struct`
`84`	`84`	`{`
`85`	`85`	`EntityManager.EventBus.SubscribeEvent(src, this, handler, GetType(), before, after);`
`86`	`86`
`@@ -91,7 +91,7 @@ private void SubEvent<T>(`
`91`	`91`	`EventSource src,`
`92`	`92`	`EntityEventRefHandler<T> handler,`
`93`	`93`	`Type[]? before, Type[]? after)`
`94`		`- where T : notnull`
	`94`	`+ where T : notnull, allows ref struct`
`95`	`95`	`{`
`96`	`96`	`EntityManager.EventBus.SubscribeEvent(src, this, handler, GetType(), before, after);`
`97`	`97`
`@@ -243,7 +243,7 @@ private abstract class SubBase`
`243`	`243`	`public abstract void Unsubscribe(EntitySystem sys, IEventBus bus);`
`244`	`244`	`}`
`245`	`245`
`246`		`- private sealed class SubBroadcast<T> : SubBase where T : notnull`
	`246`	`+ private sealed class SubBroadcast<T> : SubBase where T : notnull, allows ref struct`
`247`	`247`	`{`
`248`	`248`	`private readonly EventSource _source;`
`249`	`249`
Original file line number	Diff line number	Diff line change
`@@ -95,12 +95,12 @@ public virtual void Shutdown()`
`95`	`95`
`96`	`96`	`#region Event Proxy`
`97`	`97`
`98`		`- protected void RaiseLocalEvent<T>(T message) where T : notnull`
	`98`	`+ protected void RaiseLocalEvent<T>(T message) where T : notnull, allows ref struct`
`99`	`99`	`{`
`100`	`100`	`EntityManager.EventBus.RaiseEvent(EventSource.Local, message);`
`101`	`101`	`}`
`102`	`102`
`103`		`- protected void RaiseLocalEvent<T>(ref T message) where T : notnull`
	`103`	`+ protected void RaiseLocalEvent<T>(ref T message) where T : notnull, allows ref struct`
`104`	`104`	`{`
`105`	`105`	`EntityManager.EventBus.RaiseEvent(EventSource.Local, ref message);`
`106`	`106`	`}`
`@@ -154,7 +154,7 @@ protected void RaiseNetworkEvent(EntityEventArgs message, EntityUid recipient)`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`protected void RaiseLocalEvent<TEvent>(EntityUid uid, TEvent args, bool broadcast = false)`
`157`		`- where TEvent : notnull`
	`157`	`+ where TEvent : notnull, allows ref struct`
`158`	`158`	`{`
`159`	`159`	`EntityManager.EventBus.RaiseLocalEvent(uid, args, broadcast);`
`160`	`160`	`}`
`@@ -165,7 +165,7 @@ protected void RaiseLocalEvent(EntityUid uid, object args, bool broadcast = fals`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`protected void RaiseLocalEvent<TEvent>(EntityUid uid, ref TEvent args, bool broadcast = false)`
`168`		`- where TEvent : notnull`
	`168`	`+ where TEvent : notnull, allows ref struct`
`169`	`169`	`{`
`170`	`170`	`EntityManager.EventBus.RaiseLocalEvent(uid, ref args, broadcast);`
`171`	`171`	`}`