From 2fdf052be148478ae32ec12a17736e38dbece187 Mon Sep 17 00:00:00 2001
From: CraftBukkit/Spigot <noreply+git-craftbukkit@papermc.io>
Date: Fri, 7 Jun 2019 19:36:40 +1000
Subject: [PATCH] SPIGOT-5038: Inventory.getHolder returns null for wandering
 traders

By: md_5 <git@md-5.net>
---
 paper-server/nms-patches/InventoryMerchant.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/paper-server/nms-patches/InventoryMerchant.patch b/paper-server/nms-patches/InventoryMerchant.patch
index 1e490c3e60..e41418c394 100644
--- a/paper-server/nms-patches/InventoryMerchant.patch
+++ b/paper-server/nms-patches/InventoryMerchant.patch
@@ -49,7 +49,7 @@
 +    }
 +
 +    public org.bukkit.inventory.InventoryHolder getOwner() {
-+        return (merchant instanceof EntityVillager) ? (CraftAbstractVillager) ((EntityVillager) this.merchant).getBukkitEntity() : null;
++        return (merchant instanceof EntityVillagerAbstract) ? (CraftAbstractVillager) ((EntityVillagerAbstract) this.merchant).getBukkitEntity() : null;
 +    }
 +
 +    @Override