From c0eddec4e3ddcf0cd79a7dc049ce42801d314719 Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 2 Jul 2022 01:53:34 +1000 Subject: [PATCH] Add a safety check incase net_sendentity doesn't exist, remove references to getSendEntity --- qcsrc/common/mapobjects/subs.qc | 2 +- qcsrc/lib/net.qh | 2 +- qcsrc/server/items/items.qc | 2 +- qcsrc/server/weapons/csqcprojectile.qc | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qcsrc/common/mapobjects/subs.qc b/qcsrc/common/mapobjects/subs.qc index c0b137404..a7e7c3edb 100644 --- a/qcsrc/common/mapobjects/subs.qc +++ b/qcsrc/common/mapobjects/subs.qc @@ -512,7 +512,7 @@ void LODmodel_attach(entity this) } if(this.lodmodelindex1) - if (!getSendEntity(this)) + if (!this.net_sendentity) SetCustomizer(this, LOD_customize, LOD_uncustomize); } diff --git a/qcsrc/lib/net.qh b/qcsrc/lib/net.qh index 7f44a959d..a45f62a1b 100644 --- a/qcsrc/lib/net.qh +++ b/qcsrc/lib/net.qh @@ -122,7 +122,7 @@ STATIC_INIT(C2S_Protocol_renumber) { FOREACH(C2S_Protocol, true, it.m_id = i); } bool Net_SendEntity(entity to, int sendflags) { ENGINE_EVENT(); - return this.net_sendentity(this, to, sendflags); + return (this.net_sendentity) ? this.net_sendentity(this, to, sendflags) : false; } void Net_LinkEntity(entity e, bool docull, bool checkmodel, float dt, bool(entity this, entity to, int sendflags) sendfunc) diff --git a/qcsrc/server/items/items.qc b/qcsrc/server/items/items.qc index 7d1c46f3f..b0eac54f5 100644 --- a/qcsrc/server/items/items.qc +++ b/qcsrc/server/items/items.qc @@ -91,7 +91,7 @@ void ItemUpdate(entity this) void UpdateItemAfterTeleport(entity this) { - if(getSendEntity(this) == ItemSend) + if(this.net_sendentity == ItemSend) ItemUpdate(this); } diff --git a/qcsrc/server/weapons/csqcprojectile.qc b/qcsrc/server/weapons/csqcprojectile.qc index 7170d3ed6..6c3addcc0 100644 --- a/qcsrc/server/weapons/csqcprojectile.qc +++ b/qcsrc/server/weapons/csqcprojectile.qc @@ -98,13 +98,13 @@ void CSQCProjectile(entity e, float clientanimate, int type, float docull) void UpdateCSQCProjectile(entity e) { - if(getSendEntity(e) == CSQCProjectile_SendEntity) + if(e.net_sendentity == CSQCProjectile_SendEntity) { // send new origin data e.SendFlags |= 0x01; } // FIXME HACK - else if(getSendEntity(e) == ItemSend) + else if(e.net_sendentity == ItemSend) { ItemUpdate(e); } @@ -113,7 +113,7 @@ void UpdateCSQCProjectile(entity e) void UpdateCSQCProjectileAfterTeleport(entity e) { - if(getSendEntity(e) == CSQCProjectile_SendEntity) + if(e.net_sendentity == CSQCProjectile_SendEntity) { // send new origin data e.SendFlags |= 0x01; -- 2.39.2