Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@f7a1344 Improve PortalEvents (#8679) PaperMC/Paper@e498dda Add missing EntityChangeBlockEvent (#8696)
2026-02-17 16:37:43 +01:00 · 2022-12-18 15:46:43 -06:00
parent 07afb7204e
commit 278eebff54
8 changed files with 17 additions and 17 deletions
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 group = org.purpurmc.purpur
 version = 1.19.3-R0.1-SNAPSHOT

-paperCommit = cf3115158c81b247cfa472429b5fc77d6050a050
+paperCommit = e498ddaa6146df299db5a0c8f44841b47dde6395

 org.gradle.caching = true
 org.gradle.parallel = true
--- a/patches/server/0001-Pufferfish-Server-Changes.patch
+++ b/patches/server/0001-Pufferfish-Server-Changes.patch
@@ -1919,7 +1919,7 @@ index 540bc9500c35c0db719b00aa26f6fb3a1b08ed9f..806cb760822a99316b08ad95ff8922df
     int LARGE_MAX_STACK_SIZE = 64;
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 7f94da8059147760cbdc2476d0e8beda4a105f40..caa4d38d620717e78df9ad29fe9752213f1cda1b 100644
+index be54a70b47433c2abaeb8632ffe55d0762f619d6..374b46c344ca868cab7c47be69cb005eb90319e8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -291,7 +291,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2005,7 +2005,7 @@ index 7f94da8059147760cbdc2476d0e8beda4a105f40..caa4d38d620717e78df9ad29fe975221
         this.level.getProfiler().push("entityBaseTick");
         if (firstTick && this instanceof net.minecraft.world.entity.NeutralMob neutralMob) neutralMob.tickInitialPersistentAnger(level); // Paper - Update last hurt when ticking
         this.feetBlockState = null;
-@@ -4075,16 +4109,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4082,16 +4116,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
     }
 
     public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
@@ -2031,7 +2031,7 @@ index 7f94da8059147760cbdc2476d0e8beda4a105f40..caa4d38d620717e78df9ad29fe975221
             double d1 = 0.0D;
             boolean flag = this.isPushedByFluid();
             boolean flag1 = false;
-@@ -4092,14 +4128,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4099,14 +4135,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
             int k1 = 0;
             BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
 
@@ -2099,7 +2099,7 @@ index 7f94da8059147760cbdc2476d0e8beda4a105f40..caa4d38d620717e78df9ad29fe975221
 
                             if (d2 >= axisalignedbb.minY) {
                                 flag1 = true;
-@@ -4121,9 +4204,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4128,9 +4211,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                                 // CraftBukkit end
                             }
                         }
--- a/patches/server/0007-Component-related-conveniences.patch
+++ b/patches/server/0007-Component-related-conveniences.patch
@@ -81,10 +81,10 @@ index 8795c94e6b6474addddbb0b337a962e8fac46b2b..f2ef4d93e070167d70f597e8893bf29b
         return this.isFireSource;
     }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index caa4d38d620717e78df9ad29fe9752213f1cda1b..164fa910866c876abe96910af7b9018b6f1a7452 100644
+index 374b46c344ca868cab7c47be69cb005eb90319e8..37f1e4aa89da81fcae2d38bb741f3386950bdf51 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3846,6 +3846,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3853,6 +3853,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
         return SlotAccess.NULL;
     }
 
--- a/patches/server/0008-Ridables.patch
+++ b/patches/server/0008-Ridables.patch
@@ -87,7 +87,7 @@ index 662c43401bf84a6de47986e66e1f83c4b50df775..d89e7697f12f06f49d4063fa0b06c90a
                             if ((entity instanceof Bucketable && entity instanceof LivingEntity && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
                                 entity.getEntityData().resendPossiblyDesyncedEntity(player); // Paper - The entire mob gets deleted, so resend it.
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 164fa910866c876abe96910af7b9018b6f1a7452..129e9f79930f03295d1bfaf53333e1a9863b4bc8 100644
+index 37f1e4aa89da81fcae2d38bb741f3386950bdf51..76ad4045dc84b42da4d808a912125d619b594739 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -361,7 +361,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -127,7 +127,7 @@ index 164fa910866c876abe96910af7b9018b6f1a7452..129e9f79930f03295d1bfaf53333e1a9
             if (this.passengers.size() == 1 && this.passengers.get(0) == entity) {
                 this.passengers = ImmutableList.of();
             } else {
-@@ -4634,4 +4648,45 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4641,4 +4655,45 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
         return ((net.minecraft.server.level.ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
     }
     // Paper end
--- a/patches/server/0058-Add-canSaveToDisk-to-Entity.patch
+++ b/patches/server/0058-Add-canSaveToDisk-to-Entity.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add canSaveToDisk to Entity


 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 7d44a9e4a4c36a328bca99d9c7fcbe71d914dd5b..5106abacc353c1303e7fc488bebfeba2d5202ab0 100644
+index 89f6ecccf68df4522bff94c6da2a60fc462d9e14..e54540a58463a0dcd958ae65ee0948c76af9e065 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4688,5 +4688,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4695,5 +4695,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
     public boolean processClick(InteractionHand hand) {
         return false;
     }
--- a/patches/server/0088-Stop-squids-floating-on-top-of-water.patch
+++ b/patches/server/0088-Stop-squids-floating-on-top-of-water.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Stop squids floating on top of water


 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5106abacc353c1303e7fc488bebfeba2d5202ab0..c79dc51d590da219db7a9147144bc802e3da8637 100644
+index e54540a58463a0dcd958ae65ee0948c76af9e065..6368f92466b0755b042b965af08777fe982389ed 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4136,6 +4136,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4143,6 +4143,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
         this.yRotO = this.getYRot();
     }
 
--- a/patches/server/0090-Entities-can-use-portals-configuration.patch
+++ b/patches/server/0090-Entities-can-use-portals-configuration.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entities can use portals configuration


 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c79dc51d590da219db7a9147144bc802e3da8637..8c894892234246f3bf297807bea4c0f6581e0c8e 100644
+index 6368f92466b0755b042b965af08777fe982389ed..02409b1f99a74bdfe8663c8f77f6ce50f7c57eb1 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2912,7 +2912,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -17,7 +17,7 @@ index c79dc51d590da219db7a9147144bc802e3da8637..8c894892234246f3bf297807bea4c0f6
             if (!this.level.isClientSide && !pos.equals(this.portalEntrancePos)) {
                 this.portalEntrancePos = pos.immutable();
             }
-@@ -3595,7 +3595,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3602,7 +3602,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
     }
 
     public boolean canChangeDimensions() {
--- a/patches/server/0179-API-for-any-mob-to-burn-daylight.patch
+++ b/patches/server/0179-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 <me@encode42.dev>

 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 08ccf4b33313f3bc7ddc51b385288765f3cd3a88..66cf04d6035b1676d75ae46b73782461d07dff24 100644
+index e133b5c9fdf3934a4ace3dd1b747c1aa3d5d4a48..d17ee2ff8eeb2acc086d8d115c3da5e241231ae8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4701,5 +4701,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4708,5 +4708,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
     public boolean canSaveToDisk() {
         return true;
     }