diff --git a/paper-server/patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch b/paper-server/patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch
index 8a9fec619627..3469f585b43b 100644
--- a/paper-server/patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch
+++ b/paper-server/patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch
@@ -1257,7 +1257,7 @@
                                      this.player.swing(hand, true);
                                  }
  
-@@ -1387,6 +_,15 @@
+@@ -1387,20 +_,24 @@
                                      && success.swingSource() == InteractionResult.SwingSource.SERVER) {
                                      this.player.swing(hand, true);
                                  }
@@ -1271,9 +1271,10 @@
 +                                }
 +                            // Paper end - Fix inventory desync
                              } else {
-                                 this.player.sendBuildLimitMessage(true, maxY);
+-                                this.player.sendBuildLimitMessage(true, maxY);
++                                // this.player.sendBuildLimitMessage(true, maxY); // Paper - Fix MC-306582: Fix build limit message being sent when it shouldn't be
                              }
-@@ -1394,13 +_,8 @@
+ 
                              this.send(new ClientboundBlockUpdatePacket(level, pos));
                              this.send(new ClientboundBlockUpdatePacket(level, pos.relative(direction)));
                          }