From 7c743ff64b7f7bebd861ba8d7537781fff92c7c8 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 27 Dec 2016 09:01:22 +1100
Subject: SPIGOT-2963: Endless loop in CraftHumanEntity#openMerchant

---
 src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/org/bukkit')

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
-- 
cgit v1.2.3