From 47753a88a45a9c3c14b4cd7619e6d5993d0f1740 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Tue, 14 Jun 2022 07:37:49 -0500 Subject: [PATCH] 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) --- gradle.properties | 2 +- patches/server/0006-Fix-decompile-errors.patch | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/gradle.properties b/gradle.properties index 7648c516f..2451b06ee 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 diff --git a/patches/server/0006-Fix-decompile-errors.patch b/patches/server/0006-Fix-decompile-errors.patch index bfae80897..ecff6ad46 100644 --- a/patches/server/0006-Fix-decompile-errors.patch +++ b/patches/server/0006-Fix-decompile-errors.patch @@ -79,19 +79,6 @@ index ac75c54e897565e340b66823caeed92ba1d1641a..769e4fbaac01a4fe3a45bd9cab5c63b6 + return (Brain) 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 getBrain() { -- return super.getBrain(); -+ return (Brain) 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