From 2ec8581c52119f6b3b2b09572379cccf12a55842 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 14 Aug 2020 02:35:04 +0100 Subject: [PATCH] Fixed clear-inv --- config/expcore/command_role_parse.lua | 4 ++-- modules/commands/clear-inventory.lua | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/config/expcore/command_role_parse.lua b/config/expcore/command_role_parse.lua index 211fbc15..9faabf94 100644 --- a/config/expcore/command_role_parse.lua +++ b/config/expcore/command_role_parse.lua @@ -44,11 +44,11 @@ end) Commands.add_parse('player-role-online',function(input, player, reject) local input_player = Commands.parse('player-role',input, player, reject) if not input_player then return end -- nil check - return Commands.parse('player-online',input_player, player, reject) + return Commands.parse('player-online',input_player.name, player, reject) end) Commands.add_parse('player-role-alive',function(input, player, reject) local input_player = Commands.parse('player-role',input, player, reject) if not input_player then return end -- nil check - return Commands.parse('player-alive',input_player, player, reject) + return Commands.parse('player-alive',input_player.name, player, reject) end) \ No newline at end of file diff --git a/modules/commands/clear-inventory.lua b/modules/commands/clear-inventory.lua index 806badeb..04155978 100644 --- a/modules/commands/clear-inventory.lua +++ b/modules/commands/clear-inventory.lua @@ -11,10 +11,13 @@ require 'config.expcore.command_role_parse' -- @command clear-inventory -- @tparam LuaPlayer player the player to clear the inventory of Commands.new_command('clear-inventory', 'Clears a players inventory') -:add_param('player', false, 'player-role-alive') +:add_param('player', false, 'player-role') :add_alias('clear-inv', 'move-inventory', 'move-inv') :register(function(_, player) local inv = player.get_main_inventory() + if not inv then + return Commands.error{'expcore-commands.reject-player-alive'} + end move_items(inv.get_contents()) inv.clear() end) \ No newline at end of file