Add arena spawn protection

Author: RestoreMonarchy

README.md

@@ -1,5 +1,5 @@
 # Respawn Protection
-Gives players protection from other players damaging them after respawning.
+Protects players from damage after spawning. Supports survival and arena spawns.
 
 ## Features
 - Protects players from damage for a configurable amount of time after spawning
@@ -13,6 +13,7 @@ Gives players protection from other players damaging them after respawning.
 - Protection can be disabled for PVE damage
 - Configurable effect to show when protection is active
 - Rich text and icon support for messages
+- Arena spawn protection support
 
 ## Commands
 - `/respawnprotection [player] [duration]` - Enable or disable protection for a player for a specified duration. Admin command.
@@ -26,6 +27,7 @@ Gives players protection from other players damaging them after respawning.
   <ProtectionDuration>10</ProtectionDuration>
   <EnableHomeSpawnProtection>false</EnableHomeSpawnProtection>
   <EnableJoinSpawnProtection>false</EnableJoinSpawnProtection>
+  <EnableArenaSpawnProtection>true</EnableArenaSpawnProtection>
   <MaxMoveDistance>10</MaxMoveDistance>
   <ProtectFromPVE>true</ProtectFromPVE>
   <DisableOnEquipGun>true</DisableOnEquipGun>

RespawnProtection/Components/RespawnProtectionComponent.cs

@@ -33,19 +33,46 @@ void Start()
         {
             Player.life.onLifeUpdated += OnLifeUpdated;
             Player.equipment.onEquipRequested += OnEquipRequested;
+            Player.onPlayerTeleported += OnPlayerTeleported;
         }
 
         void OnDestroy()
         {
             Player.life.onLifeUpdated -= OnLifeUpdated;
             Player.equipment.onEquipRequested -= OnEquipRequested;
+            Player.onPlayerTeleported -= OnPlayerTeleported;
+            StopAllCoroutines();
+        }
+
+        private void OnPlayerTeleported(Player player, Vector3 point)
+        {
+            if (!configuration.EnableArenaSpawnProtection)
+            {
+                return;
+            }
+            if (!LevelManager.isArenaMode || LevelManager.arenaState != EArenaState.SPAWN)
+            {
+                return;
+            }
+
+            EnableProtection();
+            if (configuration.SendProtectionEnabledMessage)
+            {
+                string duration = configuration.ProtectionDuration.ToString("N0");
+                pluginInstance.SendMessageToPlayer(UnturnedPlayer.FromPlayer(Player), "SpawnProtectionEnabled", duration);
+            }
         }
 
         public Coroutine ProtectionCoroutine { get; private set; }
         public Coroutine EffectCoroutine { get; private set; }
 
         private void OnLifeUpdated(bool isDead)
         {
+            if (LevelManager.isArenaMode)
+            {
+                return;
+            }
+
             if (isDead)
             {
                 DisableProtection();
@@ -61,7 +88,7 @@ private void OnLifeUpdated(bool isDead)
                 if (configuration.SendProtectionEnabledMessage)
                 {
                     string duration = configuration.ProtectionDuration.ToString("N0");
-                    pluginInstance.SendMessageToPlayer(UnturnedPlayer.FromCSteamID(SteamID), "SpawnProtectionEnabled", duration);
+                    pluginInstance.SendMessageToPlayer(UnturnedPlayer.FromPlayer(Player), "SpawnProtectionEnabled", duration);
                 }
             }
         }
@@ -105,12 +132,13 @@ private IEnumerator ProtectionTimer()
         {
             yield return new WaitForSeconds(configuration.ProtectionDuration);
 
-            DisableProtection();
-            if (configuration.SendProtectionDisabledExpiredMessage)
+            if (configuration.SendProtectionDisabledExpiredMessage && Player != null)
             {
-                UnturnedPlayer unturnedPlayer = UnturnedPlayer.FromCSteamID(SteamID);
+                UnturnedPlayer unturnedPlayer = UnturnedPlayer.FromPlayer(Player);
                 pluginInstance.SendMessageToPlayer(unturnedPlayer, "SpawnProtectionDisabledExpired");
             }
+
+            DisableProtection();
         }
 
         private IEnumerator EffectTimer()
@@ -139,16 +167,23 @@ private IEnumerator EffectTimer()
             }
         }
 
+        private float lastCheckTime = 0f;
         void FixedUpdate()
         {
             if (IsProtected && configuration.DisableOnMove)
             {
-                if (Vector3.Distance(respawnPosition, Player.transform.position) > configuration.MaxMoveDistance)
+                // check every 0.25 seconds
+                if (Time.time - lastCheckTime >= 0.25f)
                 {
-                    DisableProtection();
-                    if (configuration.SendProtectionDisabledOtherMessage)
+                    lastCheckTime = Time.time;
+
+                    if (Vector3.Distance(respawnPosition, Player.transform.position) > configuration.MaxMoveDistance)
                     {
-                        pluginInstance.SendMessageToPlayer(UnturnedPlayer.FromCSteamID(SteamID), "SpawnProtectionDisabledOnMove");
+                        DisableProtection();
+                        if (configuration.SendProtectionDisabledOtherMessage)
+                        {
+                            pluginInstance.SendMessageToPlayer(UnturnedPlayer.FromPlayer(Player), "SpawnProtectionDisabledOnMove");
+                        }
                     }
                 }
             }
@@ -163,7 +198,7 @@ private void OnEquipRequested(PlayerEquipment equipment, ItemJar jar, ItemAsset
                     DisableProtection();
                     if (configuration.SendProtectionDisabledOtherMessage)
                     {
-                        pluginInstance.SendMessageToPlayer(UnturnedPlayer.FromCSteamID(SteamID), "SpawnProtectionDisabledOnEquipGun");
+                        pluginInstance.SendMessageToPlayer(UnturnedPlayer.FromPlayer(Player), "SpawnProtectionDisabledOnEquipGun");
                     }
                 }
 
@@ -172,7 +207,7 @@ private void OnEquipRequested(PlayerEquipment equipment, ItemJar jar, ItemAsset
                     DisableProtection();
                     if (configuration.SendProtectionDisabledOtherMessage)
                     {
-                        pluginInstance.SendMessageToPlayer(UnturnedPlayer.FromCSteamID(SteamID), "SpawnProtectionDisabledOnEquipMelee");
+                        pluginInstance.SendMessageToPlayer(UnturnedPlayer.FromPlayer(Player), "SpawnProtectionDisabledOnEquipMelee");
                     }
                 }
 
@@ -181,7 +216,7 @@ private void OnEquipRequested(PlayerEquipment equipment, ItemJar jar, ItemAsset
                     DisableProtection();
                     if (configuration.SendProtectionDisabledOtherMessage)
                     {
-                        pluginInstance.SendMessageToPlayer(UnturnedPlayer.FromCSteamID(SteamID), "SpawnProtectionDisabledOnEquipThrowable");
+                        pluginInstance.SendMessageToPlayer(UnturnedPlayer.FromPlayer(Player), "SpawnProtectionDisabledOnEquipThrowable");
                     }
                 }
             }

RespawnProtection/RespawnProtection.csproj

@@ -4,7 +4,7 @@
     <TargetFramework>net48</TargetFramework>
 	  <LangVersion>latest</LangVersion>
 	  <RootNamespace>RestoreMonarchy.RespawnProtection</RootNamespace>
-    <Version>1.2.1</Version>
+    <Version>1.3.0</Version>
   </PropertyGroup>
 
   <ItemGroup>

RespawnProtection/RespawnProtectionConfiguration.cs

@@ -9,6 +9,7 @@ public class RespawnProtectionConfiguration : IRocketPluginConfiguration
         public float ProtectionDuration { get; set; }
         public bool EnableHomeSpawnProtection { get; set; }
         public bool EnableJoinSpawnProtection { get; set; }
+        public bool EnableArenaSpawnProtection { get; set; } = true;
         public float MaxMoveDistance { get; set; }
         public bool ProtectFromPVE { get; set; }
         public bool DisableOnEquipGun { get; set; }
@@ -31,6 +32,7 @@ public void LoadDefaults()
             ProtectionDuration = 10;
             EnableHomeSpawnProtection = false;
             EnableJoinSpawnProtection = false;
+            EnableArenaSpawnProtection = true;
             MaxMoveDistance = 10f;
             ProtectFromPVE = true;
             DisableOnEquipGun = true;

RespawnProtection/RespawnProtectionPlugin.cs

@@ -22,7 +22,7 @@ public class RespawnProtectionPlugin : RocketPlugin<RespawnProtectionConfigurati
         protected override void Load()
         {
             Instance = this;
-            MessageColor = UnturnedChat.GetColorFromName(Configuration.Instance.MessageColor, UnityEngine.Color.yellow);
+            MessageColor = UnturnedChat.GetColorFromName(Configuration.Instance.MessageColor, UnityEngine.Color.green);
 
             U.Events.OnPlayerConnected += OnPlayerConnected;
             U.Events.OnPlayerDisconnected += OnPlayerDisconnected;
@@ -153,6 +153,11 @@ private void OnSelectRespawnPoint(PlayerLife sender, bool wantsToSpawnAtHome, re
 
         internal void SendMessageToPlayer(IRocketPlayer player, string translationKey, params object[] placeholder)
         {
+            if (player == null)
+            {
+                return;
+            }
+
             string msg = Translate(translationKey, placeholder);
             msg = msg.Replace("[[", "<").Replace("]]", ">");
             if (player is ConsolePlayer)