Add a whitelist check for PlyTransfer

Wolflix · Jul 12, 2020 · 2083e5b · 2083e5b
1 parent 5a203e6
commit 2083e5b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/gamemode/core/sh_commands.lua b/gamemode/core/sh_commands.lua
@@ -716,15 +716,21 @@ ix.command.Add("PlyTransfer", {
 		end
 
 		if (faction) then
-			target.vars.faction = faction.uniqueID
-			target:SetFaction(faction.index)
+			local bHasWhitelist = client:HasWhitelist(faction.index)
 
-			if (faction.OnTransferred) then
-				faction:OnTransferred(target)
-			end
+			if (bHasWhitelist) then
+				target.vars.faction = faction.uniqueID
+				target:SetFaction(faction.index)
+
+				if (faction.OnTransferred) then
+					faction:OnTransferred(target)
+				end
 
-			for _, v in ipairs(player.GetAll()) do
-				v:NotifyLocalized("cChangeFaction", client:GetName(), target:GetName(), L(faction.name, v))
+				for _, v in ipairs(player.GetAll()) do
+					v:NotifyLocalized("cChangeFaction", client:GetName(), target:GetName(), L(faction.name, v))
+				end
+			else
+				return "@charNotWhitelisted", target:GetName(), L(faction.name, client)
 			end
 		else
 			return "@invalidFaction"

diff --git a/gamemode/languages/sh_english.lua b/gamemode/languages/sh_english.lua
@@ -184,6 +184,7 @@ LANGUAGE = {
 	whitelist = "%s has whitelisted %s for the %s faction.",
 	unwhitelist = "%s has unwhitelisted %s from the %s faction.",
 	noWhitelist = "You do not have the whitelist for this character!",
+	charNotWhitelisted = "%s is not whitelisted for the %s faction.",
 	gettingUp = "You are now getting up...",
 	wakingUp = "You are regaining consciousness...",
 	Weapons = "Weapons",