Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@6b325cd Array backed synched entity data (#9460) PaperMC/Paper@805fdd8 Add deprecations to SignSide string methods (#9467) PaperMC/Paper@b3dc7a3 fix item meta for tadpole buckets (#9473) PaperMC/Paper@f9473d9 [ci skip] Add gradle wrapper validation action PaperMC/Paper@a3c760e Handle block state in EntityDamageByBlockEvent (#9396) PaperMC/Paper@a60eeb8 Fix mob breaking doors not spawning particles (#9443) PaperMC/Paper@1f8ca77 Prevent desync for poi and pistons (#9270) PaperMC/Paper@92bc19b Fix missing item interaction cancelling case (#9427) PaperMC/Paper@836586d Fix missing item types in SlotType for armor change event (#9379) PaperMC/Paper@ece4fd3 Suppress Item Meta Validation Checks (#9331) PaperMC/Paper@aefb73c Add Owner UUID api for AreaEffectCloud (#9364) PaperMC/Paper@22ed60c Fix BanList API (#9450)
2026-02-17 08:27:43 +01:00 · 2023-07-13 17:17:01 -07:00
parent 2453fef2e5
commit 60dcdf0e44
7 changed files with 25 additions and 25 deletions
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.20.1-R0.1-SNAPSHOT

 mcVersion = 1.20.1
-paperCommit = 5de0f8ac48944c6fe4dd127390a0ea08705cc2d9
+paperCommit = 22ed60c1013e5d58026a370b98ae84d1647e6350

 org.gradle.caching = true
 org.gradle.parallel = true
--- a/patches/server/0001-Pufferfish-Server-Changes.patch
+++ b/patches/server/0001-Pufferfish-Server-Changes.patch
@@ -1935,7 +1935,7 @@ index 04b1531572e8fff1e46fe1c94e7fc863841e0f66..47ddc42f2b63d9d3fae5ae6ea93d4183
     int LARGE_MAX_STACK_SIZE = 64;
     int DEFAULT_DISTANCE_LIMIT = 8;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3ffb92a82e17af467afb18c81accc482a93d6a6f..4cf49d758209a8364c8f58cd4e1249d7ae6eb489 100644
+index 305b43071aa1cf8feee75fae757bb7734ae33771..c432dcb4ebc66b52f9f5965671675b253ce33029 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -306,7 +306,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2500,7 +2500,7 @@ index 52196431a6538872755344859a0454a0e50c3b6e..80fc7918cb294b0d88a293bd6a920441
                     // Paper End
                     this.tryToMerge(entityitem);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index 39eb9301626b191958ce42daa34b1ff3241cea80..eaf45b502a698e26a703b93e62989a338479496e 100644
+index b62457313a1e30aad0c5313d608667b5d3811455..410f10ad93935d1c078447a4596023f367a8e9b7 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
@@ -326,11 +326,17 @@ public class EnderMan extends Monster implements NeutralMob {
@@ -2809,7 +2809,7 @@ index 0e8746759752b692668886370181aa5db1fd0bb0..58e5ce2afabf480f5dfd9adf43f8fc12
     default BlockHitResult clip(ClipContext raytrace1, BlockPos blockposition) {
             // Paper start - Prevent raytrace from loading chunks
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 147d802d9207e358fdb2d1c7806fc2f634dcfd98..30d8ec75203adc677e5fb91d9538baf52a0684ad 100644
+index f39ab10c5b0b8d86b579a5b683491204c51db70b..d8d4a1ca2eb062af8b2de4ab44503983587cdd77 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -273,6 +273,17 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -2936,7 +2936,7 @@ index 147d802d9207e358fdb2d1c7806fc2f634dcfd98..30d8ec75203adc677e5fb91d9538baf5
     public boolean isInWorldBounds(BlockPos pos) {
         return pos.isInsideBuildHeightAndWorldBoundsHorizontal(this); // Paper - use better/optimized check
     }
-@@ -918,13 +1021,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -919,13 +1022,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
         try {
             tickConsumer.accept(entity);
             MinecraftServer.getServer().executeMidTickTasks(); // Paper - execute chunk tasks mid tick
@@ -2952,7 +2952,7 @@ index 147d802d9207e358fdb2d1c7806fc2f634dcfd98..30d8ec75203adc677e5fb91d9538baf5
             // Paper end
         }
     }
-@@ -1379,6 +1482,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1380,6 +1483,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
     }
 
     public ProfilerFiller getProfiler() {
--- a/patches/server/0071-Add-allow-water-in-end-world-option.patch
+++ b/patches/server/0071-Add-allow-water-in-end-world-option.patch
@@ -27,10 +27,10 @@ index 578c3db52dda4c169b5ea615a4ce4a79f15a4cad..0bd98b802f246a3f6061f716d470a479
 
                 return true;
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 6a9f5e3f8c72363b91b23729df5e98784d66ba8b..6b661982b217ae120d72ede3e19e82fbd3ebb69e 100644
+index dc71cf3c66a0a4390177428688e6f4ee39a981b6..a4c45ee8a5c6e55a6f9abde401cc06f13bd0b018 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1575,4 +1575,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1576,4 +1576,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
         return null;
     }
     // Paper end
--- a/patches/server/0145-Sneak-to-bulk-process-composter.patch
+++ b/patches/server/0145-Sneak-to-bulk-process-composter.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Sneak to bulk process composter


 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 34ecfb89372f459117db99d57a7edd6f681bbe8a..dcd322786d27109ac84ee70f460b45344d38a1e9 100644
+index baf3e79489e310f443788bc917c553ae7ea86c89..278c12a450bbeef6f42af7bcf25da42a748ee607 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -577,7 +577,7 @@ public class ServerPlayerGameMode {
+@@ -578,7 +578,7 @@ public class ServerPlayerGameMode {
             boolean flag1 = player.isSecondaryUseActive() && flag;
             ItemStack itemstack1 = stack.copy();
 
--- a/patches/server/0216-Shift-right-click-to-use-exp-for-mending.patch
+++ b/patches/server/0216-Shift-right-click-to-use-exp-for-mending.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Shift right click to use exp for mending


 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 7ddc9a7ff7b1d6de234ea5b1c8f4246d6ba7976d..02f615e797ac22b8a6226233d815346ca09c3173 100644
+index 027bac5687a60ab43ef527a125c5fa27798a4943..e1ffd2ca9045f9f5c4fb64704a132dc1ae086f20 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
@@ -518,6 +518,7 @@ public class ServerPlayerGameMode {
@@ -16,7 +16,7 @@ index 7ddc9a7ff7b1d6de234ea5b1c8f4246d6ba7976d..02f615e797ac22b8a6226233d815346c
         BlockPos blockposition = hitResult.getBlockPos();
         BlockState iblockdata = world.getBlockState(blockposition);
         InteractionResult enuminteractionresult = InteractionResult.PASS;
-@@ -614,4 +615,18 @@ public class ServerPlayerGameMode {
+@@ -620,4 +621,18 @@ public class ServerPlayerGameMode {
     public void setLevel(ServerLevel world) {
         this.level = world;
     }
@@ -36,7 +36,7 @@ index 7ddc9a7ff7b1d6de234ea5b1c8f4246d6ba7976d..02f615e797ac22b8a6226233d815346c
 +    // Purpur end
 }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 190d87f499d530036448f9bce3cf10d5d32e4955..8fd95b7986a63e4b784c0c361687d05a9f648a13 100644
+index 8fa4c33d71a2a7f5d844378659d7098b9fe52380..3e6b483c0f19aa948a243bb0dcede8f94f38eed4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2089,6 +2089,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- a/patches/server/0271-Remove-Timings.patch
+++ b/patches/server/0271-Remove-Timings.patch
@@ -643,7 +643,7 @@ index 122defeec159165c5fef295ec1dd2da4a6ada622..5b7507db055d7be59b369f66e659e128
 
         } else if (close) { chunkproviderserver.close(false); } // Paper - rewrite chunk system
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 24c93583ce1c0b58e434345974c9fd025720f75a..13f07c874cdf9a8063ce8f72d2402d27e6a1e7e5 100644
+index c1a1ac5c6f368a828e148c79ae52ac3a1ecb3aae..c43bfea788d1d019655631af8dc6c31effcbd23d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2592,7 +2592,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -745,10 +745,10 @@ index fcdb9bde8e1605e30dde3e580491522d4b62cdc0..7094701d213c73ba47ace806962244c1
 
     }
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 290d9fbeb71675d897b78d5c2b98ab477ce9f5fd..6a3b55031188d920d2c7bfc67df791bdd89fba62 100644
+index 84ac5db63a51d1490fcf625d10ed0952d671017e..ed7ed29147a2bb681e5d4c44d34b06d936b8fa74 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1015,15 +1015,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1016,15 +1016,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
         ProfilerFiller gameprofilerfiller = this.getProfiler();
 
         gameprofilerfiller.push("blockEntities");
@@ -767,7 +767,7 @@ index 290d9fbeb71675d897b78d5c2b98ab477ce9f5fd..6a3b55031188d920d2c7bfc67df791bd
         // Spigot start
         // Iterator iterator = this.blockEntityTickers.iterator();
         int tilesThisCycle = 0;
-@@ -1056,7 +1056,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1057,7 +1057,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
         }
         this.blockEntityTickers.removeAll(toRemove);
 
--- a/patches/server/0272-Remove-Mojang-Profiler.patch
+++ b/patches/server/0272-Remove-Mojang-Profiler.patch
@@ -819,7 +819,7 @@ index c8c43454a936dd04d71fd82c955191f709a6c010..3ab54ab8d0a5ccf1abaa53cf3ce5b25f
                 this.connection.send(new ClientboundPlayerAbilitiesPacket(this.getAbilities()));
                 playerlist.sendLevelInfo(this, worldserver);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6eb223cc49a7409b94806255118a3bf04aea6d9e..84c4d7525cbd8f83f464f5116fcba8267421ebfa 100644
+index c43bfea788d1d019655631af8dc6c31effcbd23d..6d9205e34d237811788d487469e5e60bf977a3e0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -410,7 +410,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -1045,7 +1045,7 @@ index 2e6e8eac987c4ef6b2dcd3de592d8a51d2b29792..863343a87fe34d72f04af89d75268b47
             };
         }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5cc1a1550807399c2d7329f521dd2a97e0a42d4b..6361b13871bae7ae46a12f6e21e9a055f842fb51 100644
+index aeacaf0e2567290930d4a0bb364e4e7d316a80d7..5cded930e23e881b2e02ed2456b1d7147fa63777 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -438,7 +438,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1764,10 +1764,10 @@ index 8f97c9df726ac20cfce7bdddd5dd4f8c5aa76c35..e35ebb5b923c2f63e37e5dae006bc4a0
             }
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 6a3b55031188d920d2c7bfc67df791bdd89fba62..fdd55ac3720d44e3d246e05fe9a07b5f73bed0e8 100644
+index ed7ed29147a2bb681e5d4c44d34b06d936b8fa74..bdb32964524cb2a4398b8d3bedfb03b0cb805b6d 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1012,9 +1012,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1013,9 +1013,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
     }
 
     protected void tickBlockEntities() {
@@ -1779,7 +1779,7 @@ index 6a3b55031188d920d2c7bfc67df791bdd89fba62..fdd55ac3720d44e3d246e05fe9a07b5f
         //timings.tileEntityPending.startTiming(); // Spigot // Purpur
         this.tickingBlockEntities = true;
         if (!this.pendingBlockEntityTickers.isEmpty()) {
-@@ -1059,7 +1059,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1060,7 +1060,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
         //timings.tileEntityTick.stopTiming(); // Spigot // Purpur
         this.tickingBlockEntities = false;
         co.aikar.timings.TimingHistory.tileEntityTicks += this.blockEntityTickers.size(); // Paper
@@ -1788,7 +1788,7 @@ index 6a3b55031188d920d2c7bfc67df791bdd89fba62..fdd55ac3720d44e3d246e05fe9a07b5f
         spigotConfig.currentPrimedTnt = 0; // Spigot
     }
 
-@@ -1252,7 +1252,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1253,7 +1253,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
 
     @Override
     public List<Entity> getEntities(@Nullable Entity except, AABB box, Predicate<? super Entity> predicate) {
@@ -1797,7 +1797,7 @@ index 6a3b55031188d920d2c7bfc67df791bdd89fba62..fdd55ac3720d44e3d246e05fe9a07b5f
         List<Entity> list = Lists.newArrayList();
         ((ServerLevel)this).getEntityLookup().getEntities(except, box, list, predicate); // Paper - optimise this call
         return list;
-@@ -1271,7 +1271,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1272,7 +1272,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
     }
 
     public <T extends Entity> void getEntities(EntityTypeTest<Entity, T> filter, AABB box, Predicate<? super T> predicate, List<? super T> result, int limit) {
@@ -1806,7 +1806,7 @@ index 6a3b55031188d920d2c7bfc67df791bdd89fba62..fdd55ac3720d44e3d246e05fe9a07b5f
         // Paper start - optimise this call
         //TODO use limit
         if (filter instanceof net.minecraft.world.entity.EntityType entityTypeTest) {
-@@ -1528,7 +1528,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1529,7 +1529,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
     }
 
     public ProfilerFiller getProfiler() {