Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Add ShulkerBoxes to the LootTable API

Browse Source
This commit is contained in:
Zach Brown
2016-11-19 11:31:01 -06:00
parent 26e4ac4330
commit cb66c8dce7
2 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Spigot-Server-Patches/0134-LootTable-API-Replenishable-Lootables-Feature.patch
View File

@@ -1,4 +1,4 @@
From 0e03fc3328c07b66787473c4d9bd922264a973a3 Mon Sep 17 00:00:00 2001
From 8712e9ac088ad974d4eea2c12880912523da7af5 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 1 May 2016 21:19:14 -0400
Subject: [PATCH] LootTable API & Replenishable Lootables Feature
@@ -712,6 +712,35 @@ index b7a04bd..5d4a551 100644
private final TileEntityHopper hopper;
public CraftHopper(final Block block) {
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java b/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
index 8a7ce92..02f56bc 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
@@ -1,5 +1,6 @@
package org.bukkit.craftbukkit.block;
+import com.destroystokyo.paper.loottable.CraftLootableBlockInventory;
import net.minecraft.server.BlockShulkerBox;
import net.minecraft.server.TileEntity;
import net.minecraft.server.TileEntityShulkerBox;
@@ -11,7 +12,7 @@ import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.craftbukkit.inventory.CraftInventory;
import org.bukkit.inventory.Inventory;
-public class CraftShulkerBox extends CraftLootable implements ShulkerBox {
+public class CraftShulkerBox extends CraftLootable implements ShulkerBox, CraftLootableBlockInventory { // Paper
private final CraftWorld world;
private final TileEntityShulkerBox box;
@@ -31,7 +32,7 @@ public class CraftShulkerBox extends CraftLootable implements ShulkerBox {
}
@Override
- public TileEntity getTileEntity() {
+ public TileEntityShulkerBox getTileEntity() { // Paper
return box;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
index 69435c4..4291edf 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java