flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fix Cauldron

Browse Source
This commit is contained in:
Howaner 2014-02-20 20:58:23 +01:00
parent 5e7f2ba6d6
commit 1016922012
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Blocks/BlockCauldron.h
View File

@ -21,19 +21,22 @@ public:
a_Pickups.push_back(cItem(E_ITEM_CAULDRON, 1, 0)); a_Pickups.push_back(cItem(E_ITEM_CAULDRON, 1, 0));
} }
void OnUse(cChunkInterface * a_ChunkInterface, cWorldInterface * a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ) virtual void OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) override
{ {
char Meta = a_ChunkInterface->GetBlockMeta( a_BlockX, a_BlockY, a_BlockZ ); char Meta = a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ);
switch( a_Player->GetEquippedItem().m_ItemType ) switch (a_Player->GetEquippedItem().m_ItemType)
{ {
case E_ITEM_WATER_BUCKET: case E_ITEM_WATER_BUCKET:
{ {
if (Meta < 3) if (Meta < 3)
{ {
a_ChunkInterface->SetBlockMeta( a_BlockX, a_BlockY, a_BlockZ, 3 ); a_ChunkInterface.SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, 3);
a_Player->GetInventory().RemoveOneEquippedItem(); if (!a_Player->IsGameModeCreative())
cItem NewItem(E_ITEM_BUCKET, 1); {
a_Player->GetInventory().AddItem(NewItem); a_Player->GetInventory().RemoveOneEquippedItem();
cItem NewItem(E_ITEM_BUCKET, 1);
a_Player->GetInventory().AddItem(NewItem);
}
} }
break; break;
} }
@ -41,7 +44,7 @@ public:
{ {
if (Meta > 0) if (Meta > 0)
{ {
a_ChunkInterface->SetBlockMeta( a_BlockX, a_BlockY, a_BlockZ, --Meta); a_ChunkInterface.SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, --Meta);
a_Player->GetInventory().RemoveOneEquippedItem(); a_Player->GetInventory().RemoveOneEquippedItem();
cItem NewItem(E_ITEM_POTIONS, 1, 0); cItem NewItem(E_ITEM_POTIONS, 1, 0);
a_Player->GetInventory().AddItem(NewItem); a_Player->GetInventory().AddItem(NewItem);