From 583d8faf5cb709aeabc6e1dae4d261eca9f35110 Mon Sep 17 00:00:00 2001
From: Chronos Ouroboros <doom2.fan@gmail.com>
Date: Mon, 4 Nov 2019 18:31:31 -0300
Subject: [PATCH] Fixed mixins.

---
 src/scripting/zscript/zcc_compile.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/scripting/zscript/zcc_compile.cpp b/src/scripting/zscript/zcc_compile.cpp
index 655b39ac6..6096ac251 100644
--- a/src/scripting/zscript/zcc_compile.cpp
+++ b/src/scripting/zscript/zcc_compile.cpp
@@ -165,8 +165,13 @@ void ZCCCompiler::ProcessClass(ZCC_Class *cnode, PSymbolTreeNode *treenode)
 				break;
 			}
 
-			origNextNode = node->SiblingNext;
-			node = mixinDef->Body;
+			if (mixinDef->Body != nullptr)
+			{
+				origNextNode = node->SiblingNext;
+				node = mixinDef->Body;
+
+				continue;
+			}
 		}
 		break;