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

diff --git a/qcsrc/menu/xonotic/credits.qc b/qcsrc/menu/xonotic/credits.qc
index c46ddd78d12ca13ea1546e2ad6b89e1f8f2c2b6d..b6552707f9dd91d37387fa7dd88532374719867c 100644 (file)
--- a/qcsrc/menu/xonotic/credits.qc
+++ b/qcsrc/menu/xonotic/credits.qc
@@ -9,7 +9,6 @@
                PERSON(Merlijn Hofstra) \
                PERSON(Ruszkai "CuBe0wL" Ákos) \
                PERSON(Tyler "-z-" Mulligan) \
-               PERSON(Zac "Mario" Jardine) \
        NL() \
        TITLE(_("Extended Team")) \
                PERSON(bones_was_here) \
@@ -489,6 +488,7 @@
                PERSON(William Libert) \
                PERSON(William "Willis" Weilep) \
                PERSON(Yves "EviLair" Allaire) \
+               PERSON(Zac "Mario" Jardine) \
                PERSON(Zenex) \
                PERSON(... and a goat) \
                /**/