mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@1654175 [ci skip] Update performance problem issue template to account for new config formats (#7967) PaperMC/Paper@b844286 Fix command signs patch update (#7976) PaperMC/Paper@cb410bb [ci skip] Update CONTRIBUTING.md for config changes (#7977) PaperMC/Paper@48f7a1a Add WardenAngerChangeEvent (#7943)
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
group = org.purpurmc.purpur
|
||||
version = 1.19-R0.1-SNAPSHOT
|
||||
|
||||
paperCommit = 3d37b42a89db7af2dd367861fa66c28b9e4aae97
|
||||
paperCommit = 48f7a1a9ef14511efb341c145c664a5a47f1f595
|
||||
|
||||
org.gradle.caching = true
|
||||
org.gradle.parallel = true
|
||||
|
||||
@@ -79,19 +79,6 @@ index ac75c54e897565e340b66823caeed92ba1d1641a..769e4fbaac01a4fe3a45bd9cab5c63b6
|
||||
+ return (Brain<PiglinBrute>) super.getBrain(); // Purpur - decompile error
|
||||
}
|
||||
|
||||
@Override
|
||||
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..4366f7ff095c79a1f4444a27198f2613eb01fdc2 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(); // Purpur - decompile error
|
||||
}
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/level/block/Blocks.java b/src/main/java/net/minecraft/world/level/block/Blocks.java
|
||||
index 5dc3605fed7fb2ff8cc6c965d1bf99c462e0b14a..bcc1ce196c1dbf60cf6ae73d95766dc41ed22012 100644
|
||||
|
||||
Reference in New Issue
Block a user