Allow external plugins to set IsHomeSpawn for custom bed spawns

Author: RestoreMonarchy

RespawnProtection/Components/RespawnProtectionComponent.cs

@@ -1,4 +1,4 @@
-using RestoreMonarchy.RespawnProtection.Models;
+using RestoreMonarchy.RespawnProtection.Models;
 using Rocket.Unturned.Player;
 using SDG.Unturned;
 using Steamworks;
@@ -17,7 +17,7 @@ public class RespawnProtectionComponent : MonoBehaviour
 
         public Player Player { get; private set; }
         public bool IsProtected { get; private set; }
-        public bool IsHomeSpawn { get; internal set; }
+        public bool IsHomeSpawn { get; set; }
         private CSteamID SteamID => Player.channel.owner.playerID.steamID;
 
         public List<LastAttackMessage> LastAttackMessages { get; private set; } = new();
@@ -76,10 +76,14 @@ private void OnLifeUpdated(bool isDead)
             if (isDead)
             {
                 DisableProtection();
+                IsHomeSpawn = false;
             }
             else
             {
-                if (!configuration.EnableHomeSpawnProtection && IsHomeSpawn)
+                bool wasHomeSpawn = IsHomeSpawn;
+                IsHomeSpawn = false;
+
+                if (!configuration.EnableHomeSpawnProtection && wasHomeSpawn)
                 {
                     return;
                 }
@@ -222,4 +226,4 @@ private void OnEquipRequested(PlayerEquipment equipment, ItemJar jar, ItemAsset
             }
         }
     }
-}
+}

RespawnProtection/RespawnProtection.csproj

@@ -4,11 +4,11 @@
     <TargetFramework>net48</TargetFramework>
 	  <LangVersion>latest</LangVersion>
 	  <RootNamespace>RestoreMonarchy.RespawnProtection</RootNamespace>
-    <Version>1.3.0</Version>
+    <Version>1.3.1</Version>
   </PropertyGroup>
 
   <ItemGroup>
 	  <PackageReference Include="RestoreMonarchy.RocketRedist" Version="3.*" ExcludeAssets="runtime" />
   </ItemGroup>
 
-</Project>
+</Project>

RespawnProtection/RespawnProtectionPlugin.cs

@@ -80,7 +80,7 @@ protected override void Unload()
         };
 #endif
 
-    private void OnPlayerConnected(UnturnedPlayer player)
+        private void OnPlayerConnected(UnturnedPlayer player)
         {
             RespawnProtectionComponent component = player.Player.gameObject.AddComponent<RespawnProtectionComponent>();
             if (Configuration.Instance.EnableJoinSpawnProtection)
@@ -95,11 +95,12 @@ private void OnPlayerConnected(UnturnedPlayer player)
                         {
                             SendMessageToPlayer(player, "SpawnProtectionEnabled", duration);
                         }, Configuration.Instance.ProtectionEnabledMessageDelay);
-                        
-                    } else
+
+                    }
+                    else
                     {
                         SendMessageToPlayer(player, "SpawnProtectionEnabled", duration);
-                    }                    
+                    }
                 }
             }
         }
@@ -167,7 +168,11 @@ private void OnSelectRespawnPoint(PlayerLife sender, bool wantsToSpawnAtHome, re
             RespawnProtectionComponent component = sender.gameObject.GetComponent<RespawnProtectionComponent>();
             if (component != null)
             {
-                component.IsHomeSpawn = wantsToSpawnAtHome;
+                // Only set IsHomeSpawn from here if it's not already set to true by another plugin (e.g. DeathMenu)
+                if (!component.IsHomeSpawn)
+                {
+                    component.IsHomeSpawn = wantsToSpawnAtHome;
+                }
             }
         }
 
@@ -193,4 +198,4 @@ internal void SendMessageToPlayer(IRocketPlayer player, string translationKey, p
             }
         }
     }
-}
+}