diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
index a36876e495..2bc0b2e093 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
@@ -578,7 +578,7 @@ public class CraftBlock implements Block {
 
     @Override
     public boolean isLiquid() {
-        return (getType() == Material.WATER) || (getType() == Material.LAVA);
+        return getNMS().getMaterial().isLiquid();
     }
 
     @Override