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 b2324b53b3cec3e577a8ec8c45b113c232d220a6..5eb37fb1ae861940839fe6815b57111812d6b3ec 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -2210,6 +2210,7 @@ public class ServerPlayer extends Player { } this.setHealth(this.getMaxHealth()); + this.setAirSupply(this.getMaxAirTicks()); // Paper this.remainingFireTicks = 0; this.fallDistance = 0; this.foodData = new FoodData(this); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java index b75a7f702ca6166c1f869a138ac4b93ba3870c62..f9f51b84036f522cdfc4ca6d47c074d51c14bf08 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2587,6 +2587,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n } + public final int getMaxAirTicks() { return getMaxAirSupply(); } // Paper - OBFHELPER public int getMaxAirSupply() { return 300; }