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
This commit is contained in:
@ -21,15 +21,6 @@ diff --git a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 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
|
||||
@@ -0,0 +0,0 @@ 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
|
||||
@@ -0,0 +0,0 @@ public class Warden extends Monster implements VibrationListener.VibrationListen
|
||||
@VisibleForTesting
|
||||
public void increaseAngerAt(@Nullable Entity entity, int amount, boolean listening) {
|
||||
@ -44,5 +35,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
+ 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);
|
||||
|
||||
@ -440,6 +440,13 @@ index 0000000000000000000000000000000000000000..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>
|
||||
|
||||
Submodule work/Bukkit updated: 05ae036c0a...d5a777e736
Submodule work/CraftBukkit updated: 622dbe6c24...82f757467a
Reference in New Issue
Block a user