diff options
| author | Zach Brown <[email protected]> | 2016-10-21 15:28:44 -0500 |
|---|---|---|
| committer | Zach Brown <[email protected]> | 2016-10-21 15:28:44 -0500 |
| commit | 92567cc43a2c246b329db575ae590d97c2fd092d (patch) | |
| tree | b2c054bd3628d204e5b10db3fe4888aec4322089 /Spigot-API-Patches | |
| parent | 874c7a2ef871d572ad5a56f0a351de60088c1f82 (diff) | |
| download | Paper-92567cc43a2c246b329db575ae590d97c2fd092d.tar.gz Paper-92567cc43a2c246b329db575ae590d97c2fd092d.zip | |
Update upstream B/CB
Diffstat (limited to 'Spigot-API-Patches')
| -rw-r--r-- | Spigot-API-Patches/0038-LootTable-API.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/Spigot-API-Patches/0038-LootTable-API.patch b/Spigot-API-Patches/0038-LootTable-API.patch index 761cdb732a..e10a5328b1 100644 --- a/Spigot-API-Patches/0038-LootTable-API.patch +++ b/Spigot-API-Patches/0038-LootTable-API.patch @@ -1,4 +1,4 @@ -From 2b1c15d0ea5602d9281d1306e0596a5a7f2d85e2 Mon Sep 17 00:00:00 2001 +From 3cee88900b20b75852cff22796567415d3bed5c5 Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Sun, 1 May 2016 15:19:49 -0400 Subject: [PATCH] LootTable API @@ -295,7 +295,7 @@ index 0000000..2169493 + } +} diff --git a/src/main/java/org/bukkit/block/Chest.java b/src/main/java/org/bukkit/block/Chest.java -index ee95841..25dfc5f 100644 +index e941d8b..a2f8f53 100644 --- a/src/main/java/org/bukkit/block/Chest.java +++ b/src/main/java/org/bukkit/block/Chest.java @@ -1,12 +1,13 @@ @@ -308,13 +308,13 @@ index ee95841..25dfc5f 100644 /** * Represents a chest. */ --public interface Chest extends BlockState, InventoryHolder { -+public interface Chest extends BlockState, InventoryHolder, LootableInventory { // Paper +-public interface Chest extends BlockState, InventoryHolder, Lockable { ++public interface Chest extends BlockState, InventoryHolder, Lockable, LootableInventory { // Paper /** * Returns the chest's inventory. If this is a double chest, it returns diff --git a/src/main/java/org/bukkit/block/Dispenser.java b/src/main/java/org/bukkit/block/Dispenser.java -index 4e6b349..3aa0a81 100644 +index 94d360b..b80cb5f 100644 --- a/src/main/java/org/bukkit/block/Dispenser.java +++ b/src/main/java/org/bukkit/block/Dispenser.java @@ -1,12 +1,13 @@ @@ -327,13 +327,13 @@ index 4e6b349..3aa0a81 100644 /** * Represents a dispenser. */ --public interface Dispenser extends BlockState, InventoryHolder { -+public interface Dispenser extends BlockState, InventoryHolder, LootableInventory { // Paper +-public interface Dispenser extends BlockState, InventoryHolder, Lockable { ++public interface Dispenser extends BlockState, InventoryHolder, Lockable, LootableInventory { // Paper /** * Gets the BlockProjectileSource object for this dispenser. diff --git a/src/main/java/org/bukkit/block/Hopper.java b/src/main/java/org/bukkit/block/Hopper.java -index e097157..26aff5a 100644 +index 978cf2a..d8c8abd 100644 --- a/src/main/java/org/bukkit/block/Hopper.java +++ b/src/main/java/org/bukkit/block/Hopper.java @@ -1,10 +1,11 @@ @@ -345,10 +345,10 @@ index e097157..26aff5a 100644 /** * Represents a hopper. */ --public interface Hopper extends BlockState, InventoryHolder { -+public interface Hopper extends BlockState, InventoryHolder, LootableInventory { // Paper +-public interface Hopper extends BlockState, InventoryHolder, Lockable { ++public interface Hopper extends BlockState, InventoryHolder, Lockable, LootableInventory { // Paper } -- -2.9.2.windows.1 +2.9.3 |