PaperMC/patches/unapplied/server/0285-Reset-players-airTicks-on-respawn.patch

19 lines
942 B
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: GreenMeanie <GreenMeanieMC@gmail.com>
Date: Sat, 20 Oct 2018 22:34:02 -0400
Subject: [PATCH] Reset players airTicks on respawn
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index c4f433832dc439830fc1584d36a197066fdb3e75..d32e6feca6c39a28f80574e4b080ddd4cbb60fdc 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2222,6 +2222,7 @@ public class ServerPlayer extends Player {
2021-06-11 14:02:28 +02:00
this.setHealth(this.getMaxHealth());
this.stopUsingItem(); // CraftBukkit - SPIGOT-6682: Clear active item on reset
2021-06-16 19:48:25 +02:00
+ this.setAirSupply(this.getMaxAirSupply()); // Paper
2021-06-11 14:02:28 +02:00
this.remainingFireTicks = 0;
this.fallDistance = 0;
this.foodData = new FoodData(this);