From 81c751a8a3feeb9c8d2b66177badd0e415f13cc7 Mon Sep 17 00:00:00 2001
From: Tahg <tahgtahv@gmail.com>
Date: Tue, 20 Dec 2011 21:20:43 -0500
Subject: [PATCH] Fix for water and lava removal in creative mode BUKKIT-362

---
 src/main/java/net/minecraft/server/ItemBucket.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/minecraft/server/ItemBucket.java b/src/main/java/net/minecraft/server/ItemBucket.java
index 4b6a242231..3dd4c157e8 100644
--- a/src/main/java/net/minecraft/server/ItemBucket.java
+++ b/src/main/java/net/minecraft/server/ItemBucket.java
@@ -50,13 +50,13 @@ public class ItemBucket extends Item {
                         if (event.isCancelled()) {
                             return itemstack;
                         }
+                        world.setTypeId(i, j, k, 0);
 
                         if (entityhuman.abilities.canInstantlyBuild) {
                             return itemstack;
                         }
                         // CraftBukkit end
 
-                        world.setTypeId(i, j, k, 0);
                         return CraftItemStack.createNMSItemStack(event.getItemStack()); // CraftBukkit
                     }
 
@@ -67,13 +67,13 @@ public class ItemBucket extends Item {
                         if (event.isCancelled()) {
                             return itemstack;
                         }
+                        world.setTypeId(i, j, k, 0);
 
                         if (entityhuman.abilities.canInstantlyBuild) {
                             return itemstack;
                         }
                         // CraftBukkit end
 
-                        world.setTypeId(i, j, k, 0);
                         return CraftItemStack.createNMSItemStack(event.getItemStack()); // CraftBukkit
                     }
                 } else {