diff --git a/Spigot-Server-Patches/LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/LootTable-API-Replenishable-Lootables-Feature.patch
index a04f5722f..30b41685c 100644
--- a/Spigot-Server-Patches/LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/Spigot-Server-Patches/LootTable-API-Replenishable-Lootables-Feature.patch
@@ -78,6 +78,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    TileEntityLootable getTileEntity();
 +
 +    @Override
++    default LootableInventory getAPILootableInventory() {
++        return this;
++    }
++
++    @Override
 +    default World getNMSWorld() {
 +        return getTileEntity().getWorld();
 +    }
@@ -108,6 +113,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +    net.minecraft.server.Entity getHandle();
 +
++    @Override
++    default LootableInventory getAPILootableInventory() {
++        return this;
++    }
++
 +    default Entity getEntity() {
 +        return getHandle().getBukkitEntity();
 +    }
@@ -140,6 +150,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +public interface CraftLootableInventory extends CraftLootable, LootableInventory {
 +
 +    CraftLootableInventoryData getLootableData();
++    LootableInventory getAPILootableInventory();
 +
 +    @Override
 +    default boolean isRefillEnabled() {
@@ -304,7 +315,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +
 +        final Player bukkitPlayer = (Player) player.getBukkitEntity();
-+        LootableInventoryReplenishEvent event = new LootableInventoryReplenishEvent(bukkitPlayer, lootable);
++        LootableInventoryReplenishEvent event = new LootableInventoryReplenishEvent(bukkitPlayer, lootable.getAPILootableInventory());
 +        if (paperConfig.restrictPlayerReloot && hasPlayerLooted(player.getUniqueID())) {
 +            event.setCancelled(true);
 +        }
@@ -414,6 +425,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +import com.destroystokyo.paper.loottable.CraftLootableInventoryData; // Paper
 +import com.destroystokyo.paper.loottable.CraftLootableInventory; // Paper
++import com.destroystokyo.paper.loottable.LootableInventory; // Paper
  import org.bukkit.craftbukkit.entity.CraftHumanEntity;
  import org.bukkit.entity.HumanEntity;
  import org.bukkit.inventory.InventoryHolder;
@@ -476,7 +488,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
 +
 +    // Paper start
-+    private CraftLootableInventoryData lootableData = new CraftLootableInventoryData(this);
++    private final CraftLootableInventoryData lootableData = new CraftLootableInventoryData(this);
 +
 +    @Override
 +    public CraftLootableInventoryData getLootableData() {
@@ -484,6 +496,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +
 +    @Override
++    public LootableInventory getAPILootableInventory() {
++        return (LootableInventory) this.getBukkitEntity();
++    }
++
++    @Override
 +    public World getNMSWorld() {
 +        return this.world;
 +    }
@@ -516,6 +533,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
 +import com.destroystokyo.paper.loottable.CraftLootableInventoryData; // Paper
 +import com.destroystokyo.paper.loottable.CraftLootableInventory; // Paper
++import com.destroystokyo.paper.loottable.LootableInventory; // Paper
 +
  import java.util.Random;
  
@@ -570,7 +588,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
 +
 +    // Paper start - LootTable API
-+    private CraftLootableInventoryData lootableData = new CraftLootableInventoryData(this);
++    private final CraftLootableInventoryData lootableData = new CraftLootableInventoryData(this);
 +
 +    @Override
 +    public CraftLootableInventoryData getLootableData() {
@@ -578,6 +596,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +
 +    @Override
++    public LootableInventory getAPILootableInventory() {
++        return (LootableInventory) getBukkitWorld().getBlockAt(MCUtil.toLocation(world, getPosition())).getState();
++    }
++
++    @Override
 +    public World getNMSWorld() {
 +        return world;
 +    }