From 677566eb0a44b99284daab927dfb9d0bde3a702c Mon Sep 17 00:00:00 2001 From: granny Date: Wed, 4 Oct 2023 00:16:25 -0700 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@f6969b6 Updated Upstream (Bukkit/CraftBukkit/Spigot) PaperMC/Paper@bb1c0dd Implement tracking range y setting PaperMC/Paper@9d21a88 Fix tests PaperMC/Paper@6573d95 update configurate (#9230) PaperMC/Paper@f36bb59 Fix entity data not updated for firework attached to entity (#9783) --- gradle.properties | 2 +- patches/api/0007-Ridables.patch | 4 ++-- .../0030-API-for-any-mob-to-burn-daylight.patch | 4 ++-- patches/api/0049-Fire-Immunity-API.patch | 4 ++-- patches/server/0006-Ridables.patch | 16 ++++++++-------- ...007-Configurable-entity-base-attributes.patch | 8 ++++---- .../0063-Configurable-jockey-options.patch | 6 +++--- ...215-Halloween-options-and-optimizations.patch | 4 ++-- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/gradle.properties b/gradle.properties index a949412e6..d2ba34790 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = org.purpurmc.purpur version = 1.20.2-R0.1-SNAPSHOT mcVersion = 1.20.2 -paperCommit = 38376f43a0c268e5223746cab13910f55e5ecf41 +paperCommit = f36bb597399b9b9b632caa4f938c28ca137583f5 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/api/0007-Ridables.patch b/patches/api/0007-Ridables.patch index abbe71a59..615a3a165 100644 --- a/patches/api/0007-Ridables.patch +++ b/patches/api/0007-Ridables.patch @@ -22,10 +22,10 @@ index 0c4dbb9ef63fa8575b5546239443cb2bd91ba847..4160e968e7d7e8e2a953534a981a7330 * @deprecated removed in 1.20.2 */ diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 762cb07861ca8ff058ce8d57ea6c15df1e588bf3..de60e8773e58ef62c15d8f7e293313a62dff674b 100644 +index d340ddcf6924cc834455de3acbbac91ab9c66e39..656ea43ec614e5bf4d3474b9f02dafb970f33656 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -1049,4 +1049,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -1065,4 +1065,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ @NotNull String getScoreboardEntryName(); // Paper end - entity scoreboard name diff --git a/patches/api/0030-API-for-any-mob-to-burn-daylight.patch b/patches/api/0030-API-for-any-mob-to-burn-daylight.patch index 38781b67f..6343a7bd2 100644 --- a/patches/api/0030-API-for-any-mob-to-burn-daylight.patch +++ b/patches/api/0030-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 de60e8773e58ef62c15d8f7e293313a62dff674b..52867495d0f746ff40e802c4f1018511e58fd03e 100644 +index 656ea43ec614e5bf4d3474b9f02dafb970f33656..ee3ca27a5406024ed71cce14b0891266b64e6fdf 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -1079,5 +1079,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -1095,5 +1095,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * @return True if ridable in water */ boolean isRidableInWater(); diff --git a/patches/api/0049-Fire-Immunity-API.patch b/patches/api/0049-Fire-Immunity-API.patch index e5622d4ca..d40117288 100644 --- a/patches/api/0049-Fire-Immunity-API.patch +++ b/patches/api/0049-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 52867495d0f746ff40e802c4f1018511e58fd03e..98de85d1382fe84cdc2e2c9db04bf1b4f157291c 100644 +index ee3ca27a5406024ed71cce14b0891266b64e6fdf..f21a0fa8420b3fd0a3655a0af998da8f8a66c4b1 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -1086,5 +1086,18 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -1102,5 +1102,18 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * @return True if in daylight */ boolean isInDaylight(); diff --git a/patches/server/0006-Ridables.patch b/patches/server/0006-Ridables.patch index 922d54b2a..b367e87ac 100644 --- a/patches/server/0006-Ridables.patch +++ b/patches/server/0006-Ridables.patch @@ -34,7 +34,7 @@ index 707a02804db563d94360b65d156c40be3aa30aeb..5534a881d0c716fd4280017c0c21cb7c this.profiler.push(() -> { return worldserver + " " + worldserver.dimension().location(); diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index f502b01b564bd33c449cbe621966ef4076a38cca..8768ad8207ded2dfca532c69238dbd3cf68e2b97 100644 +index 868951dc21aff541765b1f58f08cdf3c47446d25..285afc454524cc384b4de0130a62b75ace045a14 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -223,6 +223,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -66,7 +66,7 @@ index 3e8527b526d3cd06c28a6ee94463b09bac95cb0e..c2927df8ebb8977d3d43928fe91c977b public void doTick() { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index b5fe3786b337fb99920aac72b865e6a25bcb9649..2b4a9b41cc8f826b39bcabbfd9dcd2ff9a875e23 100644 +index 8bd243a8d5a4be54f907af2b02e96ea833cee62f..85996c66e1e1ab761629a558cebf5b2f60d09dbd 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2711,6 +2711,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -191,7 +191,7 @@ index 1bb8b6e91c44cd13411d96d749fa64835c75a267..75c278b67ad2b78766efd8f89c4c2ca7 protected ParticleOptions getInkParticle() { return ParticleTypes.GLOW_SQUID_INK; diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index c039c77d0dd6ec1d336948ca6b5351d6fae1d8bb..49fb2604e5227c454026d5c060130c52de2070c8 100644 +index 77a1c7dfbaccc2e74da5c78ce4dfcd1717a7ac65..4f6ec3e2dcdb4a316cf58a9044a8cacdd982bba3 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -219,9 +219,9 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -678,7 +678,7 @@ index 2249fc6dd98afb8d52623b5864955fdd3b3fc042..2ccfaab0a02cf5ff9779e250fb79a75a double d = this.wantedX - this.fish.getX(); double e = this.wantedY - this.fish.getY(); diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java -index 55026e1731e41b4e3e4c6a8fef5d96a32051a556..706ae64b894709601dccfb621d3c215f073e98e9 100644 +index 9a7956befc346e1b58f064213800fd099a052fc6..ef056d4431388a49b24f63524ee246e506d80540 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java @@ -43,6 +43,7 @@ import net.minecraft.world.entity.EntityType; @@ -4751,7 +4751,7 @@ index 11275a9ec6faa69c9f054683cb47312e443ba883..dc29e875c1e184c1c4553c127bb8c86d this.level().getProfiler().pop(); this.updateActivity(); diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java -index 1ddbba72a5fd3d225b651815a38d178941fba289..fb4b3bb082e299723613a28831ff8f9c2eae7ffd 100644 +index 3d44f8e9f8056d7d899e90e61240b2d1d109354b..7be0c7776608582adf556b36dcfe289465490ecd 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java @@ -107,11 +107,30 @@ public class Zombie extends Monster { @@ -5181,10 +5181,10 @@ index 06d1bdb9bd124b201c36d284c50d22bf50d3735a..937f57d8af629c4e913d7ccabf6adab1 public boolean isPickable() { return false; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index e932cfac619c30b8c7444a9fa41e0403a6eadf6a..083bc0c2cdab2d1d54e66bb41f12f92fbc176d19 100644 +index 315d8260e196709ed9084272aa640f11e327c0a8..25883decef819df7758b8fdd7c4de48f0d0d05a1 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1506,4 +1506,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -1523,4 +1523,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { return this.getHandle().getScoreboardName(); } // Paper end - entity scoreboard name @@ -5213,7 +5213,7 @@ index e932cfac619c30b8c7444a9fa41e0403a6eadf6a..083bc0c2cdab2d1d54e66bb41f12f92f + // Purpur end } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 50fed722bbba5c663e4be33a179ea75dfa2dd9e9..c3eaef001e6d7be7f16977c3f539d5d4a478c734 100644 +index 193ad79f57255b1ea4cf7930071b4f4988dc2b04..05039f5d90c9c039a776d56befe2dfe201d95475 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -592,6 +592,15 @@ public class CraftEventFactory { diff --git a/patches/server/0007-Configurable-entity-base-attributes.patch b/patches/server/0007-Configurable-entity-base-attributes.patch index 496bf0c4c..fc2ecce4e 100644 --- a/patches/server/0007-Configurable-entity-base-attributes.patch +++ b/patches/server/0007-Configurable-entity-base-attributes.patch @@ -34,7 +34,7 @@ index 75c278b67ad2b78766efd8f89c4c2ca7eb7cdcb2..dc99e7f0e6f173c1313c0d5e9ea5dd6b protected ParticleOptions getInkParticle() { return ParticleTypes.GLOW_SQUID_INK; diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index e6b83abce3bbd2f5e89d02415bcc6b1a1b0b5da9..91f8f6c918ab5bc8a456b924b9b02b03905841aa 100644 +index 4f6ec3e2dcdb4a316cf58a9044a8cacdd982bba3..9330c6a55eb5503f7d58d94424491f46416392f4 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -288,6 +288,7 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -78,7 +78,7 @@ index 2ee2097ebf7753d63a99fdf492da374849a345eb..41ac8d2cb5424aecb58158122009b5dc public void readAdditionalSaveData(CompoundTag nbt) { super.readAdditionalSaveData(nbt); diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java -index 706ae64b894709601dccfb621d3c215f073e98e9..e7f95639a442cf602fef0ed7aec0f5f96aa6fd92 100644 +index ef056d4431388a49b24f63524ee246e506d80540..ee9a12a0285f43535b377e5aea2c3e9e5f64b496 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java @@ -471,6 +471,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { @@ -1353,7 +1353,7 @@ index dc29e875c1e184c1c4553c127bb8c86dddf8c5ab..1d862dd019b2d024f61cfc8956430d18 protected Brain.Provider brainProvider() { return Brain.provider(MEMORY_TYPES, SENSOR_TYPES); diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java -index fb4b3bb082e299723613a28831ff8f9c2eae7ffd..004de1b76734d9015537fa4885656101d2f07efa 100644 +index 7be0c7776608582adf556b36dcfe289465490ecd..56f9d91ba48c501fbcdbb959f683ce8728a36503 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java @@ -124,6 +124,11 @@ public class Zombie extends Monster { @@ -1368,7 +1368,7 @@ index fb4b3bb082e299723613a28831ff8f9c2eae7ffd..004de1b76734d9015537fa4885656101 @Override protected void registerGoals() { this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur -@@ -615,7 +620,7 @@ public class Zombie extends Monster { +@@ -607,7 +612,7 @@ public class Zombie extends Monster { } protected void randomizeReinforcementsChance() { diff --git a/patches/server/0063-Configurable-jockey-options.patch b/patches/server/0063-Configurable-jockey-options.patch index 5b6551ddf..6a1910ef6 100644 --- a/patches/server/0063-Configurable-jockey-options.patch +++ b/patches/server/0063-Configurable-jockey-options.patch @@ -57,7 +57,7 @@ index 469ad6f0d73add7b005217b2ae39b201c7679a27..ede13fe38fb97b94180ea8557d8a45d2 return checkMonsterSpawnRules(type, world, spawnReason, pos, random) && (spawnReason == MobSpawnType.SPAWNER || world.canSeeSky(pos)); } diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java -index 004de1b76734d9015537fa4885656101d2f07efa..1efcafd736c1dbd057d5bfe7abbfcb1fb2d6f7b3 100644 +index 56f9d91ba48c501fbcdbb959f683ce8728a36503..971abbfdff555a569ad54b9db5947c3ec50408d2 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java @@ -129,6 +129,18 @@ public class Zombie extends Monster { @@ -79,7 +79,7 @@ index 004de1b76734d9015537fa4885656101d2f07efa..1efcafd736c1dbd057d5bfe7abbfcb1f @Override protected void registerGoals() { this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur -@@ -552,19 +564,20 @@ public class Zombie extends Monster { +@@ -544,19 +556,20 @@ public class Zombie extends Monster { if (object instanceof Zombie.ZombieGroupData) { Zombie.ZombieGroupData entityzombie_groupdatazombie = (Zombie.ZombieGroupData) object; @@ -106,7 +106,7 @@ index 004de1b76734d9015537fa4885656101d2f07efa..1efcafd736c1dbd057d5bfe7abbfcb1f Chicken entitychicken1 = (Chicken) EntityType.CHICKEN.create(this.level()); if (entitychicken1 != null) { -@@ -574,6 +587,7 @@ public class Zombie extends Monster { +@@ -566,6 +579,7 @@ public class Zombie extends Monster { this.startRiding(entitychicken1); world.addFreshEntity(entitychicken1, CreatureSpawnEvent.SpawnReason.MOUNT); // CraftBukkit } diff --git a/patches/server/0215-Halloween-options-and-optimizations.patch b/patches/server/0215-Halloween-options-and-optimizations.patch index edab64a5a..e538407b4 100644 --- a/patches/server/0215-Halloween-options-and-optimizations.patch +++ b/patches/server/0215-Halloween-options-and-optimizations.patch @@ -43,10 +43,10 @@ index f35637a105d5aa12fb57c2456f2b2a7db12a49f0..f3e1fa62d9f067c0fe8aacb88bf30b01 this.armorDropChances[EquipmentSlot.HEAD.getIndex()] = 0.0F; } diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java -index 143ac5fac02a29516d03b69008b1345555857640..c265d2abd36857f6a25f8e0584e7cf939637b7a9 100644 +index 15baaf9c358019b1ce2152086e8d16591eec7dbb..79f791188a14a319a19b55674c891384fcb750c9 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java -@@ -594,11 +594,7 @@ public class Zombie extends Monster { +@@ -586,11 +586,7 @@ public class Zombie extends Monster { } if (this.getItemBySlot(EquipmentSlot.HEAD).isEmpty()) {