@@ -30,7 +30,7 @@ index ca2b363ec145a2c272d5cd0abde9fafdf24276e7..67021175410926dbdd7759af28b082a8
3030 net.minecraft.world.level.block.entity.HopperBlockEntity.skipHopperEvents = level.paperConfig().hopper.disableMoveEvent || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper - Perf: Optimize Hoppers
3131 profiler.push(() -> level + " " + level.dimension().identifier());
3232diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
33- index 66af908dffcbe98ddd0c592967a4983275419612..31f0e6da1dc8ffd3a51889580e4b52ca8b0d2662 100644
33+ index cb1b1846779ee931e1e7ef81f0f1093c69d01b5c..19c3131f1b970aa0443800dcffd20b996ba8d7d5 100644
3434--- a/net/minecraft/server/level/ServerLevel.java
3535+++ b/net/minecraft/server/level/ServerLevel.java
3636@@ -237,6 +237,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet
@@ -42,7 +42,7 @@ index 66af908dffcbe98ddd0c592967a4983275419612..31f0e6da1dc8ffd3a51889580e4b52ca
4242 @Override
4343 public @Nullable LevelChunk getChunkIfLoaded(int x, int z) {
4444diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
45- index a9b3b68130e2ff7ab610bb4302852c1fdb9da8ac..8aaeb0f73fe6c3f5a4fe5b739033951305dcc54d 100644
45+ index 98ab32d14eb1d3329a85a4cdf730c0fa00d20527..6d8df4a768e942a2df838cc89e641a0c7ba3880d 100644
4646--- a/net/minecraft/server/level/ServerPlayer.java
4747+++ b/net/minecraft/server/level/ServerPlayer.java
4848@@ -775,6 +775,15 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -62,7 +62,7 @@ index a9b3b68130e2ff7ab610bb4302852c1fdb9da8ac..8aaeb0f73fe6c3f5a4fe5b7390339513
6262
6363 private void updatePlayerAttributes() {
6464diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
65- index c267c3da1cebeeff0b52ee5d1035fd7151bfa54b..d731cea2005dff7be6e8e82d602b11355a143ec7 100644
65+ index 08a2144cc0036726292ab08d93374ac55ebe71c2..b82c9194c3c6b93b6f1e3e8f5d9f77010504fce1 100644
6666--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
6767+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
6868@@ -2988,6 +2988,8 @@ public class ServerGamePacketListenerImpl
@@ -75,10 +75,10 @@ index c267c3da1cebeeff0b52ee5d1035fd7151bfa54b..d731cea2005dff7be6e8e82d602b1135
7575 if (itemType == Items.WATER_BUCKET && target instanceof net.minecraft.world.entity.Bucketable && target instanceof LivingEntity && resendData) {
7676 target.resendPossiblyDesyncedEntityData(ServerGamePacketListenerImpl.this.player); // Paper - The entire mob gets deleted, so resend it
7777diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
78- index 4f76df4413fed2cdf9fc3e468bd65a028cd0bc42..8b4dad5159e3c3c928d847d26ca07bcfcd9c01f8 100644
78+ index dbfd1d2cb46873c8b066df0e025f40676fa8f178..1bb4a996ddaf55cfc1f991a96577984bc0862416 100644
7979--- a/net/minecraft/world/entity/Entity.java
8080+++ b/net/minecraft/world/entity/Entity.java
81- @@ -3463 ,6 +3463 ,13 @@ public abstract class Entity
81+ @@ -3459 ,6 +3459 ,13 @@ public abstract class Entity
8282
8383 this.passengers = ImmutableList.copyOf(newPassengers);
8484 }
@@ -92,7 +92,7 @@ index 4f76df4413fed2cdf9fc3e468bd65a028cd0bc42..8b4dad5159e3c3c928d847d26ca07bcf
9292 }
9393
9494 // Paper start - Force entity dismount during teleportation
95- @@ -3503 ,6 +3510 ,14 @@ public abstract class Entity
95+ @@ -3499 ,6 +3506 ,14 @@ public abstract class Entity
9696 return false;
9797 }
9898 // CraftBukkit end
@@ -107,7 +107,7 @@ index 4f76df4413fed2cdf9fc3e468bd65a028cd0bc42..8b4dad5159e3c3c928d847d26ca07bcf
107107 if (this.passengers.size() == 1 && this.passengers.get(0) == passenger) {
108108 this.passengers = ImmutableList.of();
109109 } else {
110- @@ -5497 ,4 +5512 ,44 @@ public abstract class Entity
110+ @@ -5493 ,4 +5508 ,44 @@ public abstract class Entity
111111 return ((ServerLevel) this.level()).isPositionEntityTicking(this.blockPosition());
112112 }
113113 // Paper end
0 commit comments