diff --git a/WindSpigot-Server/src/main/java/net/minecraft/server/EntityLiving.java b/WindSpigot-Server/src/main/java/net/minecraft/server/EntityLiving.java
index 6b43d7133..b768eba69 100644
--- a/WindSpigot-Server/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/WindSpigot-Server/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1862,12 +1862,11 @@ protected void bL() {
 				} // Spigot
 				Entity entity = (Entity) list.get(i);
 
-				// TODO better check now?
-				// CraftBukkit start - Only handle mob (non-player) collisions every other tick
-				if (entity instanceof EntityLiving && !(this instanceof EntityPlayer) && this.ticksLived % 2 == 0) {
-					continue;
-				}
-				// CraftBukkit end
+                // CraftBukkit start - Only handle mob (non-player) collisions every other tick
+                if (entity instanceof EntityLiving && !(this instanceof EntityPlayer) && (MinecraftServer.currentTick & 1) == 0) {
+                    continue;
+                }
+                // CraftBukkit end
 
 				entity.numCollisions++; // Spigot
 				numCollisions++; // Spigot