aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0266-Reset-players-airTicks-on-respawn.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0266-Reset-players-airTicks-on-respawn.patch')
-rw-r--r--patches/server/0266-Reset-players-airTicks-on-respawn.patch18
1 files changed, 18 insertions, 0 deletions
diff --git a/patches/server/0266-Reset-players-airTicks-on-respawn.patch b/patches/server/0266-Reset-players-airTicks-on-respawn.patch
new file mode 100644
index 0000000000..792f05094a
--- /dev/null
+++ b/patches/server/0266-Reset-players-airTicks-on-respawn.patch
@@ -0,0 +1,18 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: GreenMeanie <[email protected]>
+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 b331af6de6a23dedf6cd21b97cb81048db215f10..3b71ea8263b2049c54432a64c7f01aed3848d1c7 100644
+--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
++++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+@@ -2614,6 +2614,7 @@ public class ServerPlayer extends Player {
+
+ this.setHealth(this.getMaxHealth());
+ this.stopUsingItem(); // CraftBukkit - SPIGOT-6682: Clear active item on reset
++ this.setAirSupply(this.getMaxAirSupply()); // Paper - Reset players airTicks on respawn
+ this.setRemainingFireTicks(0);
+ this.fallDistance = 0;
+ this.foodData = new FoodData(this);