--- ../src-base/minecraft/net/minecraft/tileentity/TileEntityBrewingStand.java
+++ ../src-work/minecraft/net/minecraft/tileentity/TileEntityBrewingStand.java
@@ -118,7 +118,7 @@
 
                 for (int i = 0; i < 3; ++i)
                 {
-                    if (this.field_145945_j[i] != null && this.field_145945_j[i].func_77973_b() == Items.field_151068_bn)
+                    if (this.field_145945_j[i] != null && this.field_145945_j[i].func_77973_b() instanceof ItemPotion)
                     {
                         int j = this.field_145945_j[i].func_77960_j();
                         int k = this.func_145936_c(j, itemstack);
@@ -157,7 +157,7 @@
 
             for (int i = 0; i < 3; ++i)
             {
-                if (this.field_145945_j[i] != null && this.field_145945_j[i].func_77973_b() == Items.field_151068_bn)
+                if (this.field_145945_j[i] != null && this.field_145945_j[i].func_77973_b() instanceof ItemPotion)
                 {
                     int j = this.field_145945_j[i].func_77960_j();
                     int k = this.func_145936_c(j, itemstack);
@@ -178,9 +178,9 @@
                 }
             }
 
-            if (itemstack.func_77973_b().func_77634_r())
+            if (itemstack.func_77973_b().hasContainerItem(itemstack))
             {
-                this.field_145945_j[3] = new ItemStack(itemstack.func_77973_b().func_77668_q());
+                this.field_145945_j[3] = itemstack.func_77973_b().getContainerItem(itemstack);
             }
             else
             {
@@ -191,6 +191,7 @@
                     this.field_145945_j[3] = null;
                 }
             }
+            net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.brewing.PotionBrewedEvent(field_145945_j));
         }
     }
 
@@ -306,7 +307,7 @@
 
     public boolean func_94041_b(int p_94041_1_, ItemStack p_94041_2_)
     {
-        return p_94041_1_ == 3 ? p_94041_2_.func_77973_b().func_150892_m(p_94041_2_) : p_94041_2_.func_77973_b() == Items.field_151068_bn || p_94041_2_.func_77973_b() == Items.field_151069_bo;
+        return p_94041_1_ == 3 ? p_94041_2_.func_77973_b().func_150892_m(p_94041_2_) : p_94041_2_.func_77973_b() instanceof ItemPotion || p_94041_2_.func_77973_b() == Items.field_151069_bo;
     }
 
     public boolean[] func_174902_m()
