From: terencehill <piuntn@gmail.com>
Date: Wed, 8 Feb 2023 19:08:34 +0000 (+0000)
Subject: Merge branch 'Mario/rocket_blaster_fix' into 'master'
X-Git-Tag: xonotic-v0.8.6~173
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=755e75cd16b60b1efb7e1e38029360c512c00abc;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/rocket_blaster_fix' into 'master'

Check to make sure neither entity has been freed when calling touch functions

Closes #2811

See merge request xonotic/xonotic-data.pk3dir!1139
---

755e75cd16b60b1efb7e1e38029360c512c00abc