Skip to content

Commit e7036bb

Browse files
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: d5a777e SPIGOT-7078: Add EntityPotionEffectEvent.Cause#WARDEN CraftBukkit Changes: 82f7574 SPIGOT-7078: Add EntityPotionEffectEvent.Cause#WARDEN c924fa5 SPIGOT-7072: Call events for stepping on sculk sensors and sculk shriekers
1 parent 04d080e commit e7036bb

File tree

4 files changed

+15
-17
lines changed

4 files changed

+15
-17
lines changed

patches/server/0001-Setup-Gradle-project.patch

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,10 +172,10 @@ index 0000000000000000000000000000000000000000..d10ff4a52c22033e2adb2a4e7f2cee98
172172
+}
173173
diff --git a/pom.xml b/pom.xml
174174
deleted file mode 100644
175-
index c8cf5991362ba4c999fc6cb925757f02ac7424b5..0000000000000000000000000000000000000000
175+
index a38fed1181775f25367486725528c35701d4a8a9..0000000000000000000000000000000000000000
176176
--- a/pom.xml
177177
+++ /dev/null
178-
@@ -1,616 +0,0 @@
178+
@@ -1,623 +0,0 @@
179179
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
180180
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
181181
- <modelVersion>4.0.0</modelVersion>
@@ -440,6 +440,13 @@ index c8cf5991362ba4c999fc6cb925757f02ac7424b5..00000000000000000000000000000000
440440
- <version>1.7.3</version>
441441
- <scope>runtime</scope>
442442
- </dependency>
443+
- <!-- annotations -->
444+
- <dependency>
445+
- <groupId>org.jetbrains</groupId>
446+
- <artifactId>annotations-java5</artifactId>
447+
- <version>23.0.0</version>
448+
- <scope>provided</scope>
449+
- </dependency>
443450
- <!-- testing -->
444451
- <dependency>
445452
- <groupId>junit</groupId>

patches/server/0910-Add-WardenAngerChangeEvent.patch

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,10 @@ index e9b4f29e1844f7c44e341f9b1c07c676469ca3b6..d76800a79faef26aab0cf99b28dfa462
1818
if (bl) {
1919
int j = this.angerByUuid.removeInt(entity.getUUID());
2020
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
21-
index 60410fd12e0fcfbaad3b4dc431452f8b2e6276c7..cd6fb81d14706217c92fccc7853afce4010dfd1b 100644
21+
index 42ee13841319ef92bacfeffb2f8881e42b801695..27bd70dc30c8472e5a80f3273f9233a0392f831d 100644
2222
--- a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
2323
+++ b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
24-
@@ -361,7 +361,7 @@ public class Warden extends Monster implements VibrationListener.VibrationListen
25-
26-
@Override
27-
public Brain<Warden> getBrain() {
28-
- return super.getBrain();
29-
+ return (Brain<Warden>) super.getBrain(); // Paper - decompile fix
30-
}
31-
32-
@Override
33-
@@ -460,6 +460,15 @@ public class Warden extends Monster implements VibrationListener.VibrationListen
24+
@@ -495,6 +495,15 @@ public class Warden extends Monster implements VibrationListener.VibrationListen
3425
@VisibleForTesting
3526
public void increaseAngerAt(@Nullable Entity entity, int amount, boolean listening) {
3627
if (!this.isNoAi() && this.canTargetEntity(entity)) {
@@ -44,5 +35,5 @@ index 60410fd12e0fcfbaad3b4dc431452f8b2e6276c7..cd6fb81d14706217c92fccc7853afce4
4435
+ amount = event.getNewAnger() - activeAnger;
4536
+ // Paper end
4637
WardenAi.setDigCooldown(this);
47-
boolean bl = !(this.getBrain().getMemory(MemoryModuleType.ATTACK_TARGET).orElse((LivingEntity)null) instanceof Player);
48-
int i = this.angerManagement.increaseAnger(entity, amount);
38+
boolean flag1 = !(this.getBrain().getMemory(MemoryModuleType.ATTACK_TARGET).orElse(null) instanceof Player); // CraftBukkit - decompile error
39+
int j = this.angerManagement.increaseAnger(entity, amount);

work/Bukkit

Submodule Bukkit updated from 05ae036 to d5a777e

work/CraftBukkit

Submodule CraftBukkit updated from 622dbe6 to 82f7574

0 commit comments

Comments
 (0)