From 809dcc249d9d49a03c3f608ecd5d69f8df24e121 Mon Sep 17 00:00:00 2001
From: CraftBukkit/Spigot <noreply+git-craftbukkit@papermc.io>
Date: Thu, 6 Jun 2019 20:51:53 +1000
Subject: [PATCH] SPIGOT-5035: Error Using Virtual Merchant GUI

By: md_5 <git@md-5.net>
---
 paper-server/nms-patches/ContainerMerchant.patch | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/paper-server/nms-patches/ContainerMerchant.patch b/paper-server/nms-patches/ContainerMerchant.patch
index 38497b494..cf1cfb005 100644
--- a/paper-server/nms-patches/ContainerMerchant.patch
+++ b/paper-server/nms-patches/ContainerMerchant.patch
@@ -34,3 +34,12 @@
  
          int j;
  
+@@ -96,7 +112,7 @@
+     }
+ 
+     private void j() {
+-        if (!this.merchant.getWorld().isClientSide) {
++        if (!this.merchant.getWorld().isClientSide && this.merchant instanceof Entity) { // CraftBukkit - SPIGOT-5035
+             Entity entity = (Entity) this.merchant;
+ 
+             this.merchant.getWorld().a(entity.locX, entity.locY, entity.locZ, this.merchant.eb(), SoundCategory.NEUTRAL, 1.0F, 1.0F, false);