mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-28 22:47:53 +02:00
345a6a6205
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: ef0946409 PR-1091: Fix exit position in entity travel with portals d12768f75 PR-1090: Remove no longer needed world reference from CraftMerchantCustom 7550f6854 SPIGOT-7115: Support hex color codes in custom merchant inventory titles
19 lines
942 B
Diff
19 lines
942 B
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/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
index a92a8e9d38cab33b2e161ef96e1cecd533b27324..bdd81c856b750acaffa7ec8d95c00d481504a2b9 100644
|
|
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
@@ -2294,6 +2294,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
|
|
this.remainingFireTicks = 0;
|
|
this.fallDistance = 0;
|
|
this.foodData = new FoodData(this);
|