Skip to content

player/player.go: Only deal fall damage on an actual vertical collision #1283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
root-nat wants to merge 1 commit into from
Closed

player/player.go: Only deal fall damage on an actual vertical collision #1283

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion server/player/player.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,9 @@ func (p *Player) Heal(health float64, source world.HealingSource) {
// updateFallState is called to update the entities falling state.
func (p *Player) updateFallState(distanceThisTick float64) {
switch {
case p.OnGround():
// Require a vertical collision so brushing a block sideways mid-fall does
// not register as landing and deal premature fall damage.
case p.OnGround() && p.collidedVertically:
if p.fallDistance > 0 {
p.fall(p.fallDistance)
p.ResetFallDistance()
Expand Down