From d66bc35cd896daddba767a84edfbc47dc6255089 Mon Sep 17 00:00:00 2001 From: granny Date: Fri, 16 Feb 2024 18:39:14 -0800 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@7f85940 Updated Upstream (Bukkit) (#10255) PaperMC/Paper@7ccefdc Fire entity knockback event for ownerless tnt (#7171) --- gradle.properties | 2 +- patches/api/0007-Ridables.patch | 4 ++-- patches/api/0027-API-for-any-mob-to-burn-daylight.patch | 4 ++-- patches/api/0046-Fire-Immunity-API.patch | 4 ++-- patches/api/0052-Stonecutter-damage.patch | 4 ++-- patches/server/0265-Remove-Mojang-Profiler.patch | 8 ++++---- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/gradle.properties b/gradle.properties index 7b45e30fb..64eb5a863 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = org.purpurmc.purpur version = 1.20.4-R0.1-SNAPSHOT mcVersion = 1.20.4 -paperCommit = 37df12143c4f19eb6017619b7e7abeb0f848598a +paperCommit = 7ccefdcd6cf6f467a3212fa02a75a8b9322f3582 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/api/0007-Ridables.patch b/patches/api/0007-Ridables.patch index 2cf288cdd..67bcb9f69 100644 --- a/patches/api/0007-Ridables.patch +++ b/patches/api/0007-Ridables.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Ridables diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 9022567f32a58b94ed030db22524876d8f1df4aa..9fedbceb7f0cd65594a7084d9743373704333ad6 100644 +index d9929d9311e4b2b0ae13a8f6f13563257263f298..ee617a8681d2d887216d63211ed0595dc1fe7ddb 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -1102,4 +1102,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -1104,4 +1104,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ @NotNull String getScoreboardEntryName(); // Paper end - entity scoreboard name diff --git a/patches/api/0027-API-for-any-mob-to-burn-daylight.patch b/patches/api/0027-API-for-any-mob-to-burn-daylight.patch index 75c18dec1..c0536abe1 100644 --- a/patches/api/0027-API-for-any-mob-to-burn-daylight.patch +++ b/patches/api/0027-API-for-any-mob-to-burn-daylight.patch @@ -6,10 +6,10 @@ Subject: [PATCH] API for any mob to burn daylight Co-authored by: Encode42 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 9fedbceb7f0cd65594a7084d9743373704333ad6..c646c51674f348bec6e2dee796cde5710da7bb67 100644 +index ee617a8681d2d887216d63211ed0595dc1fe7ddb..9fee171108e335827c5c164144284eb5a598742c 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -1132,5 +1132,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -1134,5 +1134,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * @return True if ridable in water */ boolean isRidableInWater(); diff --git a/patches/api/0046-Fire-Immunity-API.patch b/patches/api/0046-Fire-Immunity-API.patch index 46b773bf3..2213b4431 100644 --- a/patches/api/0046-Fire-Immunity-API.patch +++ b/patches/api/0046-Fire-Immunity-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fire Immunity API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index c646c51674f348bec6e2dee796cde5710da7bb67..f842fd5505f1e52b81299da179ed26780a1a1a13 100644 +index 9fee171108e335827c5c164144284eb5a598742c..a36fc32dd83339b6939cb4046538ec6285042397 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -1139,5 +1139,18 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -1141,5 +1141,18 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * @return True if in daylight */ boolean isInDaylight(); diff --git a/patches/api/0052-Stonecutter-damage.patch b/patches/api/0052-Stonecutter-damage.patch index c64311052..8d0888381 100644 --- a/patches/api/0052-Stonecutter-damage.patch +++ b/patches/api/0052-Stonecutter-damage.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Stonecutter damage diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java -index 3b20000d9ac3e29fe3bc5093e6635377bee88dbd..fae6f2c125eb6db88f3e8741b77f17b6817d62a9 100644 +index 446b3ffd5caca5344be1c250475679834cd0d4a2..3da8d3d8925cd7a111c0c357bceecfd3a801c8eb 100644 --- a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java -@@ -292,7 +292,8 @@ public class EntityDamageEvent extends EntityEvent implements Cancellable { +@@ -303,7 +303,8 @@ public class EntityDamageEvent extends EntityEvent implements Cancellable { WORLD_BORDER, /** * Damage caused when an entity contacts a block such as a Cactus, diff --git a/patches/server/0265-Remove-Mojang-Profiler.patch b/patches/server/0265-Remove-Mojang-Profiler.patch index 679d787af..4b5cea4b2 100644 --- a/patches/server/0265-Remove-Mojang-Profiler.patch +++ b/patches/server/0265-Remove-Mojang-Profiler.patch @@ -1221,7 +1221,7 @@ index 03f6b992aae18679845e04c6c0f70bacac11d996..2d997b91636aba8c71ae543253cde737 } } else { diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 1b58cc6ee449cfb655b7179be9d3bf8d48a86c4e..5c667328f76688d6b557452319117734aaa861a6 100644 +index 2e935f373980f6c424fc23ddc80ef04186834532..3079daa307cf8d37a2b10213d377d808ef676cc2 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -409,7 +409,7 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -1799,10 +1799,10 @@ index 857d1d80afd35d30a2947b0a6f953e5af1516048..18f92478f07de7c941ff8bbe0ec2ef2f 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 f0fbde839a527481314f54a1aefa0fc317ba2221..2feebcd1b6ca062f027acf02c15c36c810942980 100644 +index b678da2cbb93cea7971bc3c4d324cfca18b0bc97..b0884758d00efb1e3b4b47a539de2a819aab978a 100644 --- a/src/main/java/net/minecraft/world/level/Explosion.java +++ b/src/main/java/net/minecraft/world/level/Explosion.java -@@ -665,7 +665,7 @@ public class Explosion { +@@ -675,7 +675,7 @@ public class Explosion { } if (flag1) { @@ -1811,7 +1811,7 @@ index f0fbde839a527481314f54a1aefa0fc317ba2221..2feebcd1b6ca062f027acf02c15c36c8 List> list = new ArrayList(); Util.shuffle(this.toBlow, this.level.random); -@@ -741,7 +741,7 @@ public class Explosion { +@@ -751,7 +751,7 @@ public class Explosion { Block.popResource(this.level, (BlockPos) pair.getSecond(), (ItemStack) pair.getFirst()); }