diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2013-05-24 09:30:39 +0200 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2013-05-24 09:30:39 +0200 |
| commit | cf87169737fdeeee7d4b160688bbed7194e46147 (patch) | |
| tree | 7daaeb9af8e3187cde6068c3cff5ff0ee64f0067 /MCServer/Plugins | |
| parent | Added ItemCategory::IsArmor() (diff) | |
| download | cuberite-cf87169737fdeeee7d4b160688bbed7194e46147.tar cuberite-cf87169737fdeeee7d4b160688bbed7194e46147.tar.gz cuberite-cf87169737fdeeee7d4b160688bbed7194e46147.tar.bz2 cuberite-cf87169737fdeeee7d4b160688bbed7194e46147.tar.lz cuberite-cf87169737fdeeee7d4b160688bbed7194e46147.tar.xz cuberite-cf87169737fdeeee7d4b160688bbed7194e46147.tar.zst cuberite-cf87169737fdeeee7d4b160688bbed7194e46147.zip | |
Diffstat (limited to '')
| -rw-r--r-- | MCServer/Plugins/Core/item.lua | 43 | ||||
| -rw-r--r-- | MCServer/Plugins/Debuggers/Debuggers.lua | 8 |
2 files changed, 27 insertions, 24 deletions
diff --git a/MCServer/Plugins/Core/item.lua b/MCServer/Plugins/Core/item.lua index 00a6aa790..30e8820a9 100644 --- a/MCServer/Plugins/Core/item.lua +++ b/MCServer/Plugins/Core/item.lua @@ -1,36 +1,39 @@ -function HandleItemCommand( Split, Player )
- if( #Split ~= 2 and #Split ~=3 ) then
- Player:SendMessage( cChatColor.Green .. "Usage: /item [ItemType/Name:Dmg] <Amount>" )
- return true
+function HandleItemCommand(Split, Player)
+ if ((#Split ~= 2) and (#Split ~=3)) then
+ Player:SendMessage(cChatColor.Green .. "Usage: /item [ItemType/Name:Dmg] <Amount>");
+ return true;
end
- local Item = cItem(E_ITEM_EMPTY, 1)
- local FoundItem = StringToItem( Split[2], Item )
+ local Item = cItem(E_ITEM_EMPTY, 1);
+ local FoundItem = StringToItem(Split[2], Item);
- if( IsValidItem( Item.m_ItemType ) == false ) then -- StringToItem does not check if item is valid
+ if not(IsValidItem(Item.m_ItemType)) then -- StringToItem does not check if item is valid
FoundItem = false
end
- if( FoundItem == false ) then
+ if not(FoundItem) then
Player:SendMessage( cChatColor.Green .. "Invalid Item type / name !" )
return true
end
- if( #Split == 3 ) then
- ItemAmount = tonumber( Split[3] )
- if( ItemAmount == nil or ItemAmount < 1 or ItemAmount > 512 ) then
- Player:SendMessage( cChatColor.Green .. "Invalid Amount !" )
- return true
- else
- Item.m_ItemCount = ItemAmount
+ local ItemAmount = 1;
+ if (#Split == 3) then
+ ItemAmount = tonumber(Split[3]);
+ if ((ItemAmount == nil) or (ItemAmount < 1) or (ItemAmount > 512)) then
+ Player:SendMessage(cChatColor.Green .. "Invalid Amount!");
+ return true;
end
end
- if( Player:GetInventory():AddItem( Item ) == true ) then
- Player:SendMessage( cChatColor.Green .. "There you go !" )
- LOG("Gave " .. Player:GetName() .. " " .. Item.m_ItemCount .. " times " .. Item.m_ItemType .. ":" .. Item.m_ItemDamage)
+ Item.m_ItemCount = ItemAmount;
+
+ local ItemsGiven = Player:GetInventory():AddItem(Item);
+ if (ItemsGiven == ItemAmount) then
+ Player:SendMessage( cChatColor.Green .. "There you go !");
+ LOG("Gave " .. Player:GetName() .. " " .. Item.m_ItemCount .. " times " .. Item.m_ItemType .. ":" .. Item.m_ItemDamage);
else
- Player:SendMessage( cChatColor.Green .. "Not enough space in inventory !" )
+ Player:SendMessage(cChatColor.Green .. "Not enough space in inventory, only gave " .. ItemsGiven);
+ LOG("Player " .. Player:GetName() .. " asked for " .. Item.m_ItemCount .. " times " .. Item.m_ItemType .. ":" .. Item.m_ItemDamage ..", but only could fit " .. ItemsGiven);
end
- return true
+ return true;
end
\ No newline at end of file diff --git a/MCServer/Plugins/Debuggers/Debuggers.lua b/MCServer/Plugins/Debuggers/Debuggers.lua index 21cc4bb86..3f6dcfb7e 100644 --- a/MCServer/Plugins/Debuggers/Debuggers.lua +++ b/MCServer/Plugins/Debuggers/Debuggers.lua @@ -456,10 +456,10 @@ end function HandleWoolCmd(Split, Player)
local Wool = cItem(E_BLOCK_WOOL, 1, E_META_WOOL_BLUE);
- Player:GetInventory():SetSlot(5, Wool);
- Player:GetInventory():SetSlot(6, Wool);
- Player:GetInventory():SetSlot(7, Wool);
- Player:GetInventory():SetSlot(8, Wool);
+ Player:GetInventory():SetArmorSlot(0, Wool);
+ Player:GetInventory():SetArmorSlot(1, Wool);
+ Player:GetInventory():SetArmorSlot(2, Wool);
+ Player:GetInventory():SetArmorSlot(3, Wool);
Player:SendMessage("You have been bluewooled :)");
return true;
end
\ No newline at end of file |