From 2b5c830cc4ce0ac11a5249a2b041065f51293f5f Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Wed, 23 Sep 2020 09:16:09 -0700
Subject: [PATCH] Sanity check pokey body parts

---
 src/game/behaviors/pokey.inc.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/game/behaviors/pokey.inc.c b/src/game/behaviors/pokey.inc.c
index 241d7293b..701455000 100644
--- a/src/game/behaviors/pokey.inc.c
+++ b/src/game/behaviors/pokey.inc.c
@@ -45,6 +45,11 @@ void bhv_pokey_body_part_update(void) {
     s16 offsetAngle;
     f32 baseHeight;
 
+    if (o->parentObj == NULL || o->parentObj->behavior != bhvPokey || o->parentObj->activeFlags == ACTIVE_FLAG_DEACTIVATED) {
+        obj_mark_for_deletion(o);
+        return;
+    }
+
     if (obj_update_standard_actions(3.0f)) {
         if (o->parentObj->oAction == POKEY_ACT_UNLOAD_PARTS) {
             obj_mark_for_deletion(o);