Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-07-08 18:00:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated SpoutPlayerBlockBag for Vanilla breakage

Browse Source
This commit is contained in:
zml2008 2012-06-03 22:12:33 -07:00
parent 50b7ef02c7
commit b32668057f
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/sk89q/worldedit/spout/SpoutPlayerBlockBag.java
View File

@ -29,12 +29,12 @@ import com.sk89q.worldedit.bags.OutOfSpaceException;
import com.sk89q.worldedit.blocks.BaseItem; import com.sk89q.worldedit.blocks.BaseItem;
import com.sk89q.worldedit.blocks.BaseItemStack; import com.sk89q.worldedit.blocks.BaseItemStack;
import com.sk89q.worldedit.blocks.BlockID; import com.sk89q.worldedit.blocks.BlockID;
import org.spout.api.inventory.Inventory; import org.spout.api.inventory.InventoryBase;
import org.spout.api.inventory.ItemStack; import org.spout.api.inventory.ItemStack;
import org.spout.api.material.Material; import org.spout.api.material.Material;
import org.spout.api.material.MaterialRegistry; import org.spout.api.material.MaterialRegistry;
import org.spout.api.player.Player; import org.spout.api.player.Player;
import org.spout.vanilla.controller.living.player.VanillaPlayer; import org.spout.vanilla.util.VanillaPlayerUtil;
public class SpoutPlayerBlockBag extends BlockBag { public class SpoutPlayerBlockBag extends BlockBag {
/** /**
@ -60,8 +60,7 @@ public class SpoutPlayerBlockBag extends BlockBag {
*/ */
private void loadInventory() { private void loadInventory() {
if (items == null) { if (items == null) {
VanillaPlayer vanillaPlayer = (VanillaPlayer) player.getEntity().getController(); items = VanillaPlayerUtil.getInventory(player.getEntity()).getContents();
items = vanillaPlayer.getInventory().getContents();
} }
} }
@ -208,8 +207,7 @@ public class SpoutPlayerBlockBag extends BlockBag {
@Override @Override
public void flushChanges() { public void flushChanges() {
if (items != null) { if (items != null) {
VanillaPlayer vanillaPlayer = (VanillaPlayer) player.getEntity().getController(); InventoryBase inv = VanillaPlayerUtil.getInventory(player.getEntity());
Inventory inv = vanillaPlayer.getInventory();
for (int i = 0; i < items.length && i < inv.getSize(); ++i) { for (int i = 0; i < items.length && i < inv.getSize(); ++i) {
inv.setItem(i, items[i]); inv.setItem(i, items[i]);
} }