Add support for rich text and MessageIconUrl

RestoreMonarchy · RestoreMonarchy · commit 4c6c8a4b49c5 · 2024-10-17T21:37:12.000+02:00
diff --git a/README.md b/README.md
@@ -12,12 +12,14 @@ Gives players protection from other players damaging them after respawning.
 - Protection can be disabled for home spawns, so players can't abuse it to protect their base
 - Protection can be disabled for PVE damage
 - Configurable effect to show when protection is active
+- Rich text and icon support for messages
 
 ## Configuration
 ```xml
 <?xml version="1.0" encoding="utf-8"?>
 <RespawnProtectionConfiguration xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MessageColor>yellow</MessageColor>
+  <MessageIconUrl>https://i.imgur.com/Di3NWF0.png</MessageIconUrl>
   <ProtectionDuration>10</ProtectionDuration>
   <EnableHomeSpawnProtection>false</EnableHomeSpawnProtection>
   <EnableJoinSpawnProtection>false</EnableJoinSpawnProtection>
@@ -41,18 +43,18 @@ Gives players protection from other players damaging them after respawning.
 ```xml
 <?xml version="1.0" encoding="utf-8"?>
 <Translations xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <Translation Id="SpawnProtectionEnabled" Value="Spawn protection enabled for {0} seconds." />
+  <Translation Id="SpawnProtectionEnabled" Value="Spawn protection enabled for [[b]]{0}[[/b]] seconds." />
   <Translation Id="SpawnProtectionDisabledExpired" Value="Your spawn protection has expired." />
   <Translation Id="SpawnProtectionDisabledOnMove" Value="Spawn protection disabled because you moved too far." />
   <Translation Id="SpawnProtectionDisabledOnEquipGun" Value="Spawn protection disabled because you equipped a gun." />
   <Translation Id="SpawnProtectionDisabledOnEquipMelee" Value="Spawn protection disabled because you equipped a melee weapon." />
   <Translation Id="SpawnProtectionDisabledOnEquipThrowable" Value="Spawn protection disabled because you equipped a throwable." />
   <Translation Id="SpawnProtectionDisabledOnAttack" Value="Spawn protection disabled because you attacked." />
   <Translation Id="SpawnProtectionDisabledWithCommand" Value="Spawn protection disabled by command." />
-  <Translation Id="PlayerHasProtection" Value="You can't hurt {0} because they have spawn protection." />
+  <Translation Id="PlayerHasProtection" Value="You can't hurt [[b]]{0}[[/b]] because they have spawn protection." />
   <Translation Id="SpawnProtectionCommandFormat" Value="You must specify player name." />
   <Translation Id="PlayerNotFound" Value="Player not found." />
-  <Translation Id="SpawnProtectionCommandDisabled" Value="Spawn protection disabled for {0}." />
-  <Translation Id="SpawnProtectionCommandEnabled" Value="Spawn protection enabled for {0} for {1} seconds." />
+  <Translation Id="SpawnProtectionCommandDisabled" Value="Spawn protection disabled for [[b]]{0}[[/b]]." />
+  <Translation Id="SpawnProtectionCommandEnabled" Value="Spawn protection enabled for [[b]]{0}[[/b]] for [[b]]{1}[[/b]] seconds." />
 </Translations>
 ```
diff --git a/RespawnProtection/Commands/RespawnProtectionCommand.cs b/RespawnProtection/Commands/RespawnProtectionCommand.cs
@@ -1,6 +1,5 @@
 ﻿using RestoreMonarchy.RespawnProtection.Components;
 using Rocket.API;
-using Rocket.Unturned.Chat;
 using Rocket.Unturned.Player;
 using System.Collections.Generic;
 
@@ -14,14 +13,14 @@ public void Execute(IRocketPlayer caller, string[] command)
         {
             if (command.Length < 1)
             {
-                UnturnedChat.Say(caller, pluginInstance.Translate("SpawnProtectionCommandFormat"), pluginInstance.MessageColor);
+                pluginInstance.SendMessageToPlayer(caller, "SpawnProtectionCommandFormat");
                 return;
             }
 
             UnturnedPlayer target = UnturnedPlayer.FromName(command[0]);
             if (target == null)
             {
-                UnturnedChat.Say(caller, pluginInstance.Translate("PlayerNotFound"), pluginInstance.MessageColor);
+                pluginInstance.SendMessageToPlayer(caller, "PlayerNotFound");
                 return;
             }
 
@@ -36,34 +35,27 @@ public void Execute(IRocketPlayer caller, string[] command)
                 component.DisableProtection();
                 if (pluginInstance.Configuration.Instance.SendProtectionDisabledExpiredMessage)
                 {
-                    UnturnedChat.Say(target, pluginInstance.Translate("SpawnProtectionDisabledWithCommand"), pluginInstance.MessageColor);
+                    pluginInstance.SendMessageToPlayer(target, "SpawnProtectionDisabledWithCommand");
                 }
-
-                UnturnedChat.Say(caller, pluginInstance.Translate("SpawnProtectionCommandDisabled", target.DisplayName), pluginInstance.MessageColor);
+                pluginInstance.SendMessageToPlayer(caller, "SpawnProtectionCommandDisabled", target.DisplayName);
             }
             else
             {
                 component.EnableProtection();
                 string duration = pluginInstance.Configuration.Instance.ProtectionDuration.ToString("N0");
                 if (pluginInstance.Configuration.Instance.SendProtectionEnabledMessage)
                 {
-                    UnturnedChat.Say(target, pluginInstance.Translate("SpawnProtectionEnabled", duration), pluginInstance.MessageColor);
+                    pluginInstance.SendMessageToPlayer(target, "SpawnProtectionEnabled", duration);
                 }
-
-                UnturnedChat.Say(caller, pluginInstance.Translate("SpawnProtectionCommandEnabled", target.DisplayName, duration), pluginInstance.MessageColor);
+                pluginInstance.SendMessageToPlayer(caller, "SpawnProtectionCommandEnabled", target.DisplayName, duration);
             }
         }
 
         public AllowedCaller AllowedCaller => AllowedCaller.Both;
-
         public string Name => "respawnprotection";
-
         public string Help => "";
-
         public string Syntax => "[player] [duration]";
-
         public List<string> Aliases => new();
-
         public List<string> Permissions => new();
     }
-}
+}
diff --git a/RespawnProtection/Components/RespawnProtectionComponent.cs b/RespawnProtection/Components/RespawnProtectionComponent.cs
@@ -1,5 +1,5 @@
 ﻿using RestoreMonarchy.RespawnProtection.Models;
-using Rocket.Unturned.Chat;
+using Rocket.Unturned.Player;
 using SDG.Unturned;
 using Steamworks;
 using System;
@@ -32,7 +32,7 @@ void Awake()
         void Start()
         {
             Player.life.onLifeUpdated += OnLifeUpdated;
-            Player.equipment.onEquipRequested += OnEquipRequested;            
+            Player.equipment.onEquipRequested += OnEquipRequested;
         }
 
         void OnDestroy()
@@ -61,7 +61,7 @@ private void OnLifeUpdated(bool isDead)
                 if (configuration.SendProtectionEnabledMessage)
                 {
                     string duration = configuration.ProtectionDuration.ToString("N0");
-                    UnturnedChat.Say(SteamID, pluginInstance.Translate("SpawnProtectionEnabled", duration), pluginInstance.MessageColor);
+                    pluginInstance.SendMessageToPlayer(UnturnedPlayer.FromCSteamID(SteamID), "SpawnProtectionEnabled", duration);
                 }
             }
         }
@@ -71,7 +71,7 @@ public void EnableProtection()
             if (IsProtected)
             {
                 return;
-            }                         
+            }
 
             IsProtected = true;
             respawnPosition = Player.transform.position;
@@ -108,8 +108,8 @@ private IEnumerator ProtectionTimer()
             DisableProtection();
             if (configuration.SendProtectionDisabledExpiredMessage)
             {
-                UnturnedChat.Say(SteamID, pluginInstance.Translate("SpawnProtectionDisabledExpired"), pluginInstance.MessageColor);
-            }            
+                pluginInstance.SendMessageToPlayer(UnturnedPlayer.FromCSteamID(SteamID), "SpawnProtectionDisabledExpired");
+            }
         }
 
         private IEnumerator EffectTimer()
@@ -147,11 +147,8 @@ void FixedUpdate()
                     DisableProtection();
                     if (configuration.SendProtectionDisabledOtherMessage)
                     {
-                        if (configuration.SendProtectionDisabledOtherMessage)
-                        {
-                            UnturnedChat.Say(SteamID, pluginInstance.Translate("SpawnProtectionDisabledOnMove"), pluginInstance.MessageColor);
-                        }                        
-                    }                        
+                        pluginInstance.SendMessageToPlayer(UnturnedPlayer.FromCSteamID(SteamID), "SpawnProtectionDisabledOnMove");
+                    }
                 }
             }
         }
@@ -165,26 +162,26 @@ private void OnEquipRequested(PlayerEquipment equipment, ItemJar jar, ItemAsset
                     DisableProtection();
                     if (configuration.SendProtectionDisabledOtherMessage)
                     {
-                        UnturnedChat.Say(SteamID, pluginInstance.Translate("SpawnProtectionDisabledOnEquipGun"), pluginInstance.MessageColor);
-                    }                    
+                        pluginInstance.SendMessageToPlayer(UnturnedPlayer.FromCSteamID(SteamID), "SpawnProtectionDisabledOnEquipGun");
+                    }
                 }
 
                 if (configuration.DisableOnEquipMelee && asset.type == EItemType.MELEE)
                 {
                     DisableProtection();
                     if (configuration.SendProtectionDisabledOtherMessage)
                     {
-                        UnturnedChat.Say(SteamID, pluginInstance.Translate("SpawnProtectionDisabledOnEquipMelee"), pluginInstance.MessageColor);
-                    }                    
+                        pluginInstance.SendMessageToPlayer(UnturnedPlayer.FromCSteamID(SteamID), "SpawnProtectionDisabledOnEquipMelee");
+                    }
                 }
 
                 if (configuration.DisableOnEquipThrowable && asset.type == EItemType.THROWABLE)
                 {
                     DisableProtection();
                     if (configuration.SendProtectionDisabledOtherMessage)
                     {
-                        UnturnedChat.Say(SteamID, pluginInstance.Translate("SpawnProtectionDisabledOnEquipThrowable"), pluginInstance.MessageColor);
-                    }                        
+                        pluginInstance.SendMessageToPlayer(UnturnedPlayer.FromCSteamID(SteamID), "SpawnProtectionDisabledOnEquipThrowable");
+                    }
                 }
             }
         }
diff --git a/RespawnProtection/RespawnProtection.csproj b/RespawnProtection/RespawnProtection.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net48</TargetFramework>
 	  <LangVersion>latest</LangVersion>
 	  <RootNamespace>RestoreMonarchy.RespawnProtection</RootNamespace>
-    <Version>1.1.1</Version>
+    <Version>1.2.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/RespawnProtection/RespawnProtectionConfiguration.cs b/RespawnProtection/RespawnProtectionConfiguration.cs
@@ -5,6 +5,7 @@ namespace RestoreMonarchy.RespawnProtection
     public class RespawnProtectionConfiguration : IRocketPluginConfiguration
     {
         public string MessageColor { get; set; } = "yellow";
+        public string MessageIconUrl { get; set; } = "https://i.imgur.com/Di3NWF0.png";
         public float ProtectionDuration { get; set; }
         public bool EnableHomeSpawnProtection { get; set; }
         public bool EnableJoinSpawnProtection { get; set; }
@@ -25,6 +26,7 @@ public class RespawnProtectionConfiguration : IRocketPluginConfiguration
         public void LoadDefaults()
         {
             MessageColor = "yellow";
+            MessageIconUrl = "https://i.imgur.com/Di3NWF0.png";
             ProtectionDuration = 10;
             EnableHomeSpawnProtection = false;
             EnableJoinSpawnProtection = false;
diff --git a/RespawnProtection/RespawnProtectionPlugin.cs b/RespawnProtection/RespawnProtectionPlugin.cs
@@ -1,5 +1,6 @@
 ﻿using RestoreMonarchy.RespawnProtection.Components;
 using RestoreMonarchy.RespawnProtection.Models;
+using Rocket.API;
 using Rocket.API.Collections;
 using Rocket.Core.Logging;
 using Rocket.Core.Plugins;
@@ -43,19 +44,19 @@ protected override void Unload()
 
         public override TranslationList DefaultTranslations => new()
         {
-            { "SpawnProtectionEnabled", "Spawn protection enabled for {0} seconds." },
+            { "SpawnProtectionEnabled", "Spawn protection enabled for [[b]]{0}[[/b]] seconds." },
             { "SpawnProtectionDisabledExpired", "Your spawn protection has expired." },
             { "SpawnProtectionDisabledOnMove", "Spawn protection disabled because you moved too far." },
             { "SpawnProtectionDisabledOnEquipGun", "Spawn protection disabled because you equipped a gun." },
             { "SpawnProtectionDisabledOnEquipMelee", "Spawn protection disabled because you equipped a melee weapon." },
             { "SpawnProtectionDisabledOnEquipThrowable", "Spawn protection disabled because you equipped a throwable." },
             { "SpawnProtectionDisabledOnAttack", "Spawn protection disabled because you attacked." },
             { "SpawnProtectionDisabledWithCommand", "Spawn protection disabled by command." },
-            { "PlayerHasProtection", "You can't hurt {0} because they have spawn protection." },
+            { "PlayerHasProtection", "You can't hurt [[b]]{0}[[/b]] because they have spawn protection." },
             { "SpawnProtectionCommandFormat", "You must specify player name." },
             { "PlayerNotFound", "Player not found." },
-            { "SpawnProtectionCommandDisabled", "Spawn protection disabled for {0}." },
-            { "SpawnProtectionCommandEnabled", "Spawn protection enabled for {0} for {1} seconds." }
+            { "SpawnProtectionCommandDisabled", "Spawn protection disabled for [[b]]{0}[[/b]]." },
+            { "SpawnProtectionCommandEnabled", "Spawn protection enabled for [[b]]{0}[[/b]] for [[b]]{1}[[/b]] seconds." }
         };
 
         private void OnPlayerConnected(UnturnedPlayer player)
@@ -67,7 +68,7 @@ private void OnPlayerConnected(UnturnedPlayer player)
                 if (Configuration.Instance.SendProtectionEnabledMessage)
                 {
                     string duration = Configuration.Instance.ProtectionDuration.ToString("N0");
-                    UnturnedChat.Say(player, Translate("SpawnProtectionEnabled", duration), MessageColor);
+                    SendMessageToPlayer(player, "SpawnProtectionEnabled", duration);
                 }
             }
         }
@@ -99,7 +100,8 @@ private void DamagedPlayerRequested(ref DamagePlayerParameters parameters, ref b
                     {
                         shouldAllow = false;
                     }
-                } else
+                }
+                else
                 {
                     if (!component.LastAttackMessages.Any(x => x.Player == killer && (DateTime.Now - x.DateTime) <= TimeSpan.FromSeconds(Configuration.Instance.AttackMessageRate)))
                     {
@@ -109,7 +111,7 @@ private void DamagedPlayerRequested(ref DamagePlayerParameters parameters, ref b
                             DateTime = DateTime.Now
                         });
 
-                        UnturnedChat.Say(parameters.killer, Translate("PlayerHasProtection", parameters.player.channel.owner.playerID.characterName), MessageColor);
+                        SendMessageToPlayer(UnturnedPlayer.FromPlayer(killer), "PlayerHasProtection", parameters.player.channel.owner.playerID.characterName);
                     }
                     shouldAllow = false;
                 }
@@ -123,10 +125,10 @@ private void DamagedPlayerRequested(ref DamagePlayerParameters parameters, ref b
                     killerComponent.DisableProtection();
                     if (Configuration.Instance.SendProtectionDisabledOtherMessage)
                     {
-                        UnturnedChat.Say(parameters.killer, Translate("SpawnProtectionDisabledOnAttack"), MessageColor);
-                    }                    
+                        SendMessageToPlayer(UnturnedPlayer.FromPlayer(killer), "SpawnProtectionDisabledOnAttack");
+                    }
                 }
-            }            
+            }
         }
 
         private void OnSelectRespawnPoint(PlayerLife sender, bool wantsToSpawnAtHome, ref UnityEngine.Vector3 position, ref float yaw)
@@ -137,5 +139,19 @@ private void OnSelectRespawnPoint(PlayerLife sender, bool wantsToSpawnAtHome, re
                 component.IsHomeSpawn = wantsToSpawnAtHome;
             }
         }
+
+        internal void SendMessageToPlayer(IRocketPlayer player, string translationKey, params object[] placeholder)
+        {
+            string msg = Translate(translationKey, placeholder);
+            msg = msg.Replace("[[", "<").Replace("]]", ">");
+            if (player is ConsolePlayer)
+            {
+                Logger.Log(msg);
+                return;
+            }
+
+            UnturnedPlayer unturnedPlayer = (UnturnedPlayer)player;
+            ChatManager.serverSendMessage(msg, MessageColor, null, unturnedPlayer.SteamPlayer(), EChatMode.SAY, Configuration.Instance.MessageIconUrl, true);
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`using RestoreMonarchy.RespawnProtection.Components;`
`2`	`2`	`using Rocket.API;`
`3`		`-using Rocket.Unturned.Chat;`
`4`	`3`	`using Rocket.Unturned.Player;`
`5`	`4`	`using System.Collections.Generic;`
`6`	`5`
`@@ -14,14 +13,14 @@ public void Execute(IRocketPlayer caller, string[] command)`
`14`	`13`	`{`
`15`	`14`	`if (command.Length < 1)`
`16`	`15`	`{`
`17`		`- UnturnedChat.Say(caller, pluginInstance.Translate("SpawnProtectionCommandFormat"), pluginInstance.MessageColor);`
	`16`	`+ pluginInstance.SendMessageToPlayer(caller, "SpawnProtectionCommandFormat");`
`18`	`17`	`return;`
`19`	`18`	`}`
`20`	`19`
`21`	`20`	`UnturnedPlayer target = UnturnedPlayer.FromName(command[0]);`
`22`	`21`	`if (target == null)`
`23`	`22`	`{`
`24`		`- UnturnedChat.Say(caller, pluginInstance.Translate("PlayerNotFound"), pluginInstance.MessageColor);`
	`23`	`+ pluginInstance.SendMessageToPlayer(caller, "PlayerNotFound");`
`25`	`24`	`return;`
`26`	`25`	`}`
`27`	`26`
`@@ -36,34 +35,27 @@ public void Execute(IRocketPlayer caller, string[] command)`
`36`	`35`	`component.DisableProtection();`
`37`	`36`	`if (pluginInstance.Configuration.Instance.SendProtectionDisabledExpiredMessage)`
`38`	`37`	`{`
`39`		`- UnturnedChat.Say(target, pluginInstance.Translate("SpawnProtectionDisabledWithCommand"), pluginInstance.MessageColor);`
	`38`	`+ pluginInstance.SendMessageToPlayer(target, "SpawnProtectionDisabledWithCommand");`
`40`	`39`	`}`
`41`		`-`
`42`		`- UnturnedChat.Say(caller, pluginInstance.Translate("SpawnProtectionCommandDisabled", target.DisplayName), pluginInstance.MessageColor);`
	`40`	`+ pluginInstance.SendMessageToPlayer(caller, "SpawnProtectionCommandDisabled", target.DisplayName);`
`43`	`41`	`}`
`44`	`42`	`else`
`45`	`43`	`{`
`46`	`44`	`component.EnableProtection();`
`47`	`45`	`string duration = pluginInstance.Configuration.Instance.ProtectionDuration.ToString("N0");`
`48`	`46`	`if (pluginInstance.Configuration.Instance.SendProtectionEnabledMessage)`
`49`	`47`	`{`
`50`		`- UnturnedChat.Say(target, pluginInstance.Translate("SpawnProtectionEnabled", duration), pluginInstance.MessageColor);`
	`48`	`+ pluginInstance.SendMessageToPlayer(target, "SpawnProtectionEnabled", duration);`
`51`	`49`	`}`
`52`		`-`
`53`		`- UnturnedChat.Say(caller, pluginInstance.Translate("SpawnProtectionCommandEnabled", target.DisplayName, duration), pluginInstance.MessageColor);`
	`50`	`+ pluginInstance.SendMessageToPlayer(caller, "SpawnProtectionCommandEnabled", target.DisplayName, duration);`
`54`	`51`	`}`
`55`	`52`	`}`
`56`	`53`
`57`	`54`	`public AllowedCaller AllowedCaller => AllowedCaller.Both;`
`58`		`-`
`59`	`55`	`public string Name => "respawnprotection";`
`60`		`-`
`61`	`56`	`public string Help => "";`
`62`		`-`
`63`	`57`	`public string Syntax => "[player] [duration]";`
`64`		`-`
`65`	`58`	`public List<string> Aliases => new();`
`66`		`-`
`67`	`59`	`public List<string> Permissions => new();`
`68`	`60`	`}`
`69`		`-}`
	`61`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`using RestoreMonarchy.RespawnProtection.Models;`
`2`		`-using Rocket.Unturned.Chat;`
	`2`	`+using Rocket.Unturned.Player;`
`3`	`3`	`using SDG.Unturned;`
`4`	`4`	`using Steamworks;`
`5`	`5`	`using System;`
`@@ -32,7 +32,7 @@ void Awake()`
`32`	`32`	`void Start()`
`33`	`33`	`{`
`34`	`34`	`Player.life.onLifeUpdated += OnLifeUpdated;`
`35`		`- Player.equipment.onEquipRequested += OnEquipRequested;`
	`35`	`+ Player.equipment.onEquipRequested += OnEquipRequested;`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`void OnDestroy()`
`@@ -61,7 +61,7 @@ private void OnLifeUpdated(bool isDead)`
`61`	`61`	`if (configuration.SendProtectionEnabledMessage)`
`62`	`62`	`{`
`63`	`63`	`string duration = configuration.ProtectionDuration.ToString("N0");`
`64`		`- UnturnedChat.Say(SteamID, pluginInstance.Translate("SpawnProtectionEnabled", duration), pluginInstance.MessageColor);`
	`64`	`+ pluginInstance.SendMessageToPlayer(UnturnedPlayer.FromCSteamID(SteamID), "SpawnProtectionEnabled", duration);`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`	`}`
`@@ -71,7 +71,7 @@ public void EnableProtection()`
`71`	`71`	`if (IsProtected)`
`72`	`72`	`{`
`73`	`73`	`return;`
`74`		`- }`
	`74`	`+ }`
`75`	`75`
`76`	`76`	`IsProtected = true;`
`77`	`77`	`respawnPosition = Player.transform.position;`
`@@ -108,8 +108,8 @@ private IEnumerator ProtectionTimer()`
`108`	`108`	`DisableProtection();`
`109`	`109`	`if (configuration.SendProtectionDisabledExpiredMessage)`
`110`	`110`	`{`
`111`		`- UnturnedChat.Say(SteamID, pluginInstance.Translate("SpawnProtectionDisabledExpired"), pluginInstance.MessageColor);`
`112`		`- }`
	`111`	`+ pluginInstance.SendMessageToPlayer(UnturnedPlayer.FromCSteamID(SteamID), "SpawnProtectionDisabledExpired");`
	`112`	`+ }`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`private IEnumerator EffectTimer()`
`@@ -147,11 +147,8 @@ void FixedUpdate()`
`147`	`147`	`DisableProtection();`
`148`	`148`	`if (configuration.SendProtectionDisabledOtherMessage)`
`149`	`149`	`{`
`150`		`- if (configuration.SendProtectionDisabledOtherMessage)`
`151`		`- {`
`152`		`- UnturnedChat.Say(SteamID, pluginInstance.Translate("SpawnProtectionDisabledOnMove"), pluginInstance.MessageColor);`
`153`		`- }`
`154`		`- }`
	`150`	`+ pluginInstance.SendMessageToPlayer(UnturnedPlayer.FromCSteamID(SteamID), "SpawnProtectionDisabledOnMove");`
	`151`	`+ }`
`155`	`152`	`}`
`156`	`153`	`}`
`157`	`154`	`}`
`@@ -165,26 +162,26 @@ private void OnEquipRequested(PlayerEquipment equipment, ItemJar jar, ItemAsset`
`165`	`162`	`DisableProtection();`
`166`	`163`	`if (configuration.SendProtectionDisabledOtherMessage)`
`167`	`164`	`{`
`168`		`- UnturnedChat.Say(SteamID, pluginInstance.Translate("SpawnProtectionDisabledOnEquipGun"), pluginInstance.MessageColor);`
`169`		`- }`
	`165`	`+ pluginInstance.SendMessageToPlayer(UnturnedPlayer.FromCSteamID(SteamID), "SpawnProtectionDisabledOnEquipGun");`
	`166`	`+ }`
`170`	`167`	`}`
`171`	`168`
`172`	`169`	`if (configuration.DisableOnEquipMelee && asset.type == EItemType.MELEE)`
`173`	`170`	`{`
`174`	`171`	`DisableProtection();`
`175`	`172`	`if (configuration.SendProtectionDisabledOtherMessage)`
`176`	`173`	`{`
`177`		`- UnturnedChat.Say(SteamID, pluginInstance.Translate("SpawnProtectionDisabledOnEquipMelee"), pluginInstance.MessageColor);`
`178`		`- }`
	`174`	`+ pluginInstance.SendMessageToPlayer(UnturnedPlayer.FromCSteamID(SteamID), "SpawnProtectionDisabledOnEquipMelee");`
	`175`	`+ }`
`179`	`176`	`}`
`180`	`177`
`181`	`178`	`if (configuration.DisableOnEquipThrowable && asset.type == EItemType.THROWABLE)`
`182`	`179`	`{`
`183`	`180`	`DisableProtection();`
`184`	`181`	`if (configuration.SendProtectionDisabledOtherMessage)`
`185`	`182`	`{`
`186`		`- UnturnedChat.Say(SteamID, pluginInstance.Translate("SpawnProtectionDisabledOnEquipThrowable"), pluginInstance.MessageColor);`
`187`		`- }`
	`183`	`+ pluginInstance.SendMessageToPlayer(UnturnedPlayer.FromCSteamID(SteamID), "SpawnProtectionDisabledOnEquipThrowable");`
	`184`	`+ }`
`188`	`185`	`}`
`189`	`186`	`}`
`190`	`187`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using RestoreMonarchy.RespawnProtection.Components;`
`2`	`2`	`using RestoreMonarchy.RespawnProtection.Models;`
	`3`	`+using Rocket.API;`
`3`	`4`	`using Rocket.API.Collections;`
`4`	`5`	`using Rocket.Core.Logging;`
`5`	`6`	`using Rocket.Core.Plugins;`
`@@ -43,19 +44,19 @@ protected override void Unload()`
`43`	`44`
`44`	`45`	`public override TranslationList DefaultTranslations => new()`
`45`	`46`	`{`
`46`		`- { "SpawnProtectionEnabled", "Spawn protection enabled for {0} seconds." },`
	`47`	`+ { "SpawnProtectionEnabled", "Spawn protection enabled for [[b]]{0}[[/b]] seconds." },`
`47`	`48`	`{ "SpawnProtectionDisabledExpired", "Your spawn protection has expired." },`
`48`	`49`	`{ "SpawnProtectionDisabledOnMove", "Spawn protection disabled because you moved too far." },`
`49`	`50`	`{ "SpawnProtectionDisabledOnEquipGun", "Spawn protection disabled because you equipped a gun." },`
`50`	`51`	`{ "SpawnProtectionDisabledOnEquipMelee", "Spawn protection disabled because you equipped a melee weapon." },`
`51`	`52`	`{ "SpawnProtectionDisabledOnEquipThrowable", "Spawn protection disabled because you equipped a throwable." },`
`52`	`53`	`{ "SpawnProtectionDisabledOnAttack", "Spawn protection disabled because you attacked." },`
`53`	`54`	`{ "SpawnProtectionDisabledWithCommand", "Spawn protection disabled by command." },`
`54`		`- { "PlayerHasProtection", "You can't hurt {0} because they have spawn protection." },`
	`55`	`+ { "PlayerHasProtection", "You can't hurt [[b]]{0}[[/b]] because they have spawn protection." },`
`55`	`56`	`{ "SpawnProtectionCommandFormat", "You must specify player name." },`
`56`	`57`	`{ "PlayerNotFound", "Player not found." },`
`57`		`- { "SpawnProtectionCommandDisabled", "Spawn protection disabled for {0}." },`
`58`		`- { "SpawnProtectionCommandEnabled", "Spawn protection enabled for {0} for {1} seconds." }`
	`58`	`+ { "SpawnProtectionCommandDisabled", "Spawn protection disabled for [[b]]{0}[[/b]]." },`
	`59`	`+ { "SpawnProtectionCommandEnabled", "Spawn protection enabled for [[b]]{0}[[/b]] for [[b]]{1}[[/b]] seconds." }`
`59`	`60`	`};`
`60`	`61`
`61`	`62`	`private void OnPlayerConnected(UnturnedPlayer player)`
`@@ -67,7 +68,7 @@ private void OnPlayerConnected(UnturnedPlayer player)`
`67`	`68`	`if (Configuration.Instance.SendProtectionEnabledMessage)`
`68`	`69`	`{`
`69`	`70`	`string duration = Configuration.Instance.ProtectionDuration.ToString("N0");`
`70`		`- UnturnedChat.Say(player, Translate("SpawnProtectionEnabled", duration), MessageColor);`
	`71`	`+ SendMessageToPlayer(player, "SpawnProtectionEnabled", duration);`
`71`	`72`	`}`
`72`	`73`	`}`
`73`	`74`	`}`
`@@ -99,7 +100,8 @@ private void DamagedPlayerRequested(ref DamagePlayerParameters parameters, ref b`
`99`	`100`	`{`
`100`	`101`	`shouldAllow = false;`
`101`	`102`	`}`
`102`		`- } else`
	`103`	`+ }`
	`104`	`+ else`
`103`	`105`	`{`
`104`	`106`	`if (!component.LastAttackMessages.Any(x => x.Player == killer && (DateTime.Now - x.DateTime) <= TimeSpan.FromSeconds(Configuration.Instance.AttackMessageRate)))`
`105`	`107`	`{`
`@@ -109,7 +111,7 @@ private void DamagedPlayerRequested(ref DamagePlayerParameters parameters, ref b`
`109`	`111`	`DateTime = DateTime.Now`
`110`	`112`	`});`
`111`	`113`
`112`		`- UnturnedChat.Say(parameters.killer, Translate("PlayerHasProtection", parameters.player.channel.owner.playerID.characterName), MessageColor);`
	`114`	`+ SendMessageToPlayer(UnturnedPlayer.FromPlayer(killer), "PlayerHasProtection", parameters.player.channel.owner.playerID.characterName);`
`113`	`115`	`}`
`114`	`116`	`shouldAllow = false;`
`115`	`117`	`}`
`@@ -123,10 +125,10 @@ private void DamagedPlayerRequested(ref DamagePlayerParameters parameters, ref b`
`123`	`125`	`killerComponent.DisableProtection();`
`124`	`126`	`if (Configuration.Instance.SendProtectionDisabledOtherMessage)`
`125`	`127`	`{`
`126`		`- UnturnedChat.Say(parameters.killer, Translate("SpawnProtectionDisabledOnAttack"), MessageColor);`
`127`		`- }`
	`128`	`+ SendMessageToPlayer(UnturnedPlayer.FromPlayer(killer), "SpawnProtectionDisabledOnAttack");`
	`129`	`+ }`
`128`	`130`	`}`
`129`		`- }`
	`131`	`+ }`
`130`	`132`	`}`
`131`	`133`
`132`	`134`	`private void OnSelectRespawnPoint(PlayerLife sender, bool wantsToSpawnAtHome, ref UnityEngine.Vector3 position, ref float yaw)`
`@@ -137,5 +139,19 @@ private void OnSelectRespawnPoint(PlayerLife sender, bool wantsToSpawnAtHome, re`
`137`	`139`	`component.IsHomeSpawn = wantsToSpawnAtHome;`
`138`	`140`	`}`
`139`	`141`	`}`
	`142`	`+`
	`143`	`+ internal void SendMessageToPlayer(IRocketPlayer player, string translationKey, params object[] placeholder)`
	`144`	`+ {`
	`145`	`+ string msg = Translate(translationKey, placeholder);`
	`146`	`+ msg = msg.Replace("[[", "<").Replace("]]", ">");`
	`147`	`+ if (player is ConsolePlayer)`
	`148`	`+ {`
	`149`	`+ Logger.Log(msg);`
	`150`	`+ return;`
	`151`	`+ }`
	`152`	`+`
	`153`	`+ UnturnedPlayer unturnedPlayer = (UnturnedPlayer)player;`
	`154`	`+ ChatManager.serverSendMessage(msg, MessageColor, null, unturnedPlayer.SteamPlayer(), EChatMode.SAY, Configuration.Instance.MessageIconUrl, true);`
	`155`	`+ }`
`140`	`156`	`}`
`141`	`157`	`}`