diff --git a/WindSpigot-Server/src/main/java/net/minecraft/server/EntityHanging.java b/WindSpigot-Server/src/main/java/net/minecraft/server/EntityHanging.java
index 3ab26c5d7..4af79878b 100644
--- a/WindSpigot-Server/src/main/java/net/minecraft/server/EntityHanging.java
+++ b/WindSpigot-Server/src/main/java/net/minecraft/server/EntityHanging.java
@@ -104,11 +104,9 @@ public void t_() {
 			this.c = 0;
 			if (!this.dead && !this.survives()) {
 				// CraftBukkit start - fire break events
-				Material material = this.world.getType(new BlockPosition(this)).getBlock().getMaterial();
 				HangingBreakEvent.RemoveCause cause;
 
-				if (!material.equals(Material.AIR)) {
-					// TODO: This feels insufficient to catch 100% of suffocation cases
+				if (!this.world.getCubes(this, this.getBoundingBox()).isEmpty()) {
 					cause = HangingBreakEvent.RemoveCause.OBSTRUCTION;
 				} else {
 					cause = HangingBreakEvent.RemoveCause.PHYSICS;