diff --git a/patches/server/0001-Tuinity-Server-Changes.patch b/patches/server/0001-Tuinity-Server-Changes.patch
index f2a417ad1..88301f949 100644
--- a/patches/server/0001-Tuinity-Server-Changes.patch
+++ b/patches/server/0001-Tuinity-Server-Changes.patch
@@ -5905,7 +5905,7 @@ index 0000000000000000000000000000000000000000..01320aea07b51c97ae5f0654b81d2332
 +}
 diff --git a/src/main/java/com/tuinity/tuinity/util/CollisionUtil.java b/src/main/java/com/tuinity/tuinity/util/CollisionUtil.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..d08289dda13d31ec1019722af554dc1d834b41e4
+index 0000000000000000000000000000000000000000..089d66ce4913e97c5fc79daee0f2fd932664f28f
 --- /dev/null
 +++ b/src/main/java/com/tuinity/tuinity/util/CollisionUtil.java
 @@ -0,0 +1,600 @@
@@ -6476,7 +6476,7 @@ index 0000000000000000000000000000000000000000..d08289dda13d31ec1019722af554dc1d
 +            for (int i = 0, len = entities.size(); i < len; ++i) {
 +                final Entity otherEntity = entities.get(i);
 +
-+                if ((entity == null && otherEntity.canBeCollidedWith()) || entity.canCollideWith(otherEntity)) {
++                if ((entity == null && otherEntity.canBeCollidedWith()) || (entity != null && entity.canCollideWith(otherEntity))) {
 +                    if (checkOnly) {
 +                        return true;
 +                    } else {