diff --git a/Spigot-Server-Patches/No-Tick-view-distance-implementation.patch b/Spigot-Server-Patches/No-Tick-view-distance-implementation.patch
index ef4ea1eb1e..82ba59b0e4 100644
--- a/Spigot-Server-Patches/No-Tick-view-distance-implementation.patch
+++ b/Spigot-Server-Patches/No-Tick-view-distance-implementation.patch
@@ -615,7 +615,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                // Paper end - per player view distance
              }
  
-             if (!this.isClientSide && (i & 1) != 0) {
+             if ((i & 1) != 0) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
diff --git a/Spigot-Server-Patches/Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/Spigot-Server-Patches/Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
index 14ccdbaaae..7dab1548f5 100644
--- a/Spigot-Server-Patches/Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
+++ b/Spigot-Server-Patches/Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
@@ -49,7 +49,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
                  // CraftBukkit start
-                 iblockdata1.b(this, blockposition, j); // Don't call an event for the old block to limit event spam
+                 iblockdata1.b(this, blockposition, k, j - 1); // Don't call an event for the old block to limit event spam
                  CraftWorld world = ((WorldServer) this).getWorld();
 -                if (world != null) {
 +                if (world != null && ((WorldServer)this).hasPhysicsEvent) { // Paper
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 7a9e4f7aeb..2f18108123 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 7a9e4f7aebbdb9c119aa82b2c7988c982d02b13a
+Subproject commit 2f18108123a33312a073906cd2a5fe2da18dc049
diff --git a/work/Spigot b/work/Spigot
index 8918ad0f3e..c3a49df215 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 8918ad0f3ef4002d099b2465dc0d6bbb20891e5a
+Subproject commit c3a49df215f30328bf56f08227072c79944760ed