From c913c19366e938cef2f3f7eb6757ed7e869a0859 Mon Sep 17 00:00:00 2001 From: Noah Metzger Date: Sun, 24 Jul 2022 17:22:31 -0500 Subject: [PATCH] remove unnecessary event warning assertion Remove an unnecessary assertion that could be hit under somewhat normal conditions. --- code/game/g_active.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/g_active.c b/code/game/g_active.c index 9ee5d94..b318ad8 100644 --- a/code/game/g_active.c +++ b/code/game/g_active.c @@ -1521,7 +1521,9 @@ G_ExternalizePlayerEvent */ void G_ExternalizePlayerEvent( gentity_t *ent, int event, int eventParm ) { event &= ~EV_EVENT_BITS; - if ( EF_WARN_ASSERT( event ) ) { + // event could be null if it was cleared in G_RunFrame before reaching this, + // which is possible if the server is lagging + if ( event ) { int bits = ent->s.event & EV_EVENT_BITS; bits = ( bits + EV_EVENT_BIT1 ) & EV_EVENT_BITS; ent->s.event = event | bits;