OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-15 14:13:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

Updated Upstream (Bukkit/CraftBukkit) (#8042)

Browse source 
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:
Jake Potrebic 2022-06-25 13:26:00 -07:00
parent a0bca1d513
commit 69b406ca45
4 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
patches/server/Add-WardenAngerChangeEvent.patch
View file

@ -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);

7
patches/server/Setup-Gradle-project.patch
View file

@ -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>

2
work/Bukkit

@ -1 +1 @@
Subproject commit 05ae036c0adae7026b1c3f7da3a8502f49a7d2e5
Subproject commit d5a777e7366d73cd126515ae8088c0cf81853de4

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 622dbe6c248167ebb9ec439632021decec6a489f
Subproject commit 82f757467a7ba67c9be1ecef9601d49aff754849