diff --git a/Paper b/Paper
index 5234e6e24..d62bab6e2 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit 5234e6e24215cd62ab1c8f081d5a7a51936e78d4
+Subproject commit d62bab6e2591e2bc99220a5f79339d5253b043d2
diff --git a/current-paper b/current-paper
index ebae12815..98ac76b24 100644
--- a/current-paper
+++ b/current-paper
@@ -1 +1 @@
-1.16.3--a692b28ba241d4cc060e7af7096994c7e06fd525
+1.16.3--1ab7b4eb563f1025700ccba92b574ed7b450062e
diff --git a/patches/server/0001-Tuinity-Server-Changes.patch b/patches/server/0001-Tuinity-Server-Changes.patch
index 0cad97236..64f5a7986 100644
--- a/patches/server/0001-Tuinity-Server-Changes.patch
+++ b/patches/server/0001-Tuinity-Server-Changes.patch
@@ -2287,18 +2287,6 @@ index 2d887af902..2291135eae 100644
  
          @Override
          public BlockPosition immutableCopy() {
-diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
-index 6abc3d4cfb..a8ef41dcf5 100644
---- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java
-+++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
-@@ -226,6 +226,7 @@ public class BlockRedstoneWire extends Block {
-     private void updateSurroundingRedstone(World worldIn, BlockPosition pos, IBlockData state, BlockPosition source) {
-         if (worldIn.paperConfig.useEigencraftRedstone) {
-             turbo.updateSurroundingRedstone(worldIn, pos, state, source);
-+            return; // Tuinity - Don't run old logic as well
-         }
-         a(worldIn, pos, state);
-     }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
 index 299d7d7a55..ac6e5e3309 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
@@ -3156,7 +3144,7 @@ index 550232cb38..229c3b0f0c 100644
                      throwable = throwable1;
                      throw throwable1;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ebdbbeb1b5..6bc0299d15 100644
+index 28e2d3f0a5..e03635d415 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -136,7 +136,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -7351,7 +7339,7 @@ index 7591159c25..e5c3e5765c 100644
  
      public IBlockData getState() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 6ceb2d50c5..407c03408a 100644
+index 6f59f8d454..704d000001 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -501,27 +501,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {