From 53f27183bf42dc132f5eeb206b82dc5875d8c7b5 Mon Sep 17 00:00:00 2001
From: Josh Roy <10731363+JRoy@users.noreply.github.com>
Date: Wed, 3 Mar 2021 17:43:45 -0500
Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit/Spigot) (#5299)

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

Bukkit Changes:
9d0ad318 Fix javadoc errors in previous commits
9501daa2 #578: Add methods to modify the rate of regeneration and starvation
197d8f3d #577: Add EntityExhaustionEvent

CraftBukkit Changes:
a021e334 #795: Add methods to modify the rate of regeneration and starvation
509e523c #792: Add EntityExhaustionEvent

Spigot Changes:
db99f821 Rebuild patches
---
 .../EntityRegainHealthEvent-isFastRegen-API.patch           | 6 +++---
 ...nd-attack-SoundEffects-only-to-players-who-can-see.patch | 4 ++--
 work/Bukkit                                                 | 2 +-
 work/CraftBukkit                                            | 2 +-
 work/Spigot                                                 | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Spigot-Server-Patches/EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-Server-Patches/EntityRegainHealthEvent-isFastRegen-API.patch
index 15db91dc85..582cf3c7ad 100644
--- a/Spigot-Server-Patches/EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/Spigot-Server-Patches/EntityRegainHealthEvent-isFastRegen-API.patch
@@ -32,11 +32,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/server/FoodMetaData.java
 +++ b/src/main/java/net/minecraft/server/FoodMetaData.java
 @@ -0,0 +0,0 @@ public class FoodMetaData {
-             if (this.foodTickTimer >= 10) {
+             if (this.foodTickTimer >= this.saturatedRegenRate) { // CraftBukkit
                  float f = Math.min(this.saturationLevel, 6.0F);
  
 -                entityhuman.heal(f / 6.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.SATIATED); // CraftBukkit - added RegainReason
 +                entityhuman.heal(f / 6.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.SATIATED, true); // CraftBukkit - added RegainReason // Paper - This is fast regen
-                 this.a(f);
+                 // this.a(f); CraftBukkit - EntityExhaustionEvent
+                 entityhuman.applyExhaustion(f, org.bukkit.event.entity.EntityExhaustionEvent.ExhaustionReason.REGEN); // CraftBukkit - EntityExhaustionEvent
                  this.foodTickTimer = 0;
-             }
diff --git a/Spigot-Server-Patches/Send-attack-SoundEffects-only-to-players-who-can-see.patch b/Spigot-Server-Patches/Send-attack-SoundEffects-only-to-players-who-can-see.patch
index cc8c8cb53a..5e1a7609d6 100644
--- a/Spigot-Server-Patches/Send-attack-SoundEffects-only-to-players-who-can-see.patch
+++ b/Spigot-Server-Patches/Send-attack-SoundEffects-only-to-players-who-can-see.patch
@@ -48,7 +48,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
 @@ -0,0 +0,0 @@ public abstract class EntityHuman extends EntityLiving {
  
-                         this.applyExhaustion(world.spigotConfig.combatExhaustion); // Spigot - Change to use configurable value
+                         this.applyExhaustion(world.spigotConfig.combatExhaustion, EntityExhaustionEvent.ExhaustionReason.ATTACK); // CraftBukkit - EntityExhaustionEvent // Spigot - Change to use configurable value
                      } else {
 -                        this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), SoundEffects.ENTITY_PLAYER_ATTACK_NODAMAGE, this.getSoundCategory(), 1.0F, 1.0F);
 +                        sendSoundEffect(this, this.locX(), this.locY(), this.locZ(), SoundEffects.ENTITY_PLAYER_ATTACK_NODAMAGE, this.getSoundCategory(), 1.0F, 1.0F); // Paper - send while respecting visibility
@@ -68,5 +68,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +    // Paper end
  
+     // CraftBukkit start
      public void applyExhaustion(float f) {
-         if (!this.abilities.isInvulnerable) {
diff --git a/work/Bukkit b/work/Bukkit
index 95ff95ed62..9d0ad3184e 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 95ff95ed62d42bc96c0d6396d9192ebfaaf5ce93
+Subproject commit 9d0ad3184ec89c61eecd7a1234005391fee66297
diff --git a/work/CraftBukkit b/work/CraftBukkit
index ea050e6e98..a021e334aa 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit ea050e6e980a3dee733c572194d675692b30136f
+Subproject commit a021e334aa342a60945b330d11b7dbd5d0fff017
diff --git a/work/Spigot b/work/Spigot
index 73fb6094f4..db99f82161 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 73fb6094f4fa318955bb5bb11a1ec1af12cf90a1
+Subproject commit db99f82161b38f74d56351b3f941d4fb42bfa588