31 lines
1.4 KiB
Diff
31 lines
1.4 KiB
Diff
|
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/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
|
||
|
|
index f5be9554e1fd01a35b926196b30fd64f1567a799..3e7ac6699ad1f147220c286e251ce0ec1ca25035 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
|
||
|
|
@@ -2162,6 +2162,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);
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
||
|
|
index 28390d3830ed9f3f5d97ab38913e6c40f9943a70..2292295bac55651850b5e033f1ca9819bb7fa96f 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||
|
|
@@ -2355,6 +2355,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
|
||
|
|
|
||
|
|
}
|
||
|
|
|
||
|
|
+ public final int getMaxAirTicks() { return bH(); } // Paper - OBFHELPER
|
||
|
|
public int bH() {
|
||
|
|
return 300;
|
||
|
|
}
|