core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0322-Reset-players-airTicks...

34 lines
1.3 KiB
Diff
Raw Normal View History

Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: f52c70ab Fix incorrect nullability in MultipleFacing 6af4c0b2 SPIGOT-5311: Add API to get/set item associated with throwable projectiles 97aeae56 Add set/isAware to disable Vanilla AI components of a Mob CraftBukkit Changes: fba9f487 Improve legacy conversion of some materials that changed post flattening b1ba8749 Move Bukkit.Aware loading/saving to correct location f7cdb53c SPIGOT-5311: Add API to get/set item associated with throwable projectiles 689f429c #634: Cross platform patch scripts ab85433d Add set/isAware to disable Vanilla AI components of a Mob Spigot Changes: 8faa8b45 Rebuild patches
2020-02-21 17:52:20 +00:00
From 7bf6c013db4ac1e64b1feeb284d896efc66c82f2 Mon Sep 17 00:00:00 2001
Reset players remainingAir on respawn (#1598) As mentioned in #1597, your air level did not reset if you drown. Now you get a full breath during respawn.
2018-10-22 19:25:48 +00: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
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: f52c70ab Fix incorrect nullability in MultipleFacing 6af4c0b2 SPIGOT-5311: Add API to get/set item associated with throwable projectiles 97aeae56 Add set/isAware to disable Vanilla AI components of a Mob CraftBukkit Changes: fba9f487 Improve legacy conversion of some materials that changed post flattening b1ba8749 Move Bukkit.Aware loading/saving to correct location f7cdb53c SPIGOT-5311: Add API to get/set item associated with throwable projectiles 689f429c #634: Cross platform patch scripts ab85433d Add set/isAware to disable Vanilla AI components of a Mob Spigot Changes: 8faa8b45 Rebuild patches
2020-02-21 17:52:20 +00:00
index 9a23380600..ecd0387627 100644
Reset players remainingAir on respawn (#1598) As mentioned in #1597, your air level did not reset if you drown. Now you get a full breath during respawn.
2018-10-22 19:25:48 +00:00
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: f52c70ab Fix incorrect nullability in MultipleFacing 6af4c0b2 SPIGOT-5311: Add API to get/set item associated with throwable projectiles 97aeae56 Add set/isAware to disable Vanilla AI components of a Mob CraftBukkit Changes: fba9f487 Improve legacy conversion of some materials that changed post flattening b1ba8749 Move Bukkit.Aware loading/saving to correct location f7cdb53c SPIGOT-5311: Add API to get/set item associated with throwable projectiles 689f429c #634: Cross platform patch scripts ab85433d Add set/isAware to disable Vanilla AI components of a Mob Spigot Changes: 8faa8b45 Rebuild patches
2020-02-21 17:52:20 +00:00
@@ -2326,6 +2326,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
Reset players remainingAir on respawn (#1598) As mentioned in #1597, your air level did not reset if you drown. Now you get a full breath during respawn.
2018-10-22 19:25:48 +00:00
}
Houston, we got a patch (#2731) * Houston, we got a patch * is this the end of the beginning or the beginning of the end
2019-12-12 16:20:43 +00:00
+ public int getMaxAirTicks() { return bw(); } // Paper - OBFHELPER
public int bw() {
Reset players remainingAir on respawn (#1598) As mentioned in #1597, your air level did not reset if you drown. Now you get a full breath during respawn.
2018-10-22 19:25:48 +00:00
return 300;
}
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: f52c70ab Fix incorrect nullability in MultipleFacing 6af4c0b2 SPIGOT-5311: Add API to get/set item associated with throwable projectiles 97aeae56 Add set/isAware to disable Vanilla AI components of a Mob CraftBukkit Changes: fba9f487 Improve legacy conversion of some materials that changed post flattening b1ba8749 Move Bukkit.Aware loading/saving to correct location f7cdb53c SPIGOT-5311: Add API to get/set item associated with throwable projectiles 689f429c #634: Cross platform patch scripts ab85433d Add set/isAware to disable Vanilla AI components of a Mob Spigot Changes: 8faa8b45 Rebuild patches
2020-02-21 17:52:20 +00:00
index 10ca229cb4..f33580f8c5 100644
Reset players remainingAir on respawn (#1598) As mentioned in #1597, your air level did not reset if you drown. Now you get a full breath during respawn.
2018-10-22 19:25:48 +00:00
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
Performance patches prerequisite (#2802) Prereq changes for the coming storm of performance patches. Includes optimising incremental saving
2020-01-28 00:16:53 +00:00
@@ -1865,6 +1865,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
Reset players remainingAir on respawn (#1598) As mentioned in #1597, your air level did not reset if you drown. Now you get a full breath during respawn.
2018-10-22 19:25:48 +00:00
}
this.setHealth(this.getMaxHealth());
+ this.setAirTicks(this.getMaxAirTicks()); // Paper
this.fireTicks = 0;
this.fallDistance = 0;
this.foodData = new FoodMetaData(this);
--
Allow nerfed blazes, endermen to take water damage (#2847) Fixes GH-2841
2020-02-09 04:19:54 +00:00
2.25.0
Reset players remainingAir on respawn (#1598) As mentioned in #1597, your air level did not reset if you drown. Now you get a full breath during respawn.
2018-10-22 19:25:48 +00:00