hm

Author: ced777ric

CedMod/Addons/QuerySystem/QueryPlayerEvents.cs

@@ -186,6 +186,9 @@ public override void OnPlayerLeavingPocketDimension(PlayerLeavingPocketDimension
 
         public override void OnPlayerInteractedDoor(PlayerInteractedDoorEventArgs ev)
         {
+            if (ev.Door.Base == null)
+                return;
+            
             WebSocketSystem.Enqueue(new QueryCommand()
             {
                 Recipient = "ALL",
@@ -686,6 +689,9 @@ public override void OnPlayerDeath(PlayerDeathEventArgs ev)
 
         public override void OnPlayerDroppedAmmo(PlayerDroppedAmmoEventArgs ev)
         {
+            if (ev.AmmoPickup.Base == null)
+                return;
+            
             WebSocketSystem.Enqueue(new QueryCommand()
             {
                 Recipient = "ALL",
@@ -703,7 +709,7 @@ public override void OnPlayerDroppedAmmo(PlayerDroppedAmmoEventArgs ev)
                                 Misc.ToHex(ev.Player.ReferenceHub.roleManager.CurrentRole.RoleColor),
                                 ev.Player.Role,
                                 ev.Amount,
-                                ev.Pickup.Base.NetworkInfo.ItemId
+                                ev.AmmoPickup.Base.NetworkInfo.ItemId
                             })
                     }
                 }
@@ -712,6 +718,9 @@ public override void OnPlayerDroppedAmmo(PlayerDroppedAmmoEventArgs ev)
 
         public override void OnPlayerDroppedItem(PlayerDroppedItemEventArgs ev)
         {
+            if (ev.Pickup.Base == null)
+                return;
+            
             WebSocketSystem.Enqueue(new QueryCommand()
             {
                 Recipient = "ALL",

CedMod/Plugin.cs

@@ -546,7 +546,6 @@ public void Disabled()
 
             CustomHandlersManager.UnregisterEventsHandler(EventManagerPlayerEvents);
             CustomHandlersManager.UnregisterEventsHandler(EventManagerServerEvents);
-            
             Shutdown.OnQuit -= OnQuit;
 
             Singleton = null;