Fix /give(me) commands a bit in default mod

This commit is contained in:
Perttu Ahola 2011-12-02 02:17:01 +02:00
parent dc05b106f2
commit 89bc306632
1 changed files with 10 additions and 6 deletions

View File

@ -1448,14 +1448,18 @@ minetest.register_on_chat_message(function(name, message)
minetest.chat_send_player(name, "you don't have permission to give") minetest.chat_send_player(name, "you don't have permission to give")
return true -- Handled chat message return true -- Handled chat message
end end
stackstring = string.match(message, cmd.." (.*)") local stackstring = string.match(message, cmd.." (.*)")
if stackstring == nil then if stackstring == nil then
minetest.chat_send_player(name, 'usage: '..cmd..' stackstring') minetest.chat_send_player(name, 'usage: '..cmd..' stackstring')
return true -- Handled chat message return true -- Handled chat message
end end
print(cmd..' invoked, stackstring="'..stackstring..'"') print(cmd..' invoked, stackstring="'..stackstring..'"')
player = minetest.env:get_player_by_name(name) local player = minetest.env:get_player_by_name(name)
added, error_msg = player:add_to_inventory(stackstring) if player == nil then
minetest.chat_send_player(name, name2..' is not a known player')
return true -- Handled chat message
end
local added, error_msg = player:add_to_inventory(stackstring)
if added then if added then
minetest.chat_send_player(name, '"'..stackstring minetest.chat_send_player(name, '"'..stackstring
..'" added to inventory.'); ..'" added to inventory.');
@ -1473,19 +1477,19 @@ minetest.register_on_chat_message(function(name, message)
minetest.chat_send_player(name, "you don't have permission to give") minetest.chat_send_player(name, "you don't have permission to give")
return true -- Handled chat message return true -- Handled chat message
end end
name2, stackstring = string.match(message, cmd.." ([%a%d_-]+) (.*)") local name2, stackstring = string.match(message, cmd.." ([%a%d_-]+) (.*)")
if name == nil or stackstring == nil then if name == nil or stackstring == nil then
minetest.chat_send_player(name, 'usage: '..cmd..' name stackstring') minetest.chat_send_player(name, 'usage: '..cmd..' name stackstring')
return true -- Handled chat message return true -- Handled chat message
end end
print(cmd..' invoked, name2="'..name2 print(cmd..' invoked, name2="'..name2
..'" stackstring="'..stackstring..'"') ..'" stackstring="'..stackstring..'"')
player = minetest.env:get_player_by_name(name2) local player = minetest.env:get_player_by_name(name2)
if player == nil then if player == nil then
minetest.chat_send_player(name, name2..' is not a known player') minetest.chat_send_player(name, name2..' is not a known player')
return true -- Handled chat message return true -- Handled chat message
end end
added, error_msg = player:add_to_inventory(stackstring) local added, error_msg = player:add_to_inventory(stackstring)
if added then if added then
minetest.chat_send_player(name, '"'..stackstring minetest.chat_send_player(name, '"'..stackstring
..'" added to '..name2..'\'s inventory.'); ..'" added to '..name2..'\'s inventory.');