summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2013-11-02 17:01:40 +0100
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2013-11-02 17:01:40 +0100
commitf38375a2ecaca692f905d687101315b801c3e724 (patch)
tree65a8c524577e76cf353f7478ab1f869bfe4bd2db
parentFixed dropspensing speed and position (diff)
downloadcuberite-f38375a2ecaca692f905d687101315b801c3e724.tar
cuberite-f38375a2ecaca692f905d687101315b801c3e724.tar.gz
cuberite-f38375a2ecaca692f905d687101315b801c3e724.tar.bz2
cuberite-f38375a2ecaca692f905d687101315b801c3e724.tar.lz
cuberite-f38375a2ecaca692f905d687101315b801c3e724.tar.xz
cuberite-f38375a2ecaca692f905d687101315b801c3e724.tar.zst
cuberite-f38375a2ecaca692f905d687101315b801c3e724.zip
-rw-r--r--source/Entities/Player.cpp2
-rw-r--r--source/Items/ItemBow.h6
2 files changed, 6 insertions, 2 deletions
diff --git a/source/Entities/Player.cpp b/source/Entities/Player.cpp
index ffd829663..2e4199629 100644
--- a/source/Entities/Player.cpp
+++ b/source/Entities/Player.cpp
@@ -318,7 +318,7 @@ void cPlayer::SetTouchGround(bool a_bTouchGround)
(BlockType == E_BLOCK_STATIONARY_WATER) ||
(BlockType == E_BLOCK_LADDER) ||
(BlockType == E_BLOCK_VINES)
- )
+ )
{
m_LastGroundHeight = (float)GetPosY();
}
diff --git a/source/Items/ItemBow.h b/source/Items/ItemBow.h
index 1add0dc6d..7bce127b1 100644
--- a/source/Items/ItemBow.h
+++ b/source/Items/ItemBow.h
@@ -71,7 +71,11 @@ public:
return;
}
a_Player->GetWorld()->BroadcastSpawnEntity(*Arrow);
- a_Player->UseEquippedItem();
+
+ if (!a_Player->IsGameModeCreative())
+ {
+ a_Player->UseEquippedItem();
+ }
}
} ;