summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2016-12-27 09:01:22 +1100
committermd_5 <git@md-5.net>2016-12-27 09:01:22 +1100
commit7c743ff64b7f7bebd861ba8d7537781fff92c7c8 (patch)
tree79cd3149b8747bb097db073af678de5559b69883 /src/main/java
parent50acb4477d0f73a668d58fe0b5a8e69e2665094a (diff)
downloadcraftbukkit-7c743ff64b7f7bebd861ba8d7537781fff92c7c8.tar
craftbukkit-7c743ff64b7f7bebd861ba8d7537781fff92c7c8.tar.gz
craftbukkit-7c743ff64b7f7bebd861ba8d7537781fff92c7c8.tar.lz
craftbukkit-7c743ff64b7f7bebd861ba8d7537781fff92c7c8.tar.xz
craftbukkit-7c743ff64b7f7bebd861ba8d7537781fff92c7c8.zip
SPIGOT-2963: Endless loop in CraftHumanEntity#openMerchant
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
index 75d82469..581a4394 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
@@ -360,7 +360,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
public InventoryView openMerchant(Villager villager, boolean force) {
Preconditions.checkNotNull(villager, "villager cannot be null");
- return this.openMerchant(villager, force);
+ return this.openMerchant((Merchant) villager, force);
}
@Override