From 9f5ba65cab6ce6c22d939dceb72926eb74017a54 Mon Sep 17 00:00:00 2001 From: Encode42 Date: Mon, 2 Jan 2023 01:46:08 -0500 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@51cfcc8 Updated Upstream (Bukkit/CraftBukkit) (#8740) --- gradle.properties | 2 +- patches/server/0279-Remove-Mojang-Profiler.patch | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index d11243426..657c3a969 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = org.purpurmc.purpur version = 1.19.3-R0.1-SNAPSHOT -paperCommit = ddd8745d14f2c5b39f1ff3064237b87d2ca73494 +paperCommit = 51cfcc88da1d5277cf83a95d9f790699bc4d107a org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0279-Remove-Mojang-Profiler.patch b/patches/server/0279-Remove-Mojang-Profiler.patch index 84abc121a..8b1ba2a7a 100644 --- a/patches/server/0279-Remove-Mojang-Profiler.patch +++ b/patches/server/0279-Remove-Mojang-Profiler.patch @@ -1678,10 +1678,10 @@ index 700d32abc957769960fd081072c941681474f7f0..832469e39901d9ec666ddaf3aff77419 this.assignProfessionWhenSpawned = false; } diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java -index f16593a99ca4089151c2247f6028b823614c78e4..e71368734923c4dfed6cfad6571114b87d8fa6dc 100644 +index a213f4098859858a73ddd601bbe8c7511972e0d5..c0d39afe5b80159ed9aaca4ddd4763d707882f2e 100644 --- a/src/main/java/net/minecraft/world/level/Explosion.java +++ b/src/main/java/net/minecraft/world/level/Explosion.java -@@ -362,7 +362,7 @@ public class Explosion { +@@ -360,7 +360,7 @@ public class Explosion { if (!iblockdata.isAir() && iblockdata.isDestroyable()) { // Paper BlockPos blockposition1 = blockposition.immutable(); @@ -1690,7 +1690,7 @@ index f16593a99ca4089151c2247f6028b823614c78e4..e71368734923c4dfed6cfad6571114b8 if (block.dropFromExplosion(this)) { Level world = this.level; -@@ -384,7 +384,7 @@ public class Explosion { +@@ -382,7 +382,7 @@ public class Explosion { this.level.setBlock(blockposition, Blocks.AIR.defaultBlockState(), 3); block.wasExploded(this.level, blockposition, this);