diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-10-18 21:41:29 +0200 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-10-18 21:41:29 +0200 |
| commit | c68aa68c699a618d0172bceacf553ab96fc32cdd (patch) | |
| tree | a2eb1d2e76ea183f2c0aee66accd98beeba48e0d /source/Items/ItemLighter.h | |
| parent | Fixed item damage value not being read from the 1.3.2 protocol (wtf, why was it disabled?) (diff) | |
| download | cuberite-c68aa68c699a618d0172bceacf553ab96fc32cdd.tar cuberite-c68aa68c699a618d0172bceacf553ab96fc32cdd.tar.gz cuberite-c68aa68c699a618d0172bceacf553ab96fc32cdd.tar.bz2 cuberite-c68aa68c699a618d0172bceacf553ab96fc32cdd.tar.lz cuberite-c68aa68c699a618d0172bceacf553ab96fc32cdd.tar.xz cuberite-c68aa68c699a618d0172bceacf553ab96fc32cdd.tar.zst cuberite-c68aa68c699a618d0172bceacf553ab96fc32cdd.zip | |
Diffstat (limited to 'source/Items/ItemLighter.h')
| -rw-r--r-- | source/Items/ItemLighter.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/source/Items/ItemLighter.h b/source/Items/ItemLighter.h index 92279aafa..afa6c4fd5 100644 --- a/source/Items/ItemLighter.h +++ b/source/Items/ItemLighter.h @@ -7,19 +7,24 @@ class cItemLighterHandler : public cItemHandler
{
public:
- cItemLighterHandler(int a_ItemID)
- : cItemHandler(a_ItemID)
+ cItemLighterHandler(int a_ItemType)
+ : cItemHandler(a_ItemType)
{
}
- virtual bool OnItemUse(cWorld *a_World, cPlayer *a_Player, cItem *a_Item, int a_X, int a_Y, int a_Z, char a_Dir) override
+ virtual bool OnItemUse(cWorld *a_World, cPlayer *a_Player, cItem *a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Dir) override
{
+ if (a_Dir < 0)
+ {
+ return false;
+ }
+
a_Player->UseEquippedItem();
- AddDirection(a_X, a_Y, a_Z, a_Dir);
+ AddDirection(a_BlockX, a_BlockY, a_BlockZ, a_Dir);
- a_World->SetBlock(a_X, a_Y, a_Z, E_BLOCK_FIRE, 0); //0 -> new fire TODO: Make Firesimulator use this
+ a_World->SetBlock(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_FIRE, 0); //0 -> new fire TODO: Make Firesimulator use this
return false;
}
|