2019-06-25 21:18:50 +02:00
|
|
|
From f92e9ea1566590348d84de4d010801f0d23ae5f4 Mon Sep 17 00:00:00 2001
|
2018-10-22 21:25:48 +02:00
|
|
|
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
|
2019-06-25 03:47:58 +02:00
|
|
|
index 97aa07398d..6a2a4576e9 100644
|
2018-10-22 21:25:48 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
2019-06-25 03:47:58 +02:00
|
|
|
@@ -2322,6 +2322,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
2018-10-22 21:25:48 +02:00
|
|
|
|
|
|
|
}
|
|
|
|
|
2019-06-25 03:47:58 +02:00
|
|
|
+ public int getMaxAirTicks() { return bp(); } // Paper - OBFHELPER
|
|
|
|
public int bp() {
|
2018-10-22 21:25:48 +02:00
|
|
|
return 300;
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
2019-06-25 03:47:58 +02:00
|
|
|
index 160f456e27..b190515f73 100644
|
2018-10-22 21:25:48 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
2019-06-25 03:47:58 +02:00
|
|
|
@@ -1862,6 +1862,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
2018-10-22 21:25:48 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
this.setHealth(this.getMaxHealth());
|
|
|
|
+ this.setAirTicks(this.getMaxAirTicks()); // Paper
|
|
|
|
this.fireTicks = 0;
|
|
|
|
this.fallDistance = 0;
|
|
|
|
this.foodData = new FoodMetaData(this);
|
|
|
|
--
|
2019-06-16 12:15:21 +02:00
|
|
|
2.22.0
|
2018-10-22 21:25:48 +02:00
|
|
|
|