Craftbukkit 689 / MC 1.5

Testing only, do not release until 689 or higher is recommended

git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1247 e251c2fe-e539-e718-e476-b85c1f46cddb

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;

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.addEntity(tnt);
-		world.a(tnt, "random.fuse", 1.0F, 1.0F);
+		world.makeSound(tnt, "random.fuse", 1.0F, 1.0F);
 	}
 }

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();

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();
 

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);

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();
 	}

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();
 	}

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,
+				((CraftServer)parent.getServer()).getHandle().a(loc.getX(), loc.getY(), loc.getZ(), 64.0D,
-																  new Packet60Explosion(loc.getX(), loc.getY(), loc.getZ(), 3.0f, set));
+                                                                                                                            new Packet60Explosion(loc.getX(), loc.getY(), loc.getZ(), 3.0f, set));
 				event.setCancelled(true);
 				return;
 			}