Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-11-20 02:45:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

No longer using deprecated stuff.

Browse Source
This commit is contained in:
TomyLobo 2012-03-02 19:57:32 +01:00
parent f265a93913
commit 4e91f4e988
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/sk89q/worldedit/bukkit/BukkitServerInterface.java
View File

@ -29,7 +29,8 @@ import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.entity.CreatureType; import org.bukkit.entity.EntityType;
import com.sk89q.worldedit.LocalWorld; import com.sk89q.worldedit.LocalWorld;
import com.sk89q.worldedit.ServerInterface; import com.sk89q.worldedit.ServerInterface;
@ -52,7 +53,8 @@ public class BukkitServerInterface extends ServerInterface {
@Override @Override
public boolean isValidMobType(String type) { public boolean isValidMobType(String type) {
return CreatureType.fromName(type) != null; final EntityType entityType = EntityType.fromName(type);
return entityType != null && entityType.isAlive();
} }
@Override @Override

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

@ -284,7 +284,7 @@ public class BukkitWorld extends LocalWorld {
if (!(state instanceof CreatureSpawner)) return false; if (!(state instanceof CreatureSpawner)) return false;
CreatureSpawner bukkit = (CreatureSpawner) state; CreatureSpawner bukkit = (CreatureSpawner) state;
MobSpawnerBlock we = (MobSpawnerBlock) block; MobSpawnerBlock we = (MobSpawnerBlock) block;
bukkit.setCreatureTypeId(we.getMobType()); bukkit.setCreatureTypeByName(we.getMobType());
bukkit.setDelay(we.getDelay()); bukkit.setDelay(we.getDelay());
return true; return true;
} }
@ -347,7 +347,7 @@ public class BukkitWorld extends LocalWorld {
if (!(state instanceof CreatureSpawner)) return false; if (!(state instanceof CreatureSpawner)) return false;
CreatureSpawner bukkit = (CreatureSpawner) state; CreatureSpawner bukkit = (CreatureSpawner) state;
MobSpawnerBlock we = (MobSpawnerBlock) block; MobSpawnerBlock we = (MobSpawnerBlock) block;
we.setMobType(bukkit.getCreatureTypeId()); we.setMobType(bukkit.getCreatureTypeName());
we.setDelay((short) bukkit.getDelay()); we.setDelay((short) bukkit.getDelay());
return true; return true;
} }
@ -378,11 +378,11 @@ public class BukkitWorld extends LocalWorld {
return false; return false;
} }
BlockState state = block.getState(); BlockState state = block.getState();
if (!(state instanceof org.bukkit.block.ContainerBlock)) { if (!(state instanceof org.bukkit.inventory.InventoryHolder)) {
return false; 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(); Inventory inven = chest.getInventory();
inven.clear(); inven.clear();
return true; return true;
@ -629,11 +629,11 @@ public class BukkitWorld extends LocalWorld {
return new BaseItemStack[0]; return new BaseItemStack[0];
} }
BlockState state = block.getState(); BlockState state = block.getState();
if (!(state instanceof org.bukkit.block.ContainerBlock)) { if (!(state instanceof org.bukkit.inventory.InventoryHolder)) {
return new BaseItemStack[0]; 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(); Inventory inven = container.getInventory();
int size = inven.getSize(); int size = inven.getSize();
BaseItemStack[] contents = new BaseItemStack[size]; BaseItemStack[] contents = new BaseItemStack[size];
@ -669,11 +669,11 @@ public class BukkitWorld extends LocalWorld {
return false; return false;
} }
BlockState state = block.getState(); BlockState state = block.getState();
if (!(state instanceof org.bukkit.block.ContainerBlock)) { if (!(state instanceof org.bukkit.inventory.InventoryHolder)) {
return false; 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(); Inventory inven = chest.getInventory();
int size = inven.getSize(); int size = inven.getSize();