From a98c7ba2c706caa0ba83bddefa5ffecbe658ccd3 Mon Sep 17 00:00:00 2001 From: Erik Broes Date: Mon, 27 Jun 2011 00:25:01 +0200 Subject: Massive renaming update in nms. If you bypassed Bukkit, you will likely break. Also minimized all the nms diffs and generic cleanups all around. --- src/main/java/net/minecraft/server/EntitySquid.java | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) (limited to 'src/main/java/net/minecraft/server/EntitySquid.java') diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java index cc8fd690..e0edde4f 100644 --- a/src/main/java/net/minecraft/server/EntitySquid.java +++ b/src/main/java/net/minecraft/server/EntitySquid.java @@ -1,14 +1,6 @@ package net.minecraft.server; -// CraftBukkit start -import java.util.ArrayList; -import java.util.List; -import org.bukkit.Server; -import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.craftbukkit.CraftWorld; -import org.bukkit.craftbukkit.entity.CraftEntity; -import org.bukkit.event.entity.EntityDeathEvent; -// CraftBukkit end +import org.bukkit.event.entity.EntityDeathEvent; // CraftBukkit public class EntitySquid extends EntityWaterAnimal { @@ -64,22 +56,21 @@ public class EntitySquid extends EntityWaterAnimal { protected void r() { // CraftBukkit start - whole method - List loot = new ArrayList(); + java.util.List loot = new java.util.ArrayList(); int count = this.random.nextInt(3) + 1; if (count > 0) { loot.add(new org.bukkit.inventory.ItemStack(org.bukkit.Material.INK_SACK, count)); } - CraftWorld cworld = ((WorldServer) world).getWorld(); - Server server = ((WorldServer) world).getServer(); - CraftEntity entity = (CraftEntity) getBukkitEntity(); + org.bukkit.World bworld = this.world.getWorld(); + org.bukkit.entity.Entity entity = this.getBukkitEntity(); EntityDeathEvent event = new EntityDeathEvent(entity, loot); - server.getPluginManager().callEvent(event); + this.world.getServer().getPluginManager().callEvent(event); for (org.bukkit.inventory.ItemStack stack : event.getDrops()) { - cworld.dropItemNaturally(entity.getLocation(), stack); + bworld.dropItemNaturally(entity.getLocation(), stack); } // CraftBukkit end } -- cgit v1.2.3