summaryrefslogtreecommitdiffstats
path: root/nms-patches/BlockCauldron.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2016-05-10 21:47:39 +1000
committermd_5 <git@md-5.net>2016-05-10 21:47:39 +1000
commitc5e9a169fa564f3b8119b6666f8df59d5a9b45c3 (patch)
tree9f3b1ce732f0082b71512b1dddb7abb35526226e /nms-patches/BlockCauldron.patch
parent4cb32587ac1ff543b2efa9498f8d0d358cb90c12 (diff)
downloadcraftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar
craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar.gz
craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar.lz
craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar.xz
craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.zip
Minecraft 1.9.4
Diffstat (limited to 'nms-patches/BlockCauldron.patch')
-rw-r--r--nms-patches/BlockCauldron.patch22
1 files changed, 11 insertions, 11 deletions
diff --git a/nms-patches/BlockCauldron.patch b/nms-patches/BlockCauldron.patch
index 716766ba..08b09fac 100644
--- a/nms-patches/BlockCauldron.patch
+++ b/nms-patches/BlockCauldron.patch
@@ -1,14 +1,14 @@
--- a/net/minecraft/server/BlockCauldron.java
+++ b/net/minecraft/server/BlockCauldron.java
-@@ -2,6 +2,7 @@
-
+@@ -3,6 +3,7 @@
import java.util.List;
import java.util.Random;
+ import javax.annotation.Nullable;
+import org.bukkit.event.block.CauldronLevelChangeEvent; // CraftBukkit
public class BlockCauldron extends Block {
-@@ -42,8 +43,13 @@
+@@ -43,8 +44,13 @@
float f = (float) blockposition.getY() + (6.0F + (float) (3 * i)) / 16.0F;
if (!world.isClientSide && entity.isBurning() && i > 0 && entity.getBoundingBox().b <= (double) f) {
@@ -23,7 +23,7 @@
}
}
-@@ -57,17 +63,26 @@
+@@ -58,17 +64,26 @@
if (item == Items.WATER_BUCKET) {
if (i < 3 && !world.isClientSide) {
@@ -51,7 +51,7 @@
if (!entityhuman.abilities.canInstantlyBuild) {
--itemstack.count;
if (itemstack.count == 0) {
-@@ -78,7 +93,8 @@
+@@ -79,7 +94,8 @@
}
entityhuman.b(StatisticList.L);
@@ -61,7 +61,7 @@
}
return true;
-@@ -87,6 +103,10 @@
+@@ -88,6 +104,10 @@
if (item == Items.GLASS_BOTTLE) {
if (i > 0 && !world.isClientSide) {
@@ -72,7 +72,7 @@
if (!entityhuman.abilities.canInstantlyBuild) {
itemstack1 = PotionUtil.a(new ItemStack(Items.POTION), Potions.b);
entityhuman.b(StatisticList.L);
-@@ -99,7 +119,8 @@
+@@ -100,7 +120,8 @@
}
}
@@ -82,7 +82,7 @@
}
return true;
-@@ -108,8 +129,13 @@
+@@ -109,8 +130,13 @@
ItemArmor itemarmor = (ItemArmor) item;
if (itemarmor.d() == ItemArmor.EnumArmorMaterial.LEATHER && itemarmor.e_(itemstack) && !world.isClientSide) {
@@ -97,7 +97,7 @@
entityhuman.b(StatisticList.M);
return true;
}
-@@ -134,7 +160,7 @@
+@@ -135,7 +161,7 @@
}
if (!entityhuman.abilities.canInstantlyBuild) {
@@ -106,7 +106,7 @@
}
}
-@@ -147,9 +173,25 @@
+@@ -148,9 +174,25 @@
}
}
@@ -133,7 +133,7 @@
}
public void h(World world, BlockPosition blockposition) {
-@@ -160,7 +202,7 @@
+@@ -161,7 +203,7 @@
IBlockData iblockdata = world.getType(blockposition);
if (((Integer) iblockdata.get(BlockCauldron.LEVEL)).intValue() < 3) {