diff options
author | Mattes D <github@xoft.cz> | 2020-04-13 18:38:06 +0200 |
---|---|---|
committer | Alexander Harkness <me@bearbin.net> | 2020-04-16 22:07:48 +0200 |
commit | 9ee47e59995f858ec531b3ee467f131594e4ba1f (patch) | |
tree | f005d8af4a0362d7eab8a96a71aca0d73275f8e1 /src/Entities/Pawn.cpp | |
parent | Prevent crash when breeding (diff) | |
download | cuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.tar cuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.tar.gz cuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.tar.bz2 cuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.tar.lz cuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.tar.xz cuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.tar.zst cuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.zip |
Diffstat (limited to '')
-rw-r--r-- | src/Entities/Pawn.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Entities/Pawn.cpp b/src/Entities/Pawn.cpp index 9481daa8c..109a1c70e 100644 --- a/src/Entities/Pawn.cpp +++ b/src/Entities/Pawn.cpp @@ -15,7 +15,7 @@ cPawn::cPawn(eEntityType a_EntityType, double a_Width, double a_Height) : - super(a_EntityType, Vector3d(), a_Width, a_Height), + Super(a_EntityType, Vector3d(), a_Width, a_Height), m_EntityEffects(tEffectMap()), m_LastGroundHeight(0), m_bTouchGround(false) @@ -40,7 +40,7 @@ cPawn::~cPawn() void cPawn::Destroyed() { StopEveryoneFromTargetingMe(); - super::Destroyed(); + Super::Destroyed(); } @@ -114,7 +114,7 @@ void cPawn::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) ); } - super::Tick(a_Dt, a_Chunk); + Super::Tick(a_Dt, a_Chunk); if (!IsTicking()) { // The base class tick destroyed us @@ -130,7 +130,7 @@ void cPawn::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) void cPawn::KilledBy(TakeDamageInfo & a_TDI) { ClearEntityEffects(); - super::KilledBy(a_TDI); + Super::KilledBy(a_TDI); } @@ -139,7 +139,7 @@ void cPawn::KilledBy(TakeDamageInfo & a_TDI) bool cPawn::IsFireproof(void) const { - return super::IsFireproof() || HasEntityEffect(cEntityEffect::effFireResistance); + return Super::IsFireproof() || HasEntityEffect(cEntityEffect::effFireResistance); } @@ -163,7 +163,7 @@ void cPawn::HandleAir(void) return; } - super::HandleAir(); + Super::HandleAir(); } @@ -499,6 +499,6 @@ cEntityEffect * cPawn::GetEntityEffect(cEntityEffect::eType a_EffectType) void cPawn::ResetPosition(Vector3d a_NewPosition) { - super::ResetPosition(a_NewPosition); + Super::ResetPosition(a_NewPosition); m_LastGroundHeight = GetPosY(); } |