From 4e91f4e988ce104a10df8887306a3cce65a0da1b Mon Sep 17 00:00:00 2001 From: TomyLobo Date: Fri, 2 Mar 2012 19:57:32 +0100 Subject: [PATCH] No longer using deprecated stuff. --- .../worldedit/bukkit/BukkitServerInterface.java | 6 ++++-- .../com/sk89q/worldedit/bukkit/BukkitWorld.java | 16 ++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/sk89q/worldedit/bukkit/BukkitServerInterface.java b/src/main/java/com/sk89q/worldedit/bukkit/BukkitServerInterface.java index d1cd179bd..47e6d44ab 100644 --- a/src/main/java/com/sk89q/worldedit/bukkit/BukkitServerInterface.java +++ b/src/main/java/com/sk89q/worldedit/bukkit/BukkitServerInterface.java @@ -29,7 +29,8 @@ import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.Server; import org.bukkit.World; -import org.bukkit.entity.CreatureType; +import org.bukkit.entity.EntityType; + import com.sk89q.worldedit.LocalWorld; import com.sk89q.worldedit.ServerInterface; @@ -52,7 +53,8 @@ public class BukkitServerInterface extends ServerInterface { @Override public boolean isValidMobType(String type) { - return CreatureType.fromName(type) != null; + final EntityType entityType = EntityType.fromName(type); + return entityType != null && entityType.isAlive(); } @Override diff --git a/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java b/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java index 7f8d14b7b..721f4c761 100644 --- a/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java +++ b/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java @@ -284,7 +284,7 @@ public class BukkitWorld extends LocalWorld { if (!(state instanceof CreatureSpawner)) return false; CreatureSpawner bukkit = (CreatureSpawner) state; MobSpawnerBlock we = (MobSpawnerBlock) block; - bukkit.setCreatureTypeId(we.getMobType()); + bukkit.setCreatureTypeByName(we.getMobType()); bukkit.setDelay(we.getDelay()); return true; } @@ -347,7 +347,7 @@ public class BukkitWorld extends LocalWorld { if (!(state instanceof CreatureSpawner)) return false; CreatureSpawner bukkit = (CreatureSpawner) state; MobSpawnerBlock we = (MobSpawnerBlock) block; - we.setMobType(bukkit.getCreatureTypeId()); + we.setMobType(bukkit.getCreatureTypeName()); we.setDelay((short) bukkit.getDelay()); return true; } @@ -378,11 +378,11 @@ public class BukkitWorld extends LocalWorld { return false; } BlockState state = block.getState(); - if (!(state instanceof org.bukkit.block.ContainerBlock)) { + if (!(state instanceof org.bukkit.inventory.InventoryHolder)) { return false; } - org.bukkit.block.ContainerBlock chest = (org.bukkit.block.ContainerBlock) state; + org.bukkit.inventory.InventoryHolder chest = (org.bukkit.inventory.InventoryHolder) state; Inventory inven = chest.getInventory(); inven.clear(); return true; @@ -629,11 +629,11 @@ public class BukkitWorld extends LocalWorld { return new BaseItemStack[0]; } BlockState state = block.getState(); - if (!(state instanceof org.bukkit.block.ContainerBlock)) { + if (!(state instanceof org.bukkit.inventory.InventoryHolder)) { return new BaseItemStack[0]; } - org.bukkit.block.ContainerBlock container = (org.bukkit.block.ContainerBlock) state; + org.bukkit.inventory.InventoryHolder container = (org.bukkit.inventory.InventoryHolder) state; Inventory inven = container.getInventory(); int size = inven.getSize(); BaseItemStack[] contents = new BaseItemStack[size]; @@ -669,11 +669,11 @@ public class BukkitWorld extends LocalWorld { return false; } BlockState state = block.getState(); - if (!(state instanceof org.bukkit.block.ContainerBlock)) { + if (!(state instanceof org.bukkit.inventory.InventoryHolder)) { return false; } - org.bukkit.block.ContainerBlock chest = (org.bukkit.block.ContainerBlock) state; + org.bukkit.inventory.InventoryHolder chest = (org.bukkit.inventory.InventoryHolder) state; Inventory inven = chest.getInventory(); int size = inven.getSize();