From b7d574ba6b51ae4724a53b7208af42d279ff96c2 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 5 Jan 2018 13:28:49 +0000 Subject: [PATCH] Fixed Self Bug --- Addons/Commands/kill.lua | 3 +-- Addons/Commands/tags.lua | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Addons/Commands/kill.lua b/Addons/Commands/kill.lua index d1a788b8..6d68f03b 100644 --- a/Addons/Commands/kill.lua +++ b/Addons/Commands/kill.lua @@ -12,8 +12,7 @@ commands.add_command('kill', 'Kills a player, must be either yourself (/kill sel local _player = Game.get_player(event) local player = Game.get_player(args.player) if args.player ~= 'self' and not player then player_return({'commands.invalid-player',args.player}) return commands.error end - if _player.name == player.name or args.player == 'self' then - if _player.connected then else player_return({'commands.offline-player'}) return commands.error end + if args.player == 'self' or _player.name == player.name then if _player.character then _player.character.die() else player_return({'commands.dead-player'}) return commands.error end elseif Ranking.get_rank(player).power > Ranking.get_rank(_player).power then if player.connected then else player_return({'commands.offline-player'}) return commands.error end diff --git a/Addons/Commands/tags.lua b/Addons/Commands/tags.lua index 51f5a0c8..c4ac3758 100644 --- a/Addons/Commands/tags.lua +++ b/Addons/Commands/tags.lua @@ -24,7 +24,7 @@ commands.add_command('tag-clear', 'Removes a custom tag. Player can be self (/ta local player = Game.get_player(args.player) local rank = Ranking.get_rank(player) if args.player ~= 'self' and not player then player_return({'commands.invalid-player',args.player}) return commands.error end - if _player.name == player.name or args.player == 'self' then _player.tag = _rank.tag + if args.player == 'self' or _player.name == player.name then _player.tag = _rank.tag elseif _rank.power < rank.power then player.tag = rank.tag else player_return({'commands.unauthorized'}) return commands.error end end) \ No newline at end of file