diff options
| author | Mattes D <github@xoft.cz> | 2020-04-09 22:25:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-09 22:25:20 +0200 |
| commit | bdedab15c94956cbc74045ab242fd300d25f39e7 (patch) | |
| tree | 900c4e7f662388e29405ccf059fcab767bbd8046 /src/Entities | |
| parent | Wolves and mooshrooms are passive mobs (diff) | |
| download | cuberite-bdedab15c94956cbc74045ab242fd300d25f39e7.tar cuberite-bdedab15c94956cbc74045ab242fd300d25f39e7.tar.gz cuberite-bdedab15c94956cbc74045ab242fd300d25f39e7.tar.bz2 cuberite-bdedab15c94956cbc74045ab242fd300d25f39e7.tar.lz cuberite-bdedab15c94956cbc74045ab242fd300d25f39e7.tar.xz cuberite-bdedab15c94956cbc74045ab242fd300d25f39e7.tar.zst cuberite-bdedab15c94956cbc74045ab242fd300d25f39e7.zip | |
Diffstat (limited to 'src/Entities')
| -rw-r--r-- | src/Entities/FallingBlock.cpp | 7 | ||||
| -rw-r--r-- | src/Entities/FallingBlock.h | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/Entities/FallingBlock.cpp b/src/Entities/FallingBlock.cpp index 628e4d34c..18cd3e086 100644 --- a/src/Entities/FallingBlock.cpp +++ b/src/Entities/FallingBlock.cpp @@ -11,11 +11,10 @@ -cFallingBlock::cFallingBlock(Vector3i a_BlockPosition, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) : - super(etFallingBlock, Vector3d(0.5, 0, 0.5) + a_BlockPosition, 0.98, 0.98), +cFallingBlock::cFallingBlock(Vector3d a_Position, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta): + super(etFallingBlock, a_Position, 0.98, 0.98), m_BlockType(a_BlockType), - m_BlockMeta(a_BlockMeta), - m_OriginalPosition(a_BlockPosition) + m_BlockMeta(a_BlockMeta) { SetGravity(-16.0f); SetAirDrag(0.02f); diff --git a/src/Entities/FallingBlock.h b/src/Entities/FallingBlock.h index e4e9582d8..dfac287fd 100644 --- a/src/Entities/FallingBlock.h +++ b/src/Entities/FallingBlock.h @@ -20,8 +20,8 @@ public: // tolua_export CLASS_PROTODEF(cFallingBlock) /** Creates a new falling block. - a_BlockPosition is expected in world coords */ - cFallingBlock(Vector3i a_BlockPosition, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta); + a_Position is expected in world coords */ + cFallingBlock(Vector3d a_Position, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta); // tolua_begin @@ -37,7 +37,6 @@ public: // tolua_export private: BLOCKTYPE m_BlockType; NIBBLETYPE m_BlockMeta; - Vector3i m_OriginalPosition; // Position where the falling block has started, in world coords } ; // tolua_export |