From e7036bb2d74dae0814f99000d4ad03dd24b4d5cb Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Sat, 25 Jun 2022 13:26:00 -0700
Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit) (#8042)

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:
d5a777e7 SPIGOT-7078: Add EntityPotionEffectEvent.Cause#WARDEN

CraftBukkit Changes:
82f757467 SPIGOT-7078: Add EntityPotionEffectEvent.Cause#WARDEN
c924fa531 SPIGOT-7072: Call events for stepping on sculk sensors and sculk shriekers
---
 patches/server/0001-Setup-Gradle-project.patch  | 11 +++++++++--
 .../0910-Add-WardenAngerChangeEvent.patch       | 17 ++++-------------
 work/Bukkit                                     |  2 +-
 work/CraftBukkit                                |  2 +-
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/patches/server/0001-Setup-Gradle-project.patch b/patches/server/0001-Setup-Gradle-project.patch
index dd803dfaf..0b695d66f 100644
--- a/patches/server/0001-Setup-Gradle-project.patch
+++ b/patches/server/0001-Setup-Gradle-project.patch
@@ -172,10 +172,10 @@ index 0000000000000000000000000000000000000000..d10ff4a52c22033e2adb2a4e7f2cee98
 +}
 diff --git a/pom.xml b/pom.xml
 deleted file mode 100644
-index c8cf5991362ba4c999fc6cb925757f02ac7424b5..0000000000000000000000000000000000000000
+index a38fed1181775f25367486725528c35701d4a8a9..0000000000000000000000000000000000000000
 --- a/pom.xml
 +++ /dev/null
-@@ -1,616 +0,0 @@
+@@ -1,623 +0,0 @@
 -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 -         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 -    <modelVersion>4.0.0</modelVersion>
@@ -440,6 +440,13 @@ index c8cf5991362ba4c999fc6cb925757f02ac7424b5..00000000000000000000000000000000
 -            <version>1.7.3</version>
 -            <scope>runtime</scope>
 -        </dependency>
+-        <!-- annotations -->
+-        <dependency>
+-            <groupId>org.jetbrains</groupId>
+-            <artifactId>annotations-java5</artifactId>
+-            <version>23.0.0</version>
+-            <scope>provided</scope>
+-        </dependency>
 -        <!-- testing -->
 -        <dependency>
 -            <groupId>junit</groupId>
diff --git a/patches/server/0910-Add-WardenAngerChangeEvent.patch b/patches/server/0910-Add-WardenAngerChangeEvent.patch
index da4695af9..cfe1a98c7 100644
--- a/patches/server/0910-Add-WardenAngerChangeEvent.patch
+++ b/patches/server/0910-Add-WardenAngerChangeEvent.patch
@@ -18,19 +18,10 @@ index e9b4f29e1844f7c44e341f9b1c07c676469ca3b6..d76800a79faef26aab0cf99b28dfa462
          if (bl) {
              int j = this.angerByUuid.removeInt(entity.getUUID());
 diff --git a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-index 60410fd12e0fcfbaad3b4dc431452f8b2e6276c7..cd6fb81d14706217c92fccc7853afce4010dfd1b 100644
+index 42ee13841319ef92bacfeffb2f8881e42b801695..27bd70dc30c8472e5a80f3273f9233a0392f831d 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-@@ -361,7 +361,7 @@ public class Warden extends Monster implements VibrationListener.VibrationListen
- 
-     @Override
-     public Brain<Warden> getBrain() {
--        return super.getBrain();
-+        return (Brain<Warden>) super.getBrain(); // Paper - decompile fix
-     }
- 
-     @Override
-@@ -460,6 +460,15 @@ public class Warden extends Monster implements VibrationListener.VibrationListen
+@@ -495,6 +495,15 @@ public class Warden extends Monster implements VibrationListener.VibrationListen
      @VisibleForTesting
      public void increaseAngerAt(@Nullable Entity entity, int amount, boolean listening) {
          if (!this.isNoAi() && this.canTargetEntity(entity)) {
@@ -44,5 +35,5 @@ index 60410fd12e0fcfbaad3b4dc431452f8b2e6276c7..cd6fb81d14706217c92fccc7853afce4
 +            amount = event.getNewAnger() - activeAnger;
 +            // Paper end
              WardenAi.setDigCooldown(this);
-             boolean bl = !(this.getBrain().getMemory(MemoryModuleType.ATTACK_TARGET).orElse((LivingEntity)null) instanceof Player);
-             int i = this.angerManagement.increaseAnger(entity, amount);
+             boolean flag1 = !(this.getBrain().getMemory(MemoryModuleType.ATTACK_TARGET).orElse(null) instanceof Player); // CraftBukkit - decompile error
+             int j = this.angerManagement.increaseAnger(entity, amount);
diff --git a/work/Bukkit b/work/Bukkit
index 05ae036c0..d5a777e73 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 05ae036c0adae7026b1c3f7da3a8502f49a7d2e5
+Subproject commit d5a777e7366d73cd126515ae8088c0cf81853de4
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 622dbe6c2..82f757467 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 622dbe6c248167ebb9ec439632021decec6a489f
+Subproject commit 82f757467a7ba67c9be1ecef9601d49aff754849