diff options
| author | Howaner <franzi.moos@googlemail.com> | 2014-03-15 02:46:18 +0100 |
|---|---|---|
| committer | Howaner <franzi.moos@googlemail.com> | 2014-03-15 02:46:18 +0100 |
| commit | 8316ae330ec06b19caf678b9d499afd198fe5a06 (patch) | |
| tree | 9e120574de49e90f970910ffe743e8169d762ceb /src/Items/ItemThrowable.h | |
| parent | Add item frame saving. (diff) | |
| parent | Ignoring all config and SQLite files in the output folder. (diff) | |
| download | cuberite-8316ae330ec06b19caf678b9d499afd198fe5a06.tar cuberite-8316ae330ec06b19caf678b9d499afd198fe5a06.tar.gz cuberite-8316ae330ec06b19caf678b9d499afd198fe5a06.tar.bz2 cuberite-8316ae330ec06b19caf678b9d499afd198fe5a06.tar.lz cuberite-8316ae330ec06b19caf678b9d499afd198fe5a06.tar.xz cuberite-8316ae330ec06b19caf678b9d499afd198fe5a06.tar.zst cuberite-8316ae330ec06b19caf678b9d499afd198fe5a06.zip | |
Diffstat (limited to 'src/Items/ItemThrowable.h')
| -rw-r--r-- | src/Items/ItemThrowable.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Items/ItemThrowable.h b/src/Items/ItemThrowable.h index 46049f961..c6a4e714e 100644 --- a/src/Items/ItemThrowable.h +++ b/src/Items/ItemThrowable.h @@ -35,7 +35,7 @@ public: 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, &Speed); + a_World->CreateProjectile(Pos.x, Pos.y, Pos.z, m_ProjectileKind, a_Player, a_Player->GetEquippedItem(), &Speed); return true; } @@ -127,13 +127,13 @@ 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_Player->IsGameModeCreative()) { a_Player->GetInventory().RemoveOneEquippedItem(); } - a_World->CreateProjectile(a_BlockX + 0.5, a_BlockY + 1, a_BlockZ + 0.5, m_ProjectileKind, a_Player, 0); - return true; } |