diff options
| author | Damián Imrich <damian@haze.sk> | 2021-04-03 19:45:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-03 19:45:20 +0200 |
| commit | 071b7be3d4d08c337c01de7abca034e6c3746194 (patch) | |
| tree | b878b6df8abe69493d61098610738edb8d95a82b /src/Entities/Entity.cpp | |
| parent | Fix finisher generating invalid pumpkin (diff) | |
| download | cuberite-071b7be3d4d08c337c01de7abca034e6c3746194.tar cuberite-071b7be3d4d08c337c01de7abca034e6c3746194.tar.gz cuberite-071b7be3d4d08c337c01de7abca034e6c3746194.tar.bz2 cuberite-071b7be3d4d08c337c01de7abca034e6c3746194.tar.lz cuberite-071b7be3d4d08c337c01de7abca034e6c3746194.tar.xz cuberite-071b7be3d4d08c337c01de7abca034e6c3746194.tar.zst cuberite-071b7be3d4d08c337c01de7abca034e6c3746194.zip | |
Diffstat (limited to 'src/Entities/Entity.cpp')
| -rw-r--r-- | src/Entities/Entity.cpp | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp index f1d8c989d..a6f7dd58c 100644 --- a/src/Entities/Entity.cpp +++ b/src/Entities/Entity.cpp @@ -59,6 +59,8 @@ cEntity::cEntity(eEntityType a_EntityType, Vector3d a_Pos, double a_Width, doubl m_IsInLava(false), m_IsInWater(false), m_IsHeadInWater(false), + m_Width(a_Width), + m_Height(a_Height), m_AirLevel(MAX_AIR_LEVEL), m_AirTickTimer(DROWNING_TICKS), m_TicksAlive(0), @@ -69,8 +71,6 @@ cEntity::cEntity(eEntityType a_EntityType, Vector3d a_Pos, double a_Width, doubl m_Position(a_Pos), m_WaterSpeed(0, 0, 0), m_Mass (0.001), // Default 1g - m_Width(a_Width), - m_Height(a_Height), m_InvulnerableTicks(0) { m_WorldChangeInfo.m_NewWorld = nullptr; @@ -2028,15 +2028,6 @@ void cEntity::SetHeadYaw(double a_HeadYaw) -void cEntity::SetHeight(double a_Height) -{ - m_Height = a_Height; -} - - - - - void cEntity::SetMass(double a_Mass) { // Make sure that mass is not zero. 1g is the default because we @@ -2118,15 +2109,6 @@ void cEntity::SetSpeedZ(double a_SpeedZ) -void cEntity::SetWidth(double a_Width) -{ - m_Width = a_Width; -} - - - - - void cEntity::AddSpeed(double a_AddSpeedX, double a_AddSpeedY, double a_AddSpeedZ) { SetSpeed(m_Speed.x + a_AddSpeedX, m_Speed.y + a_AddSpeedY, m_Speed.z + a_AddSpeedZ); |