diff options
8 files changed, 14 insertions, 14 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java index f979c2f34..ee4159fce 100644 --- a/Essentials/src/com/earth2me/essentials/Essentials.java +++ b/Essentials/src/com/earth2me/essentials/Essentials.java @@ -25,7 +25,7 @@ import org.yaml.snakeyaml.reader.UnicodeReader; public class Essentials extends JavaPlugin { public static final String AUTHORS = "Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo and ceulemans."; - public static final int minBukkitBuildVersion = 684; + public static final int minBukkitBuildVersion = 689; private static final Logger logger = Logger.getLogger("Minecraft"); private static final Yaml yaml = new Yaml(new SafeConstructor()); private static Map<String, Object> users; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandantioch.java b/Essentials/src/com/earth2me/essentials/commands/Commandantioch.java index e23c6aff7..c4fc6e83e 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandantioch.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandantioch.java @@ -33,7 +33,7 @@ public class Commandantioch extends EssentialsCommand World world = ((CraftWorld)user.getWorld()).getHandle(); loc = new TargetBlock(user).getTargetBlock().getLocation(); EntityTNTPrimed tnt = new EntityTNTPrimed(world, loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()); - world.a(tnt); - world.a(tnt, "random.fuse", 1.0F, 1.0F); + world.addEntity(tnt); + world.makeSound(tnt, "random.fuse", 1.0F, 1.0F); } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandban.java b/Essentials/src/com/earth2me/essentials/commands/Commandban.java index c341d4645..34fd20bc8 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandban.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandban.java @@ -27,14 +27,14 @@ public class Commandban extends EssentialsCommand User p = null; if (server.matchPlayer(args[0]).isEmpty()) { - ((CraftServer)server).getHandle().c.f.a(args[0]); + ((CraftServer)server).getHandle().a(args[0]); sender.sendMessage("§cPlayer" + args[0] + " banned"); } else { p = User.get(server.matchPlayer(args[0]).get(0)); p.kickPlayer(args.length > 1 ? getFinalArg(args, 1) : "Banned from server"); - ((CraftServer)server).getHandle().c.f.a(p.getName()); + ((CraftServer)server).getHandle().a(p.getName()); sender.sendMessage("§cPlayer" + p.getName() + " banned"); } Essentials.getStatic().loadBanList(); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbanip.java b/Essentials/src/com/earth2me/essentials/commands/Commandbanip.java index 080bfa663..903b2cd93 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandbanip.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandbanip.java @@ -22,7 +22,7 @@ public class Commandbanip extends EssentialsCommand return; } - ((CraftServer)server).getHandle().c.f.c(args[0]); + ((CraftServer)server).getHandle().c(args[0]); sender.sendMessage("§7Banned IP address."); Essentials.getStatic().loadBanList(); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java b/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java index 58ef14f6b..7b2fc474c 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java @@ -99,7 +99,7 @@ public class Commandspawnmob extends EssentialsCommand block = user.getWorld().getBlockAt(loc); } spawnedMob.teleportTo(loc); - world.a(spawnedMob.getHandle()); + world.addEntity(spawnedMob.getHandle()); if (mountType != null) { @@ -120,7 +120,7 @@ public class Commandspawnmob extends EssentialsCommand } spawnedMount.teleportTo(spawnedMob); spawnedMount.getHandle().setPassengerOf(spawnedMob.getHandle()); - world.a(spawnedMount.getHandle()); + world.addEntity(spawnedMount.getHandle()); } if (mobData != null) { changeMobData(mob.name, spawnedMob, mobData, user); @@ -144,7 +144,7 @@ public class Commandspawnmob extends EssentialsCommand { spawnedMob = mob.spawn(user, server); spawnedMob.teleportTo(loc); - world.a(spawnedMob.getHandle()); + world.addEntity(spawnedMob.getHandle()); if (mobMount != null) { try @@ -158,7 +158,7 @@ public class Commandspawnmob extends EssentialsCommand } spawnedMount.teleportTo(spawnedMob); spawnedMount.getHandle().setPassengerOf(spawnedMob.getHandle()); - world.a(spawnedMount.getHandle()); + world.addEntity(spawnedMount.getHandle()); } if (mobData != null) { changeMobData(mob.name, spawnedMob, mobData, user); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandunban.java b/Essentials/src/com/earth2me/essentials/commands/Commandunban.java index 55fd54fad..fa52b4e6a 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandunban.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandunban.java @@ -28,7 +28,7 @@ public class Commandunban extends EssentialsCommand return; } - ((CraftServer)server).getHandle().c.f.b(args[0]); + ((CraftServer)server).getHandle().b(args[0]); sender.sendMessage("Unbanned player."); Essentials.getStatic().loadBanList(); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandunbanip.java b/Essentials/src/com/earth2me/essentials/commands/Commandunbanip.java index df152c23f..a519b3cf8 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandunbanip.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandunbanip.java @@ -28,7 +28,7 @@ public class Commandunbanip extends EssentialsCommand return; } - ((CraftServer)server).getHandle().c.f.d(args[0]); + ((CraftServer)server).getHandle().d(args[0]); sender.sendMessage("Unbanned IP address."); Essentials.getStatic().loadBanList(); } diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java index ee47941eb..b0f0804cb 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java @@ -177,8 +177,8 @@ public class EssentialsProtectEntityListener extends EntityListener }
}
- ((CraftServer)parent.getServer()).getServer().f.a(loc.getX(), loc.getY(), loc.getZ(), 64.0D,
- new Packet60Explosion(loc.getX(), loc.getY(), loc.getZ(), 3.0f, set));
+ ((CraftServer)parent.getServer()).getHandle().a(loc.getX(), loc.getY(), loc.getZ(), 64.0D,
+ new Packet60Explosion(loc.getX(), loc.getY(), loc.getZ(), 3.0f, set));
event.setCancelled(true);
return;
}
|