summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2013-09-11 21:07:51 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2013-09-11 21:07:51 +0200
commit3a1def2c905a8e6d8807d14c5953cceb04f6b8a6 (patch)
treea14f535e2121b38b2b188a52471c137fc5358d87 /source
parentPumpkins (diff)
downloadcuberite-3a1def2c905a8e6d8807d14c5953cceb04f6b8a6.tar
cuberite-3a1def2c905a8e6d8807d14c5953cceb04f6b8a6.tar.gz
cuberite-3a1def2c905a8e6d8807d14c5953cceb04f6b8a6.tar.bz2
cuberite-3a1def2c905a8e6d8807d14c5953cceb04f6b8a6.tar.lz
cuberite-3a1def2c905a8e6d8807d14c5953cceb04f6b8a6.tar.xz
cuberite-3a1def2c905a8e6d8807d14c5953cceb04f6b8a6.tar.zst
cuberite-3a1def2c905a8e6d8807d14c5953cceb04f6b8a6.zip
Diffstat (limited to '')
-rw-r--r--source/Blocks/BlockPumpkin.h5
-rw-r--r--source/Entities/Entity.cpp2
2 files changed, 3 insertions, 4 deletions
diff --git a/source/Blocks/BlockPumpkin.h b/source/Blocks/BlockPumpkin.h
index b74d60a85..76abc6818 100644
--- a/source/Blocks/BlockPumpkin.h
+++ b/source/Blocks/BlockPumpkin.h
@@ -28,10 +28,9 @@ public:
inline static NIBBLETYPE PlayerYawToMetaData(double a_Yaw)
{
-
ASSERT((a_Yaw >= -180) && (a_Yaw < 180));
- a_Yaw -= 180;
- a_Yaw += 360 + 45;
+
+ a_Yaw += 180 + 45;
if (a_Yaw > 360)
{
a_Yaw -= 360;
diff --git a/source/Entities/Entity.cpp b/source/Entities/Entity.cpp
index 846d756dd..3d6c2887a 100644
--- a/source/Entities/Entity.cpp
+++ b/source/Entities/Entity.cpp
@@ -498,7 +498,7 @@ void cEntity::HandlePhysics(float a_Dt, cChunk & a_Chunk)
{
// Outside of the world
- cChunk * NextChunk = a_Chunk.GetNeighborChunk(BlockX,BlockZ);
+ cChunk * NextChunk = a_Chunk.GetNeighborChunk(BlockX, BlockZ);
// See if we can commit our changes. If not, we will discard them.
if (NextChunk != NULL)
{