diff options
| author | Mattes D <github@xoft.cz> | 2014-05-06 21:44:55 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-05-06 21:44:55 +0200 |
| commit | e400b1acd8b0c1457f33bc1730996a3530fa0a4f (patch) | |
| tree | cd26c0d2b87b62882bcc7b64503de408dd391e6f /src/Items/ItemThrowable.h | |
| parent | Changed cPieceGenerator to support pairings. (diff) | |
| parent | Merge branch 'master' into fixes (diff) | |
| download | cuberite-e400b1acd8b0c1457f33bc1730996a3530fa0a4f.tar cuberite-e400b1acd8b0c1457f33bc1730996a3530fa0a4f.tar.gz cuberite-e400b1acd8b0c1457f33bc1730996a3530fa0a4f.tar.bz2 cuberite-e400b1acd8b0c1457f33bc1730996a3530fa0a4f.tar.lz cuberite-e400b1acd8b0c1457f33bc1730996a3530fa0a4f.tar.xz cuberite-e400b1acd8b0c1457f33bc1730996a3530fa0a4f.tar.zst cuberite-e400b1acd8b0c1457f33bc1730996a3530fa0a4f.zip | |
Diffstat (limited to 'src/Items/ItemThrowable.h')
| -rw-r--r-- | src/Items/ItemThrowable.h | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/Items/ItemThrowable.h b/src/Items/ItemThrowable.h index c6a4e714e..35c2b8731 100644 --- a/src/Items/ItemThrowable.h +++ b/src/Items/ItemThrowable.h @@ -28,15 +28,19 @@ public: virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override { + Vector3d Pos = a_Player->GetThrowStartPos(); + Vector3d Speed = a_Player->GetLookVector() * m_SpeedCoeff; + + if (a_World->CreateProjectile(Pos.x, Pos.y, Pos.z, m_ProjectileKind, a_Player, a_Player->GetEquippedItem(), &Speed) < 0) + { + return false; + } + if (!a_Player->IsGameModeCreative()) { a_Player->GetInventory().RemoveOneEquippedItem(); } - Vector3d Pos = a_Player->GetThrowStartPos(); - Vector3d Speed = a_Player->GetLookVector() * m_SpeedCoeff; - a_World->CreateProjectile(Pos.x, Pos.y, Pos.z, m_ProjectileKind, a_Player, a_Player->GetEquippedItem(), &Speed); - return true; } @@ -127,7 +131,10 @@ public: return false; } - a_World->CreateProjectile(a_BlockX + 0.5, a_BlockY + 1, a_BlockZ + 0.5, m_ProjectileKind, a_Player, a_Player->GetEquippedItem()); + if (a_World->CreateProjectile(a_BlockX + 0.5, a_BlockY + 1, a_BlockZ + 0.5, m_ProjectileKind, a_Player, a_Player->GetEquippedItem()) < 0) + { + return false; + } if (!a_Player->IsGameModeCreative()) { |