Update Upstream

This commit is contained in:
Aikar
2016-11-18 23:58:56 -05:00
parent 8f3325047c
commit 7d73fa7ae0
5 changed files with 20 additions and 17 deletions

View File

@@ -301,6 +301,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
@@ -0,0 +0,0 @@
package org.bukkit.block;
import org.bukkit.Nameable;
+import com.destroystokyo.paper.loottable.LootableInventory; // Paper
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
@@ -308,8 +309,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
/**
* Represents a chest.
*/
-public interface Chest extends BlockState, InventoryHolder, Lockable {
+public interface Chest extends BlockState, InventoryHolder, Lockable, LootableInventory { // Paper
-public interface Chest extends BlockState, InventoryHolder, Lockable, Nameable {
+public interface Chest extends BlockState, InventoryHolder, Lockable, Nameable, LootableInventory { // Paper
/**
* Returns the chest's inventory. If this is a double chest, it returns
@@ -320,6 +321,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
@@ -0,0 +0,0 @@
package org.bukkit.block;
import org.bukkit.Nameable;
+import com.destroystokyo.paper.loottable.LootableInventory; // Paper
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.projectiles.BlockProjectileSource;
@@ -327,8 +329,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
/**
* Represents a dispenser.
*/
-public interface Dispenser extends BlockState, InventoryHolder, Lockable {
+public interface Dispenser extends BlockState, InventoryHolder, Lockable, LootableInventory { // Paper
-public interface Dispenser extends BlockState, InventoryHolder, Lockable, Nameable {
+public interface Dispenser extends BlockState, InventoryHolder, Lockable, Nameable, LootableInventory { // Paper
/**
* Gets the BlockProjectileSource object for this dispenser.
@@ -339,14 +341,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
@@ -0,0 +0,0 @@
package org.bukkit.block;
import org.bukkit.Nameable;
+import com.destroystokyo.paper.loottable.LootableInventory; // Paper
import org.bukkit.inventory.InventoryHolder;
/**
* Represents a hopper.
*/
-public interface Hopper extends BlockState, InventoryHolder, Lockable {
+public interface Hopper extends BlockState, InventoryHolder, Lockable, LootableInventory { // Paper
}
-public interface Hopper extends BlockState, InventoryHolder, Lockable, Nameable { }
+public interface Hopper extends BlockState, InventoryHolder, Lockable, Nameable, LootableInventory { // Paper
+
+}
--