From 9dab7fe5f10e577b72673d644022a4867c0073e3 Mon Sep 17 00:00:00 2001 From: granny Date: Wed, 26 Jul 2023 12:43:35 -0700 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@b14979e Remove isRemoved skip on .discard() (#9520) PaperMC/Paper@1837f6c Prevent entity removals if the entity slices is receiving status updates PaperMC/Paper@a40e48f Add cause to PlayerOpenSignEvent (#9441) --- gradle.properties | 2 +- .../0001-Pufferfish-Server-Changes.patch | 10 +++---- .../0007-Component-related-conveniences.patch | 4 +-- patches/server/0008-Ridables.patch | 8 +++--- ...urable-void-damage-height-and-damage.patch | 4 +-- ...Stop-squids-floating-on-top-of-water.patch | 4 +-- ...tities-can-use-portals-configuration.patch | 6 ++-- ...28-Movement-options-for-armor-stands.patch | 4 +-- .../server/0129-Fix-stuck-in-portals.patch | 4 +-- patches/server/0149-Drowning-Settings.patch | 4 +-- ...ggle-for-end-portal-safe-teleporting.patch | 4 +-- .../server/0271-Remove-Mojang-Profiler.patch | 28 +++++++++---------- patches/server/0290-Fire-Immunity-API.patch | 8 +++--- ...leport-to-spawn-on-nether-ceiling-da.patch | 4 +-- 14 files changed, 47 insertions(+), 47 deletions(-) diff --git a/gradle.properties b/gradle.properties index 0236e25c3..e967094a3 100644 --- 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 = aa93dcfdce20fd15837854d6f89d0ba82cdc5c55 +paperCommit = a40e48f3fd95138238d2c6422465d579b7a21e6b org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0001-Pufferfish-Server-Changes.patch b/patches/server/0001-Pufferfish-Server-Changes.patch index d497e1a57..17284ae52 100644 --- 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 305b43071aa1cf8feee75fae757bb7734ae33771..c432dcb4ebc66b52f9f5965671675b253ce33029 100644 +index 4c298406ce06d39f8279049270c88ec0830733b1..cccbec265c00b00c3261c9beead91f1ab3702d7d 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 { @@ -2008,7 +2008,7 @@ index 305b43071aa1cf8feee75fae757bb7734ae33771..c432dcb4ebc66b52f9f5965671675b25 return chunkMap.playerEntityTrackerTrackMaps[type.ordinal()].getObjectsInRange(MCUtil.getCoordinateKey(this)); } -@@ -797,6 +825,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -796,6 +824,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } public void tick() { @@ -2021,7 +2021,7 @@ index 305b43071aa1cf8feee75fae757bb7734ae33771..c432dcb4ebc66b52f9f5965671675b25 this.baseTick(); } -@@ -4289,16 +4323,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -4288,16 +4322,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } public boolean updateFluidHeightAndDoFluidPushing(TagKey tag, double speed) { @@ -2047,7 +2047,7 @@ index 305b43071aa1cf8feee75fae757bb7734ae33771..c432dcb4ebc66b52f9f5965671675b25 double d1 = 0.0D; boolean flag = this.isPushedByFluid(); boolean flag1 = false; -@@ -4306,14 +4342,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -4305,14 +4341,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { int k1 = 0; BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos(); @@ -2115,7 +2115,7 @@ index 305b43071aa1cf8feee75fae757bb7734ae33771..c432dcb4ebc66b52f9f5965671675b25 if (d2 >= axisalignedbb.minY) { flag1 = true; -@@ -4335,9 +4418,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -4334,9 +4417,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { // CraftBukkit end } } diff --git a/patches/server/0007-Component-related-conveniences.patch b/patches/server/0007-Component-related-conveniences.patch index b3c1dfb34..45b054f40 100644 --- a/patches/server/0007-Component-related-conveniences.patch +++ b/patches/server/0007-Component-related-conveniences.patch @@ -81,10 +81,10 @@ index 25a5a3b949a0eb632611355e74ccd4865be108ca..14fcfd7c1d3a62833978e163f4e0d6f9 return this.type().msgId(); } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 4cf49d758209a8364c8f58cd4e1249d7ae6eb489..ccfdfb49b0bca84de676f5df4c373096455c9707 100644 +index cccbec265c00b00c3261c9beead91f1ab3702d7d..fa14eb380c6392c74ef96acfae58034d583f2c3e 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -4041,6 +4041,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -4040,6 +4040,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { return SlotAccess.NULL; } diff --git a/patches/server/0008-Ridables.patch b/patches/server/0008-Ridables.patch index eff37b989..9d4b1f318 100644 --- a/patches/server/0008-Ridables.patch +++ b/patches/server/0008-Ridables.patch @@ -79,7 +79,7 @@ index b70936913ccf220416eca8ffafa5d97e6290c613..d88abd13d215bcfaefae918e76f96582 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 51002af763641e0193e5c76b85366e8c411f388f..7e0cfc9d2e4607cb4917133682f907c13fbfdd13 100644 +index fa14eb380c6392c74ef96acfae58034d583f2c3e..f30522ad06b55c5116e40c7b134d8b3e5ea9910f 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -376,7 +376,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -91,7 +91,7 @@ index 51002af763641e0193e5c76b85366e8c411f388f..7e0cfc9d2e4607cb4917133682f907c1 private float eyeHeight; public boolean isInPowderSnow; public boolean wasInPowderSnow; -@@ -2941,6 +2941,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -2940,6 +2940,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { this.passengers = ImmutableList.copyOf(list); } @@ -105,7 +105,7 @@ index 51002af763641e0193e5c76b85366e8c411f388f..7e0cfc9d2e4607cb4917133682f907c1 this.gameEvent(GameEvent.ENTITY_MOUNT, passenger); } } -@@ -2981,6 +2988,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -2980,6 +2987,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { return false; } // Spigot end @@ -120,7 +120,7 @@ index 51002af763641e0193e5c76b85366e8c411f388f..7e0cfc9d2e4607cb4917133682f907c1 if (this.passengers.size() == 1 && this.passengers.get(0) == entity) { this.passengers = ImmutableList.of(); } else { -@@ -4889,4 +4904,45 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -4888,4 +4903,45 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { return ((net.minecraft.server.level.ServerChunkCache) level.getChunkSource()).isPositionTicking(this); } // Paper end diff --git a/patches/server/0055-Configurable-void-damage-height-and-damage.patch b/patches/server/0055-Configurable-void-damage-height-and-damage.patch index d2caff62b..182f0533d 100644 --- a/patches/server/0055-Configurable-void-damage-height-and-damage.patch +++ b/patches/server/0055-Configurable-void-damage-height-and-damage.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Configurable void damage height and damage diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 2f66eeaba87af74e5820ad496b9e8b7440c47c80..11d1d0402f65c2ae8ea77a0bfa188fe46c9a3a7e 100644 +index a916cc58909f3962ce2f17fc6655309a427ee064..cbbe526889745b90f6a156d3c653300cc716cd9e 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -914,7 +914,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -913,7 +913,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { public void checkBelowWorld() { // Paper start - Configurable nether ceiling damage diff --git a/patches/server/0086-Stop-squids-floating-on-top-of-water.patch b/patches/server/0086-Stop-squids-floating-on-top-of-water.patch index 0f1b26649..bcb8328ff 100644 --- a/patches/server/0086-Stop-squids-floating-on-top-of-water.patch +++ b/patches/server/0086-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 7f3fafff2b13f4bc544147d3157d66786c4d895c..36b375a67b1bc9baa4f3cef8e63bd9f6448f1335 100644 +index 64a644e750887452a7dbd1dbaab32289e95680fe..ed34b0d7ee6263821412f4ffa5e85ee05922a936 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -4355,6 +4355,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -4354,6 +4354,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { this.yRotO = this.getYRot(); } diff --git a/patches/server/0088-Entities-can-use-portals-configuration.patch b/patches/server/0088-Entities-can-use-portals-configuration.patch index a4b9d9600..27d2a564a 100644 --- a/patches/server/0088-Entities-can-use-portals-configuration.patch +++ b/patches/server/0088-Entities-can-use-portals-configuration.patch @@ -5,10 +5,10 @@ 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 36b375a67b1bc9baa4f3cef8e63bd9f6448f1335..7884f5ef86fc560349689ae5f034799f50ad811b 100644 +index ed34b0d7ee6263821412f4ffa5e85ee05922a936..c565d863808a9facd561fb9704c2a9ce4ba2d5e2 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -3062,7 +3062,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -3061,7 +3061,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { public void handleInsidePortal(BlockPos pos) { if (this.isOnPortalCooldown()) { this.setPortalCooldown(); @@ -17,7 +17,7 @@ index 36b375a67b1bc9baa4f3cef8e63bd9f6448f1335..7884f5ef86fc560349689ae5f034799f if (!this.level().isClientSide && !pos.equals(this.portalEntrancePos)) { this.portalEntrancePos = pos.immutable(); } -@@ -3758,7 +3758,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -3757,7 +3757,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } public boolean canChangeDimensions() { diff --git a/patches/server/0128-Movement-options-for-armor-stands.patch b/patches/server/0128-Movement-options-for-armor-stands.patch index b2f8814c8..e16d6e7c9 100644 --- a/patches/server/0128-Movement-options-for-armor-stands.patch +++ b/patches/server/0128-Movement-options-for-armor-stands.patch @@ -17,10 +17,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index cc9b15d907b2035cd12de7fcc7f9f5317a7eac17..d31fd0ab9d0d206ba3628d6671686007e2ae4f59 100644 +index c565d863808a9facd561fb9704c2a9ce4ba2d5e2..168a906927ecb054c7dede2ceafa52bf80ebcace 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -1875,7 +1875,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -1874,7 +1874,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { return this.isInWater() || flag; } diff --git a/patches/server/0129-Fix-stuck-in-portals.patch b/patches/server/0129-Fix-stuck-in-portals.patch index bf2fe3ffe..b2fe5929d 100644 --- a/patches/server/0129-Fix-stuck-in-portals.patch +++ b/patches/server/0129-Fix-stuck-in-portals.patch @@ -17,10 +17,10 @@ index 6408bc1749c08fe5255c054bf4342e0870db2a20..7c1b92611f175156116554b5d33636ec // CraftBukkit end this.setServerLevel(worldserver); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index e4822d29f61f086e4967fcda8e7efd5b485b3d6b..6bedb5af6da75a49a1caa8bced73008bac559d50 100644 +index 168a906927ecb054c7dede2ceafa52bf80ebcace..a9bccae1837004444469965ebd25910407aa886a 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -3059,12 +3059,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -3058,12 +3058,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { return Vec3.directionFromRotation(this.getRotationVector()); } diff --git a/patches/server/0149-Drowning-Settings.patch b/patches/server/0149-Drowning-Settings.patch index 440f191c9..6265dc0dd 100644 --- a/patches/server/0149-Drowning-Settings.patch +++ b/patches/server/0149-Drowning-Settings.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Drowning Settings diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 6bedb5af6da75a49a1caa8bced73008bac559d50..aab99783b9fd6c181f30b2672d5957438a1fc620 100644 +index a9bccae1837004444469965ebd25910407aa886a..b27e5a27bcc5658fb49846158ab13ea52eb858c4 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -3304,7 +3304,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -3303,7 +3303,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } public int getMaxAirSupply() { diff --git a/patches/server/0181-Add-toggle-for-end-portal-safe-teleporting.patch b/patches/server/0181-Add-toggle-for-end-portal-safe-teleporting.patch index 9b1c50e4d..8c354c7d9 100644 --- a/patches/server/0181-Add-toggle-for-end-portal-safe-teleporting.patch +++ b/patches/server/0181-Add-toggle-for-end-portal-safe-teleporting.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add toggle for end portal safe teleporting diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 61dd24478dc1f955a3c67e81858aa7cec023b4de..75eb55794b3f025d065a4025bfbf415ac669b967 100644 +index 620dbbf8fc411cf52f71d00de9334f41a2a34010..8f21dbd5eb43dec6aa059ded36b92b4322ecb24c 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -3133,7 +3133,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -3132,7 +3132,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } this.processPortalCooldown(); diff --git a/patches/server/0271-Remove-Mojang-Profiler.patch b/patches/server/0271-Remove-Mojang-Profiler.patch index f1dd2d51b..038861a28 100644 --- a/patches/server/0271-Remove-Mojang-Profiler.patch +++ b/patches/server/0271-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 c43bfea788d1d019655631af8dc6c31effcbd23d..6d9205e34d237811788d487469e5e60bf977a3e0 100644 +index 47728d0b6903a7f5a78f43da28fbd55c3f515ceb..07fc2b5f8ecc3c72d13eff5d9aef08df39ecd251 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 aeacaf0e2567290930d4a0bb364e4e7d316a80d7..5cded930e23e881b2e02ed2456b1d7147fa63777 100644 +index da29c1f7727c0098a79603785ca648296f0fb963..2680aeabddc2dabc2c92e187149a567a842cada1 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 { @@ -1057,7 +1057,7 @@ index aeacaf0e2567290930d4a0bb364e4e7d316a80d7..5cded930e23e881b2e02ed2456b1d714 public float getBukkitYaw() { return this.yRot; } -@@ -863,7 +863,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -862,7 +862,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { // CraftBukkit end public void baseTick() { @@ -1066,7 +1066,7 @@ index aeacaf0e2567290930d4a0bb364e4e7d316a80d7..5cded930e23e881b2e02ed2456b1d714 if (firstTick && this instanceof net.minecraft.world.entity.NeutralMob neutralMob) neutralMob.tickInitialPersistentAnger(level); // Paper - Update last hurt when ticking this.feetBlockState = null; if (this.isPassenger() && this.getVehicle().isRemoved()) { -@@ -924,7 +924,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -923,7 +923,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } this.firstTick = false; @@ -1075,7 +1075,7 @@ index aeacaf0e2567290930d4a0bb364e4e7d316a80d7..5cded930e23e881b2e02ed2456b1d714 } public void setSharedFlagOnFire(boolean onFire) { -@@ -1143,7 +1143,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -1142,7 +1142,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } } @@ -1084,7 +1084,7 @@ index aeacaf0e2567290930d4a0bb364e4e7d316a80d7..5cded930e23e881b2e02ed2456b1d714 if (this.stuckSpeedMultiplier.lengthSqr() > 1.0E-7D) { movement = movement.multiply(this.stuckSpeedMultiplier); this.stuckSpeedMultiplier = Vec3.ZERO; -@@ -1152,7 +1152,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -1151,7 +1151,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { // Paper start - ignore movement changes while inactive. if (isTemporarilyActive && !(this instanceof ItemEntity || this instanceof net.minecraft.world.entity.vehicle.AbstractMinecart) && movement == getDeltaMovement() && movementType == MoverType.SELF) { setDeltaMovement(Vec3.ZERO); @@ -1093,7 +1093,7 @@ index aeacaf0e2567290930d4a0bb364e4e7d316a80d7..5cded930e23e881b2e02ed2456b1d714 return; } // Paper end -@@ -1173,8 +1173,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -1172,8 +1172,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { this.setPos(this.getX() + vec3d1.x, this.getY() + vec3d1.y, this.getZ() + vec3d1.z); } @@ -1104,7 +1104,7 @@ index aeacaf0e2567290930d4a0bb364e4e7d316a80d7..5cded930e23e881b2e02ed2456b1d714 boolean flag = !Mth.equal(movement.x, vec3d1.x); boolean flag1 = !Mth.equal(movement.z, vec3d1.z); -@@ -1193,7 +1193,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -1192,7 +1192,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { this.checkFallDamage(vec3d1.y, this.onGround(), iblockdata, blockposition); if (this.isRemoved()) { @@ -1113,7 +1113,7 @@ index aeacaf0e2567290930d4a0bb364e4e7d316a80d7..5cded930e23e881b2e02ed2456b1d714 } else { if (this.horizontalCollision) { Vec3 vec3d2 = this.getDeltaMovement(); -@@ -1331,7 +1331,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -1330,7 +1330,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { this.setRemainingFireTicks(-this.getFireImmuneTicks()); } @@ -1122,7 +1122,7 @@ index aeacaf0e2567290930d4a0bb364e4e7d316a80d7..5cded930e23e881b2e02ed2456b1d714 } } // Paper start - detailed watchdog information -@@ -3100,7 +3100,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -3099,7 +3099,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { ServerLevel worldserver1 = minecraftserver.getLevel(resourcekey); if (true && !this.isPassenger() && this.portalTime++ >= i) { // CraftBukkit @@ -1131,7 +1131,7 @@ index aeacaf0e2567290930d4a0bb364e4e7d316a80d7..5cded930e23e881b2e02ed2456b1d714 this.portalTime = i; // Paper start io.papermc.paper.event.entity.EntityPortalReadyEvent event = new io.papermc.paper.event.entity.EntityPortalReadyEvent(this.getBukkitEntity(), worldserver1 == null ? null : worldserver1.getWorld(), org.bukkit.PortalType.NETHER); -@@ -3118,7 +3118,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -3117,7 +3117,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } } // Paper // CraftBukkit end @@ -1140,7 +1140,7 @@ index aeacaf0e2567290930d4a0bb364e4e7d316a80d7..5cded930e23e881b2e02ed2456b1d714 } this.isInsidePortal = false; -@@ -3589,14 +3589,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -3588,14 +3588,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } // Paper end if (this.level() instanceof ServerLevel && !this.isRemoved()) { @@ -1157,7 +1157,7 @@ index aeacaf0e2567290930d4a0bb364e4e7d316a80d7..5cded930e23e881b2e02ed2456b1d714 PortalInfo shapedetectorshape = (location == null) ? this.findDimensionEntryPoint(worldserver) : new PortalInfo(new Vec3(location.x(), location.y(), location.z()), Vec3.ZERO, this.yRot, this.xRot, worldserver, null); // CraftBukkit if (shapedetectorshape == null) { -@@ -3630,7 +3630,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -3629,7 +3629,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { this.unRide(); // CraftBukkit end @@ -1166,7 +1166,7 @@ index aeacaf0e2567290930d4a0bb364e4e7d316a80d7..5cded930e23e881b2e02ed2456b1d714 // Paper start - Change lead drop timing to prevent dupe if (this instanceof Mob) { ((Mob) this).dropLeash(true, true); // Paper drop lead -@@ -3653,10 +3653,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -3652,10 +3652,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } this.removeAfterChangingDimensions(); diff --git a/patches/server/0290-Fire-Immunity-API.patch b/patches/server/0290-Fire-Immunity-API.patch index f0d9bc5b9..f35b45d1b 100644 --- a/patches/server/0290-Fire-Immunity-API.patch +++ b/patches/server/0290-Fire-Immunity-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fire Immunity API diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 5cded930e23e881b2e02ed2456b1d7147fa63777..a406740705fae2d50eb7ed55cadc4bd1cbe6591c 100644 +index 2680aeabddc2dabc2c92e187149a567a842cada1..146612fc235f4879123c73b59b1a15ef45c5d5dc 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -417,6 +417,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -16,7 +16,7 @@ index 5cded930e23e881b2e02ed2456b1d7147fa63777..a406740705fae2d50eb7ed55cadc4bd1 public void setOrigin(@javax.annotation.Nonnull Location location) { this.origin = location.toVector(); -@@ -1821,7 +1822,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -1820,7 +1821,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } public boolean fireImmune() { @@ -25,7 +25,7 @@ index 5cded930e23e881b2e02ed2456b1d7147fa63777..a406740705fae2d50eb7ed55cadc4bd1 } public boolean causeFallDamage(float fallDistance, float damageMultiplier, DamageSource damageSource) { -@@ -2491,6 +2492,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -2490,6 +2491,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { nbt.putBoolean("Paper.FreezeLock", true); } // Paper end @@ -37,7 +37,7 @@ index 5cded930e23e881b2e02ed2456b1d7147fa63777..a406740705fae2d50eb7ed55cadc4bd1 return nbt; } catch (Throwable throwable) { CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT"); -@@ -2659,6 +2665,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -2658,6 +2664,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { freezeLocked = nbt.getBoolean("Paper.FreezeLock"); } // Paper end diff --git a/patches/server/0291-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch b/patches/server/0291-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch index 3e09b407e..7e54259a2 100644 --- a/patches/server/0291-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch +++ b/patches/server/0291-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add option to teleport to spawn on nether ceiling damage diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index a406740705fae2d50eb7ed55cadc4bd1cbe6591c..8fe202c4b49324426568c18baf1461cf4fcd1cbc 100644 +index 146612fc235f4879123c73b59b1a15ef45c5d5dc..aa517a7c1e69f197d59d6a2cad73cf9199ac6129 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -938,6 +938,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -937,6 +937,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { && this.level.paperConfig().environment.netherCeilingVoidDamageHeight.test(v -> this.getY() >= v) && (!(this instanceof Player player) || !player.getAbilities().invulnerable))) { // Paper end