AstralTransRocketries/LucidCube
1
0
Fork 0
Code Issues Pull Requests Packages Projects 1 Releases Wiki Activity

Fixed Weird Tp Fail Damage (#5591)

Browse Source 
* Fixed Weird Tp Fail Damage

* i added a ; by mistake

* Update CONTRIBUTORS

* fixed my name
This commit is contained in:
CoolPuppyKid 2024-12-03 17:22:37 -06:00 committed by GitHub
parent 05c9e06be1
commit 4b2b02a8ba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -19,6 +19,7 @@ birkett (Anthony Birkett)
Bond_009 Bond_009
changyongGuo changyongGuo
Cocosushi6 Cocosushi6
CoolPuppyKid
DarkoGNU DarkoGNU
derouinw derouinw
dImrich (Damian Imrich) dImrich (Damian Imrich)

2
src/Entities/Pawn.cpp
View File

@ -402,7 +402,7 @@ void cPawn::HandleFalling(void)
auto Player = static_cast<cPlayer *>(this); auto Player = static_cast<cPlayer *>(this);
/* 3. If the player is flying or climbing, absorb fall damage */ /* 3. If the player is flying or climbing, absorb fall damage */
FallDamageAbsorbed |= Player->IsFlying() || Player->IsClimbing(); FallDamageAbsorbed |= Player->IsFlying() || Player->IsClimbing() || Player->GetIsTeleporting();
/* 4. If the player is about to bounce on a slime block and is not crouching, absorb all fall damage */ /* 4. If the player is about to bounce on a slime block and is not crouching, absorb all fall damage */
ShouldBounceOnSlime = !Player->IsCrouched(); ShouldBounceOnSlime = !Player->IsCrouched();

3
src/Entities/Player.h
View File

@ -147,6 +147,9 @@ public:
/** Cancels the current bow charging */ /** Cancels the current bow charging */
void CancelChargingBow(void); void CancelChargingBow(void);
/** Gets If The Player Is Teleporting To Fix https://github.com/cuberite/cuberite/issues/5542 */
bool GetIsTeleporting() { return m_IsTeleporting; }
/** Returns true if the player is currently charging the bow */ /** Returns true if the player is currently charging the bow */
bool IsChargingBow(void) const { return m_IsChargingBow; } bool IsChargingBow(void) const { return m_IsChargingBow; }