diff --git a/nms-patches/Entity.patch b/nms-patches/Entity.patch
index 580ffc4f6f..8b655fd9a1 100644
--- a/nms-patches/Entity.patch
+++ b/nms-patches/Entity.patch
@@ -224,7 +224,7 @@
 +                    bl = bl.getRelative(BlockFace.NORTH);
 +                }
 +
-+                if (bl.getType() != org.bukkit.Material.AIR) {
++                if (!bl.getType().isAir()) {
 +                    VehicleBlockCollisionEvent event = new VehicleBlockCollisionEvent(vehicle, bl);
 +                    world.getServer().getPluginManager().callEvent(event);
 +                }
diff --git a/nms-patches/EntityEnderDragon.patch b/nms-patches/EntityEnderDragon.patch
index f4a12da41c..92932b6655 100644
--- a/nms-patches/EntityEnderDragon.patch
+++ b/nms-patches/EntityEnderDragon.patch
@@ -95,7 +95,7 @@
 +        } else {
 +            for (org.bukkit.block.Block block : event.blockList()) {
 +                org.bukkit.Material blockId = block.getType();
-+                if (blockId == org.bukkit.Material.AIR) {
++                if (blockId.isAir()) {
 +                    continue;
 +                }
 +
diff --git a/nms-patches/Explosion.patch b/nms-patches/Explosion.patch
index 494c5ea2ce..68b96fcbe8 100644
--- a/nms-patches/Explosion.patch
+++ b/nms-patches/Explosion.patch
@@ -80,7 +80,7 @@
 +            for (int i1 = this.blocks.size() - 1; i1 >= 0; i1--) {
 +                BlockPosition cpos = (BlockPosition) this.blocks.get(i1);
 +                org.bukkit.block.Block bblock = bworld.getBlockAt(cpos.getX(), cpos.getY(), cpos.getZ());
-+                if (bblock.getType() != org.bukkit.Material.AIR) {
++                if (!bblock.getType().isAir()) {
 +                    blockList.add(bblock);
 +                }
 +            }