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

34 lines
1.3 KiB
Diff
Raw Normal View History

Update upstream CB --- work/CraftBukkit Submodule work/CraftBukkit 7deb3728..d6b3eddf: > SPIGOT-5355: Double Chests still open after InventoryOpenEvent cancelled
2019-10-13 05:28:46 +00:00
From b6859fecadd83ec887760612d07fdc7b8791df9d 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: c987938a SPIGOT-5180: Add Villager#sleep() and #wakeup() methods CraftBukkit Changes: 7f33c6a2 SPIGOT-5196: Restore previous version behaviour regarding cancelled BlockBreakEvent 6a5fc902 Improve diff in EntityHanging c98d61bf SPIGOT-4712: Allow spawning of upwards or downwards facing item frames db971477 SPIGOT-5199: Fix NPE if setting the book of the ItemMeta of a lectern b0ef3996 SPIGOT-4679 Fix black lines after book paragraphs 1215188f SPIGOT-5180: Add Villager#sleep() and #wakeup() methods c03b2bef SPIGOT-4975: NPE on WorldGenStronghold When Using Multiple Worlds 65ea162c Ensure Bukkit data pack is always up to date 0b107b8d MC-157395, SPIGOT-5193: Small armor stands do not drop loot 6da0abca SPIGOT-5195: Player loot table does not drop when keepInventory is on 8b09d983 SPIGOT-5190: Superfluous EntityCombustEvent called when using fire aspect sword Spigot Changes: 1981d553 SPIGOT-5198: Catch more bad async operations 6a14ca46 Rebuild patches
2019-07-23 19:17:32 +00:00
index 4833a9652..19bbcc043 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 (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 CraftBukkit Changes: eb2e6578 SPIGOT-5116: Fix concurrent modification exception inside ChunkMapDistance 989f9b3d SPIGOT-4849: Fix server crash when accessing chunks during chunk load/unload/populate events f554183c SPIGOT-5171: Don't fire PlayerTeleportEvent if not actually moving 2349feb8 SPIGOT-5163: Cancelling PlayerBucketFillEvent visually removes the targeted block Spigot Changes: 9a643a6a Remove DataWatcher Locking
2019-07-16 22:09:32 +00:00
@@ -2323,6 +2323,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
}
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: 3dc4cdcd Update to Minecraft 1.14.3-pre4 88b25a8c SPIGOT-5098: Add a method to allow colored sign changes 6d913552 Update to Minecraft 1.14.3-pre4 CraftBukkit Changes: f1f33559 Update to Minecraft 1.14.3 8a3d3f49 SPIGOT-5098: Add a method to allow colored sign changes 533290e2 SPIGOT-5100: Console warning from pig zombie targeting 6dde4b9f SPIGOT-5094: Allow opening merchant for wandering traders and hide the xp bar for custom merchants 9af90077 SPIGOT-5097: Bukkit.clearRecipes() no longer working 38fa220f Fix setting game rules via the API fe3930ce Update to Minecraft 1.14.3-pre4 da071ec5 Remove outdated build delay. Spigot Changes: 4d2f30f1 Update to Minecraft 1.14.3 f16400e3 Update to Minecraft 1.14.3-pre4
2019-06-25 01:47:58 +00:00
+ public int getMaxAirTicks() { return bp(); } // Paper - OBFHELPER
public int bp() {
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
Update upstream CB --- work/CraftBukkit Submodule work/CraftBukkit 7deb3728..d6b3eddf: > SPIGOT-5355: Double Chests still open after InventoryOpenEvent cancelled
2019-10-13 05:28:46 +00:00
index ad5dcab78..ff398e5ed 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
Update upstream CB --- work/CraftBukkit Submodule work/CraftBukkit 7deb3728..d6b3eddf: > SPIGOT-5355: Double Chests still open after InventoryOpenEvent cancelled
2019-10-13 05:28:46 +00:00
@@ -1869,6 +1869,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);
--
Updated Upstream (Bukkit/CraftBukkit) 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: e970fd72 Remove incorrect javadoc from TargetReason 84df6df1 SPIGOT-5282: Improve bucket event API CraftBukkit Changes: b2bcde89 SPIGOT-5258: TNT Not Moving Players in Creative Mode 44d675ad SPIGOT-5263: Chests stay open after InventoryOpenEvent cancelled. 2439178e SPIGOT-5278: EntityDrowned memory leak 7055c931 SPIGOT-5264: Call event for experience orbs losing their target 49141172 SPIGOT-5282: Improve bucket event API 6bbb3b04 SPIGOT-5281: Clearer error messages for ChunkSnapshot misuse
2019-08-26 14:25:58 +00:00
2.23.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