Merge branch 'refs/heads/master' into release

Essentials/nbproject/project.properties

@@ -66,7 +66,7 @@ endorsed.classpath=
 excludes=
 file.reference.BOSEconomy7.jar=../lib/BOSEconomy7.jar
 file.reference.bPermissions.jar=../lib/bPermissions.jar
-file.reference.craftbukkit-0.0.1-SNAPSHOT.jar=..\\lib\\craftbukkit-0.0.1-SNAPSHOT.jar
+file.reference.craftbukkit-1.0.0-SNAPSHOT.jar=..\\lib\\craftbukkit-1.0.0-SNAPSHOT.jar
 file.reference.iCo4.jar=../lib/iCo4.jar
 file.reference.iCo5.jar=../lib/iCo5.jar
 file.reference.iCo6.jar=../lib/iCo6.jar
@@ -92,7 +92,7 @@ javac.classpath=\
     ${file.reference.PermissionsBukkit-1.2.jar}:\
     ${file.reference.lombok-0.10.1.jar}:\
     ${reference.EssentialsGroupManager.jar}:\
-    ${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar}
+    ${file.reference.craftbukkit-1.0.0-SNAPSHOT.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false

Essentials/src/com/earth2me/essentials/Essentials.java

@@ -55,7 +55,7 @@ import org.bukkit.scheduler.BukkitScheduler;
 
 public class Essentials extends JavaPlugin implements IEssentials
 {
-	public static final int BUKKIT_VERSION = 1060;
+	public static final int BUKKIT_VERSION = 1467;
 	private static final Logger LOGGER = Logger.getLogger("Minecraft");
 	private transient ISettings settings;
 	private final transient TNTExplodeListener tntListener = new TNTExplodeListener(this);
@@ -138,7 +138,7 @@ public class Essentials extends JavaPlugin implements IEssentials
 				LOGGER.log(Level.WARNING, Util.format("versionMismatch", plugin.getDescription().getName()));
 			}
 		}
-		final Matcher versionMatch = Pattern.compile("git-Bukkit-([0-9]+).([0-9]+).([0-9]+)-[0-9]+-[0-9a-z]+-b([0-9]+)jnks.*").matcher(getServer().getVersion());
+		final Matcher versionMatch = Pattern.compile("git-Bukkit-([0-9]+).([0-9]+).([0-9]+)-R[0-9]+-[0-9]+-[0-9a-z]+-b([0-9]+)jnks.*").matcher(getServer().getVersion());
 		if (versionMatch.matches())
 		{
 			final int versionNumber = Integer.parseInt(versionMatch.group(4));
@@ -150,6 +150,8 @@ public class Essentials extends JavaPlugin implements IEssentials
 		else
 		{
 			LOGGER.log(Level.INFO, Util.i18n("bukkitFormatChanged"));
+			LOGGER.log(Level.INFO, getServer().getVersion());
+			LOGGER.log(Level.INFO, getServer().getBukkitVersion());
 		}
 
 		permissionsHandler = new PermissionsHandler(this, settings.useBukkitPermissions());

Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java

@@ -39,7 +39,7 @@ public class EssentialsPlayerListener extends PlayerListener
 		updateCompass(user);
 		if (ess.getSettings().changeDisplayName())
 		{
-			user.setDisplayNick(user.getNick());
+			user.setDisplayNick();
 		}
 	}
 
@@ -65,7 +65,7 @@ public class EssentialsPlayerListener extends PlayerListener
 		user.updateActivity(true);
 		if (ess.getSettings().changeDisplayName())
 		{
-			user.setDisplayNick(user.getNick());
+			user.setDisplayNick();
 		}
 	}
 
@@ -155,7 +155,7 @@ public class EssentialsPlayerListener extends PlayerListener
 
 		if (ess.getSettings().changeDisplayName())
 		{
-			user.setDisplayNick(user.getNick());
+			user.setDisplayNick();
 		}
 		user.setLastLoginAddress(user.getAddress().getAddress().getHostAddress());
 		user.updateActivity(false);
@@ -248,7 +248,7 @@ public class EssentialsPlayerListener extends PlayerListener
 		final User user = ess.getUser(event.getPlayer());
 		if (ess.getSettings().changeDisplayName())
 		{
-			user.setDisplayNick(user.getNick());
+			user.setDisplayNick();
 		}
 		updateCompass(user);
 	}

Essentials/src/com/earth2me/essentials/Mob.java

@@ -29,8 +29,12 @@ public enum Mob
 	WOLF("Wolf", Enemies.NEUTRAL, CreatureType.WOLF),
 	CAVESPIDER("CaveSpider", Enemies.ENEMY, CreatureType.CAVE_SPIDER),
 	ENDERMAN("Enderman", Enemies.ENEMY, "", CreatureType.ENDERMAN),
-	SILVERFISH("Silverfish", Enemies.ENEMY, "", CreatureType.SILVERFISH);
-
+	SILVERFISH("Silverfish", Enemies.ENEMY, "", CreatureType.SILVERFISH),
+	ENDERDRAGON("EnderDragon", Enemies.ENEMY, CreatureType.ENDER_DRAGON),
+	VILLAGER("Villager", Enemies.FRIENDLY, CreatureType.VILLAGER),
+	BLAZE("Blaze", Enemies.ENEMY, CreatureType.BLAZE),
+	MUSHROOMCOW("MushroomCow", Enemies.FRIENDLY, CreatureType.MUSHROOM_COW);
+	//TODO: Snowman
 	public static final Logger logger = Logger.getLogger("Minecraft");
 
 	private Mob(String n, Enemies en, String s, CreatureType type)
@@ -47,7 +51,6 @@ public enum Mob
 		this.type = en;
 		this.bukkitType = type;
 	}
-
 	public String suffix = "s";
 	final public String name;
 	final public Enemies type;
@@ -58,7 +61,7 @@ public enum Mob
 	{
 		for (Mob mob : Mob.values())
 		{
-			hashMap.put(mob.name, mob);
+			hashMap.put(mob.name.toLowerCase(), mob);
 		}
 	}
 
@@ -81,24 +84,26 @@ public enum Mob
 		NEUTRAL("neutral"),
 		ENEMY("enemy");
 
-		private Enemies(final String t)
+		private Enemies(final String type)
 		{
-			this.type = t;
+			this.type = type;
 		}
 		final protected String type;
 	}
 
-	public CreatureType getType () {	
+	public CreatureType getType()
+	{
 		return bukkitType;
 	}
 
+	public static Mob fromName(final String name)
+	{
+		return hashMap.get(name.toLowerCase());
+	}
+
+
 	public static class MobException extends Exception
 	{
 		private static final long serialVersionUID = 1L;
 	}
-
-	public static Mob fromName(String n)
-	{
-		return hashMap.get(n);
-	}
 }

Essentials/src/com/earth2me/essentials/OfflinePlayer.java

@@ -3,6 +3,7 @@ package com.earth2me.essentials;
 import java.net.InetSocketAddress;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 import lombok.Delegate;
@@ -777,4 +778,10 @@ public class OfflinePlayer implements Player
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
+
+	@Override
+	public int getMaxHealth()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
 }

Essentials/src/com/earth2me/essentials/User.java

@@ -235,7 +235,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 		return teleportRequestHere;
 	}
 
-	public String getNick()
+	public String getNick(boolean addprefixsuffix)
 	{
 		final StringBuilder nickname = new StringBuilder();
 		final String nick = getNickname();
@@ -259,7 +259,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 			}
 		}
 
-		if (ess.getSettings().addPrefixSuffix())
+		if (addprefixsuffix && ess.getSettings().addPrefixSuffix())
 		{
 			if (!ess.getSettings().disablePrefix())
 			{
@@ -284,10 +284,15 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 		return nickname.toString();
 	}
 
-	public void setDisplayNick(String name)
+	public void setDisplayNick()
 	{
+		String name = getNick(true);
 		setDisplayName(name);
 		if (name.length() > 16)
+		{
+			name = getNick(false);
+		}
+		if (name.length() > 16)
 		{
 			name = name.substring(0, name.charAt(15) == '§' ? 15 : 16);
 		}
@@ -306,7 +311,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 	{
 		if (!(base instanceof OfflinePlayer) && ess.getSettings().changeDisplayName())
 		{
-			setDisplayNick(getNick());
+			setDisplayNick();
 		}
 		return super.getDisplayName() == null ? super.getName() : super.getDisplayName();
 	}

Essentials/src/com/earth2me/essentials/commands/Commandfireball.java

@@ -3,6 +3,7 @@ package com.earth2me.essentials.commands;
 import com.earth2me.essentials.User;
 import org.bukkit.Server;
 import org.bukkit.entity.Fireball;
+import org.bukkit.entity.SmallFireball;
 import org.bukkit.util.Vector;
 
 
@@ -16,7 +17,12 @@ public class Commandfireball extends EssentialsCommand
 	@Override
 	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
 	{
+		boolean small = false;
+		if (args.length > 0 && args[0].equalsIgnoreCase("small"))
+		{
+			small = true;
+		}
 		final Vector direction = user.getEyeLocation().getDirection().multiply(2);
-		user.getWorld().spawn(user.getEyeLocation().add(direction.getX(), direction.getY(), direction.getZ()), Fireball.class);
+		user.getWorld().spawn(user.getEyeLocation().add(direction.getX(), direction.getY(), direction.getZ()), small ? SmallFireball.class : Fireball.class);
 	}
 }

Essentials/src/com/earth2me/essentials/commands/Commandnick.java

@@ -61,8 +61,8 @@ public class Commandnick extends EssentialsCommand
 		}
 		else if ("off".equalsIgnoreCase(nick) || target.getName().equalsIgnoreCase(nick))
 		{
-			target.setDisplayNick(target.getName());
 			target.setNickname(null);
+			target.setDisplayNick();
 			target.sendMessage(Util.i18n("nickNoMore"));
 		}
 		else
@@ -83,8 +83,8 @@ public class Commandnick extends EssentialsCommand
 				}
 			}
 
-			target.setDisplayNick(ess.getSettings().getNicknamePrefix() + formattedNick);
 			target.setNickname(formattedNick);
+			target.setDisplayNick();
 			target.sendMessage(Util.format("nickSet", target.getDisplayName() + "§7."));
 		}
 	}

Essentials/src/com/earth2me/essentials/commands/Commandspawner.java

@@ -34,7 +34,6 @@ public class Commandspawner extends EssentialsCommand
 		try
 		{
 			String name = args[0];
-			name = name.equalsIgnoreCase("CaveSpider") ? "CaveSpider" : name.equalsIgnoreCase("PigZombie") ? "PigZombie" : Util.capitalCase(name);
 
 			Mob mob = null;
 			mob = Mob.fromName(name);

Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java

@@ -32,7 +32,6 @@ public class Commandspawnmob extends EssentialsCommand
 		String[] mountparts = args[0].split(",");
 		String[] parts = mountparts[0].split(":");
 		String mobType = parts[0];
-		mobType = mobType.equalsIgnoreCase("CaveSpider") ? "CaveSpider" : mobType.equalsIgnoreCase("PigZombie") ? "PigZombie" : Util.capitalCase(mobType);
 		String mobData = null;
 		if (parts.length == 2)
 		{
@@ -44,7 +43,6 @@ public class Commandspawnmob extends EssentialsCommand
 		{
 			parts = mountparts[1].split(":");
 			mountType = parts[0];
-			mountType = mountType.equalsIgnoreCase("CaveSpider") ? "CaveSpider" : mountType.equalsIgnoreCase("PigZombie") ? "PigZombie" : Util.capitalCase(mountType);
 			if (parts.length == 2)
 			{
 				mountData = parts[1];
@@ -62,14 +60,14 @@ public class Commandspawnmob extends EssentialsCommand
 		{
 			throw new Exception(Util.i18n("invalidMob"));
 		}
-		
+
 		if (ess.getSettings().getProtectPreventSpawn(mob.getType().toString().toLowerCase()))
 		{
 			throw new Exception(Util.i18n("unableToSpawnMob"));
 		}
-	
+
 		final Block block = Util.getTarget(user).getBlock();
-				if (block == null)
+		if (block == null)
 		{
 			throw new Exception(Util.i18n("unableToSpawnMob"));
 		}
@@ -92,7 +90,7 @@ public class Commandspawnmob extends EssentialsCommand
 				user.sendMessage(Util.i18n("invalidMob"));
 				return;
 			}
-			
+
 			if (ess.getSettings().getProtectPreventSpawn(mobMount.getType().toString().toLowerCase()))
 			{
 				throw new Exception(Util.i18n("unableToSpawnMob"));

Essentials/src/com/earth2me/essentials/commands/Commandtime.java

@@ -69,7 +69,7 @@ public class Commandtime extends EssentialsCommand
 
 		for (World world : worlds)
 		{
-			sender.sendMessage(Util.format("timeCurrentWorld", world.getName(), DescParseTickFormat.format(world.getTime())));
+			sender.sendMessage(Util.format("timeWorldCurrent", world.getName(), DescParseTickFormat.format(world.getTime())));
 		}
 	}
 

Essentials/src/com/earth2me/essentials/commands/Commandwhois.java

@@ -43,9 +43,9 @@ public class Commandwhois extends EssentialsCommand
 			{
 				continue;
 			}
-			final String displayName = ChatColor.stripColor(user.getNick());
-			if (!whois.equalsIgnoreCase(displayName)
-				&& !whois.equalsIgnoreCase(displayName.substring(prefixLength))
+			final String nickName = ChatColor.stripColor(user.getNickname());
+			if (!whois.equalsIgnoreCase(nickName)
+				&& !whois.substring(prefixLength).equalsIgnoreCase(nickName)
 				&& !whois.equalsIgnoreCase(user.getName()))
 			{
 				continue;

Essentials/src/items.csv

@@ -1340,6 +1340,18 @@ cementstairs,109,0
 cementbstairs,109,0
 greybrickstairs,109,0
 greybstairs,109,0
+mycel,110,0
+waterlily,111,0
+netherbrick,112,0
+netherfence,113,0
+netherbrickstairs,114,0
+netherwarts,115,0
+enchantmenttable,116,0
+brewingstand,117,0
+cauldron,118,0
+enderportal,119,0
+enderportalframe,120,0
+whitestone,121,0
 ironshovel,256,0
 ironspade,256,0
 ishovel,256,0
@@ -2210,6 +2222,20 @@ pearl,368,0
 epearl,368,0
 bluepearl,368,0
 endergem,368,0
+blazerod,369,0
+ghasttear,370,0
+goldnugget,371,0
+netherstalk,372,0
+potion,373,0
+glassbottle,374,0
+spidereye,375,0
+fermentedspidereye,376,0
+blazepowder,377,0
+magmacream,378,0
+brewingsstanditem,379,0
+cauldronitem,380,0
+eyeofender,381,0
+speckledmelon,382,0
 goldmusicrecord,2256,0
 goldmusicdisk,2256,0
 goldmusiccd,2256,0
@@ -2245,4 +2271,13 @@ greendisk,2257,0
 greencd,2257,0
 grrecord,2257,0
 grdisk,2257,0
-grcd,2257,0
+grcd,2257,0
+record3,2258,0
+record4,2259,0
+record5,2260,0
+record6,2261,0
+record7,2262,0
+record8,2263,0
+record9,2264,0
+record10,2265,0
+record11,2266,0

Essentials/src/plugin.yml

@@ -88,7 +88,7 @@ commands:
     aliases: [extinguish,eext,eextinguish]
   fireball:
     description: Throw a fireball.
-    usage: /<command>
+    usage: /<command> [small]
     aliases: [efireball]
   gamemode:
     description: Change player gamemode.

Essentials/test/com/earth2me/essentials/FakeServer.java

@@ -580,4 +580,10 @@ public class FakeServer implements Server
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
+
+	@Override
+	public String getBukkitVersion()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
 }

EssentialsChat/nbproject/project.properties

@@ -61,12 +61,12 @@ dist.jar=${dist.dir}/EssentialsChat.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-file.reference.bukkit-0.0.1-SNAPSHOT.jar=../lib/bukkit-0.0.1-SNAPSHOT.jar
+file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar=../lib/bukkit-1.0.0-R1-SNAPSHOT.jar
 includes=**
 jar.compress=true
 javac.classpath=\
     ${reference.Essentials.jar}:\
-    ${file.reference.bukkit-0.0.1-SNAPSHOT.jar}
+    ${file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false

EssentialsGeoIP/nbproject/project.properties

@@ -61,12 +61,12 @@ dist.jar=${dist.dir}/EssentialsGeoIP.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-file.reference.bukkit-0.0.1-SNAPSHOT.jar=../lib/bukkit-0.0.1-SNAPSHOT.jar
+file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar=../lib/bukkit-1.0.0-R1-SNAPSHOT.jar
 includes=**
 jar.compress=true
 javac.classpath=\
     ${reference.Essentials.jar}:\
-    ${file.reference.bukkit-0.0.1-SNAPSHOT.jar}
+    ${file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false

EssentialsGroupBridge/nbproject/project.properties

@@ -39,14 +39,14 @@ dist.jar=${dist.dir}/EssentialsGroupBridge.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-file.reference.bukkit-0.0.1-SNAPSHOT.jar=../lib/bukkit-0.0.1-SNAPSHOT.jar
+file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar=../lib/bukkit-1.0.0-R1-SNAPSHOT.jar
 includes=**
 jar.archive.disabled=${jnlp.enabled}
 jar.compress=true
 jar.index=${jnlp.enabled}
 javac.classpath=\
     ${reference.EssentialsGroupManager.jar}:\
-    ${file.reference.bukkit-0.0.1-SNAPSHOT.jar}
+    ${file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false

EssentialsGroupManager/nbproject/project.properties

@@ -39,11 +39,11 @@ dist.jar=${dist.dir}/EssentialsGroupManager.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-file.reference.craftbukkit-0.0.1-SNAPSHOT.jar=..\\lib\\craftbukkit-0.0.1-SNAPSHOT.jar
+file.reference.craftbukkit-1.0.0-SNAPSHOT.jar=..\\lib\\craftbukkit-1.0.0-SNAPSHOT.jar
 includes=**
 jar.compress=true
 javac.classpath=\
-    ${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar}
+    ${file.reference.craftbukkit-1.0.0-SNAPSHOT.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false

EssentialsPermissionsCommands/nbproject/project.properties

@@ -61,7 +61,7 @@ dist.jar=${dist.dir}/EssentialsPermissionsCommands.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-file.reference.bukkit-0.0.1-SNAPSHOT.jar=../lib/bukkit-0.0.1-SNAPSHOT.jar
+file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar=../lib/bukkit-1.0.0-R1-SNAPSHOT.jar
 file.reference.Permissions3.jar=../lib/Permissions3.jar
 includes=**
 jar.archive.disabled=${jnlp.enabled}
@@ -70,7 +70,7 @@ jar.index=${jnlp.enabled}
 javac.classpath=\
     ${reference.Essentials.jar}:\
     ${file.reference.Permissions3.jar}:\
-    ${file.reference.bukkit-0.0.1-SNAPSHOT.jar}
+    ${file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false

EssentialsProtect/nbproject/project.properties

@@ -62,14 +62,14 @@ dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
 file.reference.c3p0-0.9.1.2.jar=..\\lib\\c3p0-0.9.1.2.jar
-file.reference.craftbukkit-0.0.1-SNAPSHOT.jar=..\\lib\\craftbukkit-0.0.1-SNAPSHOT.jar
+file.reference.craftbukkit-1.0.0-SNAPSHOT.jar=..\\lib\\craftbukkit-1.0.0-SNAPSHOT.jar
 includes=**
 jar.archive.disabled=${jnlp.enabled}
 jar.compress=true
 jar.index=${jnlp.enabled}
 javac.classpath=\
     ${reference.Essentials.jar}:\
-    ${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar}:\
+    ${file.reference.craftbukkit-1.0.0-SNAPSHOT.jar}:\
     ${file.reference.c3p0-0.9.1.2.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=

EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java

@@ -14,12 +14,14 @@ import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.CraftWorld;
+import org.bukkit.entity.CreatureType;
 import org.bukkit.entity.Creeper;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Fireball;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
+import org.bukkit.entity.SmallFireball;
 import org.bukkit.entity.TNTPrimed;
 import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.bukkit.event.entity.EndermanPickupEvent;
@@ -38,13 +40,13 @@ public class EssentialsProtectEntityListener extends EntityListener
 {
 	private final transient IProtect prot;
 	private final transient IEssentials ess;
-	
+
 	public EssentialsProtectEntityListener(final IProtect prot)
 	{
 		this.prot = prot;
 		this.ess = prot.getEssentials();
 	}
-	
+
 	@Override
 	public void onEntityDamage(final EntityDamageEvent event)
 	{
@@ -57,7 +59,7 @@ public class EssentialsProtectEntityListener extends EntityListener
 		if (event instanceof EntityDamageByBlockEvent)
 		{
 			final DamageCause cause = event.getCause();
-			
+
 			if (prot.getSettingBool(ProtectConfig.disable_contactdmg)
 				&& cause == DamageCause.CONTACT
 				&& !(target instanceof Player
@@ -86,7 +88,7 @@ public class EssentialsProtectEntityListener extends EntityListener
 				return;
 			}
 		}
-		
+
 		if (event instanceof EntityDamageByEntityEvent)
 		{
 			final EntityDamageByEntityEvent edEvent = (EntityDamageByEntityEvent)event;
@@ -111,7 +113,7 @@ public class EssentialsProtectEntityListener extends EntityListener
 				event.setCancelled(true);
 				return;
 			}
-			
+
 			if (eAttack instanceof Creeper && prot.getSettingBool(ProtectConfig.prevent_creeper_playerdmg)
 				&& !(target instanceof Player
 					 && user.isAuthorized("essentials.protect.damage.creeper")
@@ -120,8 +122,9 @@ public class EssentialsProtectEntityListener extends EntityListener
 				event.setCancelled(true);
 				return;
 			}
-			
-			if (eAttack instanceof Fireball && prot.getSettingBool(ProtectConfig.prevent_fireball_playerdmg)
+
+			if ((event.getEntity() instanceof Fireball || event.getEntity() instanceof SmallFireball)
+				&& prot.getSettingBool(ProtectConfig.prevent_fireball_playerdmg)
 				&& !(target instanceof Player
 					 && user.isAuthorized("essentials.protect.damage.fireball")
 					 && !user.isAuthorized("essentials.protect.damage.disable")))
@@ -129,7 +132,7 @@ public class EssentialsProtectEntityListener extends EntityListener
 				event.setCancelled(true);
 				return;
 			}
-			
+
 			if (eAttack instanceof TNTPrimed && prot.getSettingBool(ProtectConfig.prevent_tnt_playerdmg)
 				&& !(target instanceof Player
 					 && user.isAuthorized("essentials.protect.damage.tnt")
@@ -138,7 +141,7 @@ public class EssentialsProtectEntityListener extends EntityListener
 				event.setCancelled(true);
 				return;
 			}
-			
+
 			if (edEvent.getDamager() instanceof Projectile
 				&& target instanceof Player
 				&& ((prot.getSettingBool(ProtectConfig.disable_projectiles)
@@ -153,7 +156,7 @@ public class EssentialsProtectEntityListener extends EntityListener
 				return;
 			}
 		}
-		
+
 		final DamageCause cause = event.getCause();
 		if (target instanceof Player)
 		{
@@ -165,7 +168,7 @@ public class EssentialsProtectEntityListener extends EntityListener
 				event.setCancelled(true);
 				return;
 			}
-			
+
 			if (cause == DamageCause.SUFFOCATION
 				&& prot.getSettingBool(ProtectConfig.disable_suffocate)
 				&& !(user.isAuthorized("essentials.protect.damage.suffocation")
@@ -201,7 +204,7 @@ public class EssentialsProtectEntityListener extends EntityListener
 			}
 		}
 	}
-	
+
 	@Override
 	public void onEntityExplode(final EntityExplodeEvent event)
 	{
@@ -242,7 +245,7 @@ public class EssentialsProtectEntityListener extends EntityListener
 						set.add(cp);
 					}
 				}
-				
+
 				((CraftServer)ess.getServer()).getHandle().sendPacketNearby(loc.getX(), loc.getY(), loc.getZ(), 64.0D, ((CraftWorld)loc.getWorld()).getHandle().worldProvider.dimension,
 																			new Packet60Explosion(loc.getX(), loc.getY(), loc.getZ(), 3.0f, set));
 			}
@@ -259,7 +262,7 @@ public class EssentialsProtectEntityListener extends EntityListener
 			event.setCancelled(true);
 			return;
 		}
-		else if (event.getEntity() instanceof Fireball
+		else if ((event.getEntity() instanceof Fireball || event.getEntity() instanceof SmallFireball)
 				 && prot.getSettingBool(ProtectConfig.prevent_fireball_explosion))
 		{
 			event.setCancelled(true);
@@ -295,7 +298,7 @@ public class EssentialsProtectEntityListener extends EntityListener
 			}
 		}
 	}
-	
+
 	@Override
 	public void onCreatureSpawn(final CreatureSpawnEvent event)
 	{
@@ -307,7 +310,12 @@ public class EssentialsProtectEntityListener extends EntityListener
 		{
 			return;
 		}
-		final String creatureName = event.getCreatureType().toString().toLowerCase();
+		final CreatureType creature = event.getCreatureType();
+		if (creature == null)
+		{
+			return;
+		}
+		final String creatureName = creature.toString().toLowerCase();
 		if (creatureName == null || creatureName.isEmpty())
 		{
 			return;
@@ -317,7 +325,7 @@ public class EssentialsProtectEntityListener extends EntityListener
 			event.setCancelled(true);
 		}
 	}
-	
+
 	@Override
 	public void onEntityTarget(final EntityTargetEvent event)
 	{
@@ -343,11 +351,11 @@ public class EssentialsProtectEntityListener extends EntityListener
 			return;
 		}
 	}
-	
+
 	@Override
 	public void onExplosionPrime(ExplosionPrimeEvent event)
 	{
-		if (event.getEntity() instanceof Fireball
+		if ((event.getEntity() instanceof Fireball || event.getEntity() instanceof SmallFireball)
 			&& prot.getSettingBool(ProtectConfig.prevent_fireball_fire))
 		{
 			event.setFire(false);
@@ -357,10 +365,12 @@ public class EssentialsProtectEntityListener extends EntityListener
 	@Override
 	public void onEndermanPickup(EndermanPickupEvent event)
 	{
-		if (event.isCancelled()) {
+		if (event.isCancelled())
+		{
 			return;
 		}
-		if (prot.getSettingBool(ProtectConfig.prevent_enderman_pickup)) {
+		if (prot.getSettingBool(ProtectConfig.prevent_enderman_pickup))
+		{
 			event.setCancelled(true);
 			return;
 		}

EssentialsSpawn/nbproject/project.properties

@@ -61,12 +61,12 @@ dist.jar=${dist.dir}/EssentialsSpawn.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-file.reference.bukkit-0.0.1-SNAPSHOT.jar=../lib/bukkit-0.0.1-SNAPSHOT.jar
+file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar=../lib/bukkit-1.0.0-R1-SNAPSHOT.jar
 includes=**
 jar.compress=true
 javac.classpath=\
     ${reference.Essentials.jar}:\
-    ${file.reference.bukkit-0.0.1-SNAPSHOT.jar}
+    ${file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false

EssentialsUpdate/nbproject/project.properties

@@ -26,11 +26,11 @@ dist.jar=${dist.dir}/EssentialsUpdate.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-file.reference.bukkit-0.0.1-SNAPSHOT.jar=../lib/bukkit-0.0.1-SNAPSHOT.jar
+file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar=../lib/bukkit-1.0.0-R1-SNAPSHOT.jar
 includes=**
 jar.compress=true
 javac.classpath=\
-    ${file.reference.bukkit-0.0.1-SNAPSHOT.jar}:\
+    ${file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar}:\
     ${libs.junit_4.classpath}
 # Space-separated list of extra javac options
 javac.compilerargs=

EssentialsXMPP/nbproject/project.properties

@@ -61,7 +61,7 @@ dist.jar=${dist.dir}/original-EssentialsXMPP.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-file.reference.bukkit-0.0.1-SNAPSHOT.jar=../lib/bukkit-0.0.1-SNAPSHOT.jar
+file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar=../lib/bukkit-1.0.0-R1-SNAPSHOT.jar
 file.reference.smack-3.2.0.jar=../lib/smack-3.2.0.jar
 includes=**
 jar.archive.disabled=${jnlp.enabled}
@@ -69,7 +69,7 @@ jar.compress=true
 jar.index=${jnlp.enabled}
 javac.classpath=\
     ${reference.Essentials.jar}:\
-    ${file.reference.bukkit-0.0.1-SNAPSHOT.jar}:\
+    ${file.reference.bukkit-1.0.0-R1-SNAPSHOT.jar}:\
     ${file.reference.smack-3.2.0.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=-Xlint:unchecked