Add teleport combat restrictions

Author: negrifelipe

Feli.RocketMod.Teleporting/Configuration.cs

@@ -11,6 +11,8 @@ public class Configuration : IRocketPluginConfiguration
         public bool CancelWhenMove { get; set; }
         public bool TeleportProtection { get; set; }
         public double TeleportProtectionTime { get; set; }
+        public bool TeleportCombatAllowed { get; set; }
+        public double TeleportCombatTime { get; set; }
         public TeleportCost TeleportCost { get; set; }
 
         public void LoadDefaults()
@@ -21,6 +23,8 @@ public void LoadDefaults()
             CancelWhenMove = false;
             TeleportProtection = true;
             TeleportProtectionTime = 5;
+            TeleportCombatAllowed = false;
+            TeleportCombatTime = 30;
             TeleportCost = new TeleportCost()
             {
                 Enabled = false,

Feli.RocketMod.Teleporting/Feli.RocketMod.Teleporting.csproj

@@ -9,7 +9,8 @@
         <AppDesignerFolder>Properties</AppDesignerFolder>
         <RootNamespace>Feli.RocketMod.Teleporting</RootNamespace>
         <AssemblyName>Feli.RocketMod.Teleporting</AssemblyName>
-        <AssemblyVersion>1.2.0.0</AssemblyVersion>
+        <AssemblyVersion>1.3.0</AssemblyVersion>
+        <Version>1.3.0</Version>
         <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
         <FileAlignment>512</FileAlignment>
     </PropertyGroup>

Feli.RocketMod.Teleporting/Plugin.cs

@@ -23,7 +23,7 @@ protected override void Load()
                 ? new ExperienceEconomyProvider() as IEconomyProvider
                 : new UconomyEconomyProvider();
 
-            Logger.Log($"Teleporting plugin v{Assembly.GetName().Version} loaded !");
+            Logger.Log($"Teleporting plugin v1.3.0 loaded !");
             Logger.Log("Do you want more cool plugins? Join now: https://discord.gg/4FF2548 !");
             Logger.Log($"Economy Provider: {EconomyProvider.GetType().Name}");
         }
@@ -42,6 +42,7 @@ protected override void Unload()
             {"TpaCommand:WrongUsage:Send", "Correct command usage: /tpa send <playerName>"},
             {"TpaCommand:WrongUsage:NotFound", "Player with name {0} was not found"},
             {"TpaCommand:Send:Yourself", "There is no point on sending a tpa request to yourself"},
+            {"TpaCommand:Send:Combat", "Could not send the tpa request because you are in combat. You must wait {0} seconds"},
             {"TpaCommand:Send:Target", "{0} has just sent you a tpa request. Use \"/tpa accept\" to accept it or \n/tpa cancel\n to cancel it"},
             {"TpaCommand:Send:Sender", "Successfully sent a tpa request to {0}. Use \"/tpa cancel\" to cancel it"},
             {"TpaCommand:Send:Cooldown", "You cannot send a tpa request. Wait {0} seconds"},
@@ -56,6 +57,8 @@ protected override void Unload()
             {"TpaValidation:Car:Other", "The teleport was cancelled because {0} is on a car"},
             {"TpaValidation:Car:Self", "The teleport was cancelled because you are on a car"},
             {"TpaValidation:Leave", "The teleport was cancelled because {0} left the server"},
+            {"TpaValidation:Combat:Sender", "The teleport was cancelled because you are in combat. The combat mode expires in {0} seconds"},
+            {"TpaValidation:Combat:Target", "The teleport was cancelled because {0} is in combat"},
             {"TpaValidation:Balance:Sender", "You dont have enough balance to teleport. Teleport cost: {0}"},
             {"TpaValidation:Balance:Target", "The teleport was cancelled because {0} does not have enough balance"}
         };

Feli.RocketMod.Teleporting/TeleportsManager.cs

@@ -13,17 +13,19 @@ namespace Feli.RocketMod.Teleporting
 {
     public class TeleportsManager : IDisposable
     {
-        private readonly Plugin _plugin;
-        private readonly Color _messageColor;
-        private readonly Configuration _configuration;
-        private readonly List<Tuple<UnturnedPlayer, UnturnedPlayer>> _teleportRequests;
-        private readonly Dictionary<UnturnedPlayer, DateTime> _cooldowns;
-        private readonly Dictionary<UnturnedPlayer, DateTime> _teleportProtections;
-            
+        private Plugin _plugin;
+        private Color _messageColor;
+        private Configuration _configuration;
+        private List<Tuple<UnturnedPlayer, UnturnedPlayer>> _teleportRequests;
+        private Dictionary<UnturnedPlayer, DateTime> _cooldowns;
+        private Dictionary<UnturnedPlayer, DateTime> _teleportProtections;
+        private Dictionary<UnturnedPlayer, DateTime> _playersLastCombat;
+
         public TeleportsManager(Plugin plugin)
         {
             _teleportRequests = new List<Tuple<UnturnedPlayer, UnturnedPlayer>>();
             _teleportProtections = new Dictionary<UnturnedPlayer, DateTime>();
+            _playersLastCombat = new Dictionary<UnturnedPlayer, DateTime>();
             _cooldowns = new Dictionary<UnturnedPlayer, DateTime>();
             _plugin = plugin;
             _configuration = plugin.Configuration.Instance;
@@ -58,6 +60,20 @@ public void Send(UnturnedPlayer sender, UnturnedPlayer target)
                 return;
             }
 
+            if (!_configuration.TeleportCombatAllowed)
+            {
+                var combat = GetLastCombat(sender);
+
+                var combatTime = combat.AddSeconds(_configuration.TeleportCombatTime);
+
+                if (combatTime > DateTime.Now)
+                {
+                    var waitTime = (combatTime - DateTime.Now).TotalSeconds;
+                    UnturnedChat.Say(sender, _plugin.Translate("TpaCommand:Send:Combat", Math.Round(waitTime)), true);
+                    return;
+                }
+            }
+            
             UpdateCooldown(sender);
 
             request = new Tuple<UnturnedPlayer, UnturnedPlayer>(sender, target);
@@ -156,6 +172,23 @@ private bool ValidateRequest(Tuple<UnturnedPlayer, UnturnedPlayer> request)
                 return false;
             }
 
+            if (!_configuration.TeleportCombatAllowed)
+            {
+                var combat = GetLastCombat(sender);
+
+                var combatTime = combat.AddSeconds(_configuration.TeleportCombatTime);
+
+                if (combatTime > DateTime.Now)
+                {
+                    var waitTime = (combatTime - DateTime.Now).TotalSeconds;
+
+                    UnturnedChat.Say(sender, _plugin.Translate("TpaValidation:Combat:Sender", Math.Round(waitTime)), true);
+                    UnturnedChat.Say(target, _plugin.Translate("TpaValidation:Combat:Target", sender.DisplayName), true);
+
+                    return false;
+                }
+            }
+            
             return true;
         }
 
@@ -176,19 +209,27 @@ private void OnLeave(UnturnedPlayer player)
             if (cooldown != DateTime.MinValue)
                 _cooldowns.Remove(player);
 
-            var proctection = GetTeleportProtection(player);
+            var protection = GetTeleportProtection(player);
 
-            if (proctection != DateTime.MinValue)
+            if (protection != DateTime.MinValue)
                 _teleportProtections.Remove(player);
+
+            var lastCombat = GetLastCombat(player);
+
+            if (lastCombat != DateTime.MinValue)
+                _playersLastCombat.Remove(player);
         }
 
         private void OnPlayerAllowedToDamagePlayer(Player nativeInstigator, Player nativeVictim, ref bool isAllowed)
         {
+            var instigator = UnturnedPlayer.FromPlayer(nativeInstigator);
+
+            UpdateLastCombat(instigator);
+            
             if (!_configuration.TeleportProtection)
                 return;
 
             var victim = UnturnedPlayer.FromPlayer(nativeVictim);
-            var instigator = UnturnedPlayer.FromPlayer(nativeInstigator);
 
             if (_teleportProtections.ContainsKey(victim))
             {
@@ -218,6 +259,22 @@ private void UpdateCooldown(UnturnedPlayer player)
                 _cooldowns.Add(player, DateTime.Now);
         }
 
+        private void UpdateLastCombat(UnturnedPlayer player)
+        {
+            if(_playersLastCombat.ContainsKey(player))
+                _playersLastCombat[player] = DateTime.Now;
+            else
+                _playersLastCombat.Add(player, DateTime.Now);
+        }
+
+        private DateTime GetLastCombat(UnturnedPlayer player)
+        {
+            if (_playersLastCombat.ContainsKey(player))
+                return _playersLastCombat[player];
+            
+            return DateTime.MinValue;
+        }
+        
         private void UpdateTeleportProtection(UnturnedPlayer player)
         {
             if (_teleportProtections.ContainsKey(player))
@@ -244,6 +301,12 @@ private DateTime GetCooldown(UnturnedPlayer player)
 
         public void Dispose()
         {
+            _teleportRequests = null;
+            _teleportProtections = null;
+            _cooldowns = null;
+            _playersLastCombat = null;
+            _plugin = null;
+            _configuration = null;
             DamageTool.onPlayerAllowedToDamagePlayer -= OnPlayerAllowedToDamagePlayer;
             U.Events.OnPlayerDisconnected -= OnLeave;
         }