35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
|
From 3cbba85fb406eed003f0ce5a1b733ae350d50a3a 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/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||
|
|
index 22fce6c36..9d1c53897 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||
|
|
@@ -2334,7 +2334,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||
|
|
|
||
|
|
}
|
||
|
|
|
||
|
|
- public int bf() {
|
||
|
|
+ public int getMaxAirTicks() { return bf(); } public int bf() { // Paper - OBF HELPER
|
||
|
|
return 300;
|
||
|
|
}
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||
|
|
index 4ca5cfe9a..91d9b62e9 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||
|
|
@@ -1614,6 +1614,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||
|
|
}
|
||
|
|
|
||
|
|
this.setHealth(this.getMaxHealth());
|
||
|
|
+ this.setAirTicks(this.getMaxAirTicks()); // Paper
|
||
|
|
this.fireTicks = 0;
|
||
|
|
this.fallDistance = 0;
|
||
|
|
this.foodData = new FoodMetaData(this);
|
||
|
|
--
|
||
|
|
2.19.1
|
||
|
|
|