diff options
| author | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-03-07 16:32:41 +0000 |
|---|---|---|
| committer | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-03-07 16:32:41 +0000 |
| commit | e8e74992cbe4f9f2eea78c365019c357eca112e8 (patch) | |
| tree | 3994fd8623ac86f653ddc932e63a02b15a862f0b /src/main/java/net/minecraft | |
| parent | 6a99d8c412ab33930edd7e78b760510b7ebe3fab (diff) | |
| download | craftbukkit-e8e74992cbe4f9f2eea78c365019c357eca112e8.tar craftbukkit-e8e74992cbe4f9f2eea78c365019c357eca112e8.tar.gz craftbukkit-e8e74992cbe4f9f2eea78c365019c357eca112e8.tar.lz craftbukkit-e8e74992cbe4f9f2eea78c365019c357eca112e8.tar.xz craftbukkit-e8e74992cbe4f9f2eea78c365019c357eca112e8.zip | |
Purged deprecated MobType and MobSpawner
Diffstat (limited to 'src/main/java/net/minecraft')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityEgg.java | 5 | ||||
| -rw-r--r-- | src/main/java/net/minecraft/server/World.java | 26 |
2 files changed, 16 insertions, 15 deletions
diff --git a/src/main/java/net/minecraft/server/EntityEgg.java b/src/main/java/net/minecraft/server/EntityEgg.java index f9044d63..ad31f3c6 100644 --- a/src/main/java/net/minecraft/server/EntityEgg.java +++ b/src/main/java/net/minecraft/server/EntityEgg.java @@ -3,8 +3,8 @@ package net.minecraft.server; import java.util.List; // CraftBukkit start +import org.bukkit.entity.CreatureType; import org.bukkit.entity.Egg; -import org.bukkit.entity.MobType; import org.bukkit.entity.Player; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.event.Event.Type; @@ -188,7 +188,8 @@ public class EntityEgg extends Entity { if (!hatching) { numHatching = 0; } - MobType hatchingType = MobType.CHICKEN; + + CreatureType hatchingType = CreatureType.CHICKEN; if (this.g instanceof EntityPlayer) { CraftServer server = ((WorldServer) this.world).getServer(); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java index b1d97e26..2decd5f9 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -12,12 +12,12 @@ import java.util.TreeSet; import org.bukkit.Location; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftWorld; +import org.bukkit.entity.CreatureType; import org.bukkit.event.Event; import org.bukkit.event.Event.Type; import org.bukkit.event.block.BlockCanBuildEvent; import org.bukkit.event.block.BlockPhysicsEvent; import org.bukkit.event.entity.CreatureSpawnEvent; -import org.bukkit.entity.MobType; // CraftBukkit end public class World implements IBlockAccess { @@ -716,30 +716,30 @@ public class World implements IBlockAccess { // CraftBukkit start if (entity instanceof EntityLiving) { - MobType type = null; + CreatureType type = null; if (entity instanceof EntityChicken) { - type = MobType.CHICKEN; + type = CreatureType.CHICKEN; } else if (entity instanceof EntityCow) { - type = MobType.COW; + type = CreatureType.COW; } else if (entity instanceof EntityCreeper) { - type = MobType.CREEPER; + type = CreatureType.CREEPER; } else if (entity instanceof EntityGhast) { - type = MobType.GHAST; + type = CreatureType.GHAST; } else if (entity instanceof EntityPig) { - type = MobType.PIG; + type = CreatureType.PIG; } else if (entity instanceof EntityPigZombie) { - type = MobType.PIG_ZOMBIE; + type = CreatureType.PIG_ZOMBIE; } else if (entity instanceof EntitySheep) { - type = MobType.SHEEP; + type = CreatureType.SHEEP; } else if (entity instanceof EntitySkeleton) { - type = MobType.SKELETON; + type = CreatureType.SKELETON; } else if (entity instanceof EntitySpider) { - type = MobType.SPIDER; + type = CreatureType.SPIDER; } else if (entity instanceof EntityZombie) { - type = MobType.ZOMBIE; + type = CreatureType.ZOMBIE; } else if (entity instanceof EntitySlime) { - type = MobType.SLIME; + type = CreatureType.SLIME; } if (type != null) { |