Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 17:57:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle Bukkit versions without Chest#getBlockInventory()

Browse Source
This commit is contained in:
zml2008 2012-03-23 21:07:05 -07:00
parent 4208ba33d6
commit 97c370549f
1 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java
View File

@ -46,6 +46,7 @@ import org.bukkit.entity.Minecart;
import org.bukkit.entity.Painting; import org.bukkit.entity.Painting;
import org.bukkit.entity.TNTPrimed; import org.bukkit.entity.TNTPrimed;
import org.bukkit.entity.Tameable; import org.bukkit.entity.Tameable;
import org.bukkit.inventory.DoubleChestInventory;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.Effect; import org.bukkit.Effect;
@ -395,6 +396,34 @@ public class BukkitWorld extends LocalWorld {
return false; return false;
} }
/**
* Gets the single block inventory for a potentially double chest.
* Handles people who have an old version of Bukkit.
* This should be replaced with {@link org.bukkit.block.Chest#getBlockInventory()}
* in a few months (now = March 2012)
*
* @param chest The chest to get a single block inventory for
* @return The chest's inventory
*/
private Inventory getBlockInventory(Chest chest) {
try {
return chest.getBlockInventory();
} catch (Throwable t) {
if (chest.getInventory() instanceof DoubleChestInventory) {
DoubleChestInventory inven = (DoubleChestInventory) chest.getInventory();
if (inven.getLeftSide().getHolder().equals(chest)) {
return inven.getLeftSide();
} else if (inven.getRightSide().getHolder().equals(chest)) {
return inven.getRightSide();
} else {
return inven;
}
} else {
return chest.getInventory();
}
}
}
/** /**
* Clear a chest's contents. * Clear a chest's contents.
* *
@ -414,7 +443,7 @@ public class BukkitWorld extends LocalWorld {
org.bukkit.inventory.InventoryHolder chest = (org.bukkit.inventory.InventoryHolder) state; org.bukkit.inventory.InventoryHolder chest = (org.bukkit.inventory.InventoryHolder) state;
Inventory inven = chest.getInventory(); Inventory inven = chest.getInventory();
if (chest instanceof Chest) { if (chest instanceof Chest) {
inven = ((Chest) chest).getBlockInventory(); inven = getBlockInventory((Chest) chest);
} }
inven.clear(); inven.clear();
return true; return true;
@ -726,7 +755,7 @@ public class BukkitWorld extends LocalWorld {
org.bukkit.inventory.InventoryHolder container = (org.bukkit.inventory.InventoryHolder) state; org.bukkit.inventory.InventoryHolder container = (org.bukkit.inventory.InventoryHolder) state;
Inventory inven = container.getInventory(); Inventory inven = container.getInventory();
if (container instanceof Chest) { if (container instanceof Chest) {
inven = ((Chest) container).getBlockInventory(); inven = getBlockInventory((Chest) container);
} }
int size = inven.getSize(); int size = inven.getSize();
BaseItemStack[] contents = new BaseItemStack[size]; BaseItemStack[] contents = new BaseItemStack[size];
@ -769,7 +798,7 @@ public class BukkitWorld extends LocalWorld {
org.bukkit.inventory.InventoryHolder chest = (org.bukkit.inventory.InventoryHolder) state; org.bukkit.inventory.InventoryHolder chest = (org.bukkit.inventory.InventoryHolder) state;
Inventory inven = chest.getInventory(); Inventory inven = chest.getInventory();
if (chest instanceof Chest) { if (chest instanceof Chest) {
inven = ((Chest) chest).getBlockInventory(); inven = getBlockInventory((Chest) chest);
} }
int size = inven.getSize(); int size = inven.getSize();