diff --git a/SHIT_TO_CHECK.md b/SHIT_TO_CHECK.md
index 9c54b6de4c..d6eeb9a774 100644
--- a/SHIT_TO_CHECK.md
+++ b/SHIT_TO_CHECK.md
@@ -5,4 +5,4 @@
 * Make sure the flat bedrock setting doesn't do anything stupid
 * Check DataBits foreach
 * lighting is bork (load chunk, fly away, come back, everything or parts are black)
-* block actions (particles/sounds) are bork (no chest opening, no bell, no noteblock)
+* chunk generation seems slow with a lot of it happening
\ No newline at end of file
diff --git a/Spigot-Server-Patches/Optimize-TileEntity-Ticking.patch b/Spigot-Server-Patches/Optimize-TileEntity-Ticking.patch
index 6174e02618..3c82f242b6 100644
--- a/Spigot-Server-Patches/Optimize-TileEntity-Ticking.patch
+++ b/Spigot-Server-Patches/Optimize-TileEntity-Ticking.patch
@@ -107,7 +107,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
  
      private void a(SoundEffect soundeffect) {
-+        if (!this.getBlock().get(BlockChest.waterlogged())) { return; } // Paper - this can be delayed, double check exists - Fixes GH-2074
++        if (!this.getBlock().b(BlockChest.c)) { return; } // Paper - this can be delayed, double check exists - Fixes GH-2074
          BlockPropertyChestType blockpropertychesttype = (BlockPropertyChestType) this.getBlock().get(BlockChest.c);
  
          if (blockpropertychesttype != BlockPropertyChestType.LEFT) {
diff --git a/Spigot-Server-Patches/Optimize-sending-packets-to-nearby-locations-sounds-.patch b/Spigot-Server-Patches/Optimize-sending-packets-to-nearby-locations-sounds-.patch
index 134174dfab..25ee7890ef 100644
--- a/Spigot-Server-Patches/Optimize-sending-packets-to-nearby-locations-sounds-.patch
+++ b/Spigot-Server-Patches/Optimize-sending-packets-to-nearby-locations-sounds-.patch
@@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              // CraftBukkit end
  
 -            if (entityplayer != entityhuman && entityplayer.world.getDimensionKey() == resourcekey) {
-+            if (entityplayer != entityhuman && entityplayer.world.getDimensionKey() == resourcekey && entityhuman instanceof EntityPlayer && !entityplayer.getBukkitEntity().canSee(((EntityPlayer) entityhuman).getBukkitEntity())) { // Paper
++            if (entityplayer != entityhuman && entityplayer.world.getDimensionKey() == resourcekey && (!(entityhuman instanceof EntityPlayer) || entityplayer.getBukkitEntity().canSee(((EntityPlayer) entityhuman).getBukkitEntity()))) { // Paper
                  double d4 = d0 - entityplayer.locX();
                  double d5 = d1 - entityplayer.locY();
                  double d6 = d2 - entityplayer.locZ();