summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWesley Wolfe <weswolf@aol.com>2013-07-01 22:29:43 -0500
committerWesley Wolfe <weswolf@aol.com>2013-07-01 22:29:43 -0500
commite79d26d7d74bf5fa5cd1c1a8de7eaba84f37fd2e (patch)
treef972c7194f254fc417dbae2ba2264b95884ad140 /src
parent6c09066e224ac85b8a6464eaf8f53edfeb4beda4 (diff)
downloadcraftbukkit-e79d26d7d74bf5fa5cd1c1a8de7eaba84f37fd2e.tar
craftbukkit-e79d26d7d74bf5fa5cd1c1a8de7eaba84f37fd2e.tar.gz
craftbukkit-e79d26d7d74bf5fa5cd1c1a8de7eaba84f37fd2e.tar.lz
craftbukkit-e79d26d7d74bf5fa5cd1c1a8de7eaba84f37fd2e.tar.xz
craftbukkit-e79d26d7d74bf5fa5cd1c1a8de7eaba84f37fd2e.zip
Fixed NPE in BrewingStand
Diffstat (limited to 'src')
-rw-r--r--src/main/java/net/minecraft/server/TileEntityBrewingStand.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/TileEntityBrewingStand.java b/src/main/java/net/minecraft/server/TileEntityBrewingStand.java
index f1883f37..e98e29bf 100644
--- a/src/main/java/net/minecraft/server/TileEntityBrewingStand.java
+++ b/src/main/java/net/minecraft/server/TileEntityBrewingStand.java
@@ -121,8 +121,7 @@ public class TileEntityBrewingStand extends TileEntity implements IWorldInventor
List list = Item.POTION.c(j);
List list1 = Item.POTION.c(k);
- // CraftBukkit - list != -> !list.equals
- if ((j <= 0 || !list.equals(list1)) && (list == null || !list.equals(list1) && list1 != null) && j != k) {
+ if ((j <= 0 || list != list1) && (list == null || !list.equals(list1) && list1 != null) && j != k) {
flag = true;
break;
}