From 939318041ec198d4dbea2032fc2fb565c883541d Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Tue, 15 Jun 2021 21:04:51 -0700
Subject: [PATCH] Bowser, cannon door, and eyerok no longer require server to
 be in level

All have been switched from being owned by the server to being owned by
the player with the lowest global ID in the level.
---
 src/game/behaviors/bowser.inc.c      | 2 +-
 src/game/behaviors/cannon_door.inc.c | 2 +-
 src/game/behaviors/eyerok.inc.c      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/game/behaviors/bowser.inc.c b/src/game/behaviors/bowser.inc.c
index 5a2a1c20a..3b984bbfe 100644
--- a/src/game/behaviors/bowser.inc.c
+++ b/src/game/behaviors/bowser.inc.c
@@ -1305,7 +1305,7 @@ void bhv_bowser_override_ownership(u8* shouldOverride, u8* shouldOwn) {
     if (tiltingTimer > 0) {
         tiltingTimer--;
         *shouldOverride = TRUE;
-        *shouldOwn = (gNetworkType == NT_SERVER);
+        *shouldOwn = (get_network_player_smallest_global() == gNetworkPlayerLocal);
     }
 }
 
diff --git a/src/game/behaviors/cannon_door.inc.c b/src/game/behaviors/cannon_door.inc.c
index 18e5b46f6..dc36fec3f 100644
--- a/src/game/behaviors/cannon_door.inc.c
+++ b/src/game/behaviors/cannon_door.inc.c
@@ -4,7 +4,7 @@ void bhv_cannon_closed_init(void) {
     struct Object *cannon;
 
     if (save_file_is_cannon_unlocked() == 1) {
-        if (!gNetworkAreaLoaded || gNetworkType == NT_SERVER) {
+        if (!gNetworkAreaLoaded || get_network_player_smallest_global() == gNetworkPlayerLocal) {
             // If the cannon is open, spawn a cannon and despawn the object.
             cannon = spawn_object(o, MODEL_CANNON_BASE, bhvCannon);
             cannon->parentObj = cannon;
diff --git a/src/game/behaviors/eyerok.inc.c b/src/game/behaviors/eyerok.inc.c
index 0dc0e3e95..6597452a5 100644
--- a/src/game/behaviors/eyerok.inc.c
+++ b/src/game/behaviors/eyerok.inc.c
@@ -35,7 +35,7 @@ static struct Object* eyerok_spawn_hand(s16 side, s32 model, const BehaviorScrip
 
 void bhv_eyerok_boss_override_ownership(u8* shouldOverride, u8* shouldOwn) {
     *shouldOverride = TRUE;
-    *shouldOwn = (gNetworkType == NT_SERVER);
+    *shouldOwn = (get_network_player_smallest_global() == gNetworkPlayerLocal);
 }
 
 u8 bhv_eyerok_boss_ignore_if_true(void) {