Resolve conflicts 2: Merge branch 'master' into bones_was_here/q3compat

[xonotic/xonotic-data.pk3dir.git] / qcsrc / lib / warpzone / common.qc

diff --git a/qcsrc/lib/warpzone/common.qc b/qcsrc/lib/warpzone/common.qc
index 20735d99fccfcbe8c2b23efea27edffeb2129c96..46710db66c92c041fd447a2ea3e00c2edde83356 100644 (file)
--- a/qcsrc/lib/warpzone/common.qc
+++ b/qcsrc/lib/warpzone/common.qc
@@ -585,6 +585,7 @@ bool WarpZoneLib_BadEntity(entity e)
                case "spawnfunc":
                case "weaponchild":
                case "chatbubbleentity":
+               case "buff_model":
                //case "net_linked": // actually some real entities are linked without classname, fail
                case "":
                        return true;