diff --git a/patches/server/0049-Add-option-for-pushable-TileEntities.patch b/patches/server/0049-Add-option-for-pushable-TileEntities.patch
index 0203b3d2..84daced6 100644
--- a/patches/server/0049-Add-option-for-pushable-TileEntities.patch
+++ b/patches/server/0049-Add-option-for-pushable-TileEntities.patch
@@ -1,4 +1,4 @@
-From 861a02afb0c96a9876c2a742d6ea37b16e47c34e Mon Sep 17 00:00:00 2001
+From fd41a2d2cc63f7d1eda382ff7c3535c3b9426b68 Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Sun, 29 Mar 2020 01:59:27 +0100
 Subject: [PATCH] Add option for pushable TileEntities
@@ -669,7 +669,7 @@ index 000000000..b32f23198
 +}
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 90b9e7feb..37241e999 100644
+index 90b9e7feb..89faa523e 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -612,6 +612,13 @@ public class WorldServer extends World {
@@ -677,7 +677,7 @@ index 90b9e7feb..37241e999 100644
          if (type instanceof ITileEntity) {
              TileEntity replacement = ((ITileEntity) type).createTile(this);
 +            // YAPFA start - Better handeling of missplaced tiles, moving_piston returns null!
-+            if(type instanceof BlockPistonMoving) {
++            if(replacement == null) {
 +            	this.setAir(pos);
 +            	this.removeTileEntity(pos);
 +            	return null;