Improved permission

Freenex1911 · Nov 26, 2015 · 97df181 · 97df181
1 parent 92eaf44
commit 97df181
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 19 deletions.
diff --git a/Hitman.cs b/Hitman.cs
@@ -70,25 +70,25 @@ private void UnturnedPlayerEvents_OnPlayerDeath(UnturnedPlayer player, SDG.Untur
             }
             catch { return; }
 
-            if (UPmurderer.HasPermission("hitman.member"))
-            {
-				if (Hitman.Instance.HitmanDatabase.CheckExists(player.CSteamID))
-                {
-                    decimal amount = HitmanDatabase.GetBounty(player.CSteamID);
-                    Uconomy.Instance.Database.IncreaseBalance(UPmurderer.Id, amount);
-                    Hitman.Instance.HitmanDatabase.RemoveVictimAccount(player.CSteamID);
-                    UnturnedChat.Say(Hitman.Instance.Translations.Instance.Translate("hitman_general_chat_received", UPmurderer.DisplayName, player.DisplayName, amount, 100), UnityEngine.Color.yellow);
-                }
-            }
-            else if (UPmurderer.HasPermission("hitman.receive"))
+
+            foreach (string playerPermission in UPmurderer.GetPermissions())
             {
-                if (Hitman.Instance.HitmanDatabase.CheckExists(player.CSteamID))
+                if (playerPermission.ToLower().Contains("hitman.receive."))
                 {
-                    decimal amount = HitmanDatabase.GetBounty(player.CSteamID);
-                    amount = System.Math.Round(amount * (Hitman.Instance.Configuration.Instance.DefaultPercentage / 100), 2);
-                    Uconomy.Instance.Database.IncreaseBalance(UPmurderer.Id, amount);
-                    Hitman.Instance.HitmanDatabase.RemoveVictimAccount(player.CSteamID);
-                    UnturnedChat.Say(Hitman.Instance.Translations.Instance.Translate("hitman_general_chat_received", UPmurderer.DisplayName, player.DisplayName, amount, Hitman.Instance.Configuration.Instance.DefaultPercentage), UnityEngine.Color.yellow);
+                    string BountyPermission = playerPermission.Replace("hitman.receive.", string.Empty);
+                    uint BountyPercentage;
+
+                    bool isPercentageNumeric = uint.TryParse(BountyPermission, out BountyPercentage);
+                    if (!isPercentageNumeric) { Logger.LogError(BountyPermission + " is not numeric."); return; }
+
+                    if (Hitman.Instance.HitmanDatabase.CheckExists(player.CSteamID))
+                    {
+                        decimal amount = HitmanDatabase.GetBounty(player.CSteamID);
+                        amount = System.Math.Round(amount * (BountyPercentage / 100), 2);
+                        Uconomy.Instance.Database.IncreaseBalance(UPmurderer.Id, amount);
+                        Hitman.Instance.HitmanDatabase.RemoveVictimAccount(player.CSteamID);
+                        UnturnedChat.Say(Hitman.Instance.Translations.Instance.Translate("hitman_general_chat_received", UPmurderer.DisplayName, player.DisplayName, amount, BountyPercentage), UnityEngine.Color.yellow);
+                    }
                 }
             }
         }

diff --git a/HitmanConfiguration.cs b/HitmanConfiguration.cs
@@ -12,7 +12,6 @@ public class HitmanConfiguration : IRocketPluginConfiguration
         public int DatabasePort;
 
         public decimal MinimumBounty;
-        public decimal DefaultPercentage;
 
         public void LoadDefaults()
         {
@@ -23,7 +22,6 @@ public void LoadDefaults()
             DatabaseTableName = "hitman";
             DatabasePort = 3306;
             MinimumBounty = 100;
-            DefaultPercentage = 85;
         }
     }
 }