2020-05-06 11:48:49 +02:00
|
|
|
From 0000000000000000000000000000000000000000 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
|
2020-06-30 07:20:29 +02:00
|
|
|
index a9664f03b8b7d2c12565b8c08891c7021aa5482b..1a677783baa0b9a3dcfcd84caccba61d76fad2fb 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
|
2020-06-30 07:20:29 +02:00
|
|
|
@@ -2262,6 +2262,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
2018-10-22 21:25:48 +02:00
|
|
|
|
|
|
|
}
|
|
|
|
|
2020-06-25 16:09:55 +02:00
|
|
|
+ public int getMaxAirTicks() { return bD(); } // Paper - OBFHELPER
|
|
|
|
public int bD() {
|
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
|
2020-06-30 07:20:29 +02:00
|
|
|
index 91de641e52693d2a776ae68810965b6e4643220f..2a4fc3d633924fbdfa166b3c3a39e0bae8a07310 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
|
2020-06-30 07:20:29 +02:00
|
|
|
@@ -2025,6 +2025,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);
|