nalc/factions
1
0
Fork 0
forked from mtcontrib/factions
Code Issues Pull Requests Releases Wiki Activity

Update chatcommands.lua

Browse Source
This commit is contained in:
agrecascino 2016-08-19 22:50:39 -04:00 committed by GitHub
parent fca049d379
commit 42505ab744
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
chatcommands.lua
View File

@ -248,15 +248,9 @@ factions.register_command("kick", {
description = "Kick a player from your faction.", description = "Kick a player from your faction.",
on_success = function(player, faction, pos, parcelpos, args) on_success = function(player, faction, pos, parcelpos, args)
local victim = args.players[1] local victim = args.players[1]
<<<<<<< HEAD
if factions.players[victim:get_player_name()] == faction.name
and victim:get_player_name() ~= faction.leader then -- can't kick da king
faction:remove_player(victim)
=======
local victim_faction = factions.get_player_faction(victim:get_player_name()) local victim_faction = factions.get_player_faction(victim:get_player_name())
if victim_faction and victim:get_player_name() ~= faction.leader then -- can't kick da king if victim_faction and victim:get_player_name() ~= faction.leader then -- can't kick da king
faction:remove_player(player) faction:remove_player(player)
>>>>>>> 4d53e4cc4017fc499bf9c966cd3a6de5cacbe0e8
return true return true
elseif not victim_faction then elseif not victim_faction then
send_error(player, victim:get_player_name().." is not in your faction.") send_error(player, victim:get_player_name().." is not in your faction.")