Several fixes and new api for experience merging/stacking (#9242)

1 files changed, 22 insertions, 0 deletions

diff --git a/patches/server/0545-Move-range-check-for-block-placing-up.patch b/patches/server/0545-Move-range-check-for-block-placing-up.patch
new file mode 100644
index 0000000000..44913b8c49
--- /dev/null
+++ b/patches/server/0545-Move-range-check-for-block-placing-up.patch
@@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nassim Jahnke <[email protected]>
+Date: Wed, 8 Jun 2022 10:52:18 +0200
+Subject: [PATCH] Move range check for block placing up
+
+
+diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index 4a5553335cd6bbad8d3a05694710d95c96f62b9d..a04c7677ded862890e6e809db610817b4cfff56a 100644
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -1734,6 +1734,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+         if (itemstack.isItemEnabled(worldserver.enabledFeatures())) {
+             BlockHitResult movingobjectpositionblock = packet.getHitResult();
+             Vec3 vec3d = movingobjectpositionblock.getLocation();
++            // Paper start - improve distance check
++            if (!Double.isFinite(vec3d.x) || !Double.isFinite(vec3d.y) || !Double.isFinite(vec3d.z)) {
++                return;
++            }
++            // Paper end - improve distance check
+             BlockPos blockposition = movingobjectpositionblock.getBlockPos();
+ 
+             if (this.player.canInteractWithBlock(blockposition, 1.0D)) {