CB#1501 B#1037

New spawnmob options: cow:baby sheep:baby chicken:baby pig:baby

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

@@ -56,7 +56,7 @@ import org.bukkit.scheduler.BukkitScheduler;
 
 public class Essentials extends JavaPlugin implements IEssentials
 {
-	public static final int BUKKIT_VERSION = 1467;
+	public static final int BUKKIT_VERSION = 1501;
 	private static final Logger LOGGER = Logger.getLogger("Minecraft");
 	private transient ISettings settings;
 	private final transient TNTExplodeListener tntListener = new TNTExplodeListener(this);

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

@@ -3,6 +3,8 @@ package com.earth2me.essentials;
 import static com.earth2me.essentials.I18n._;
 import java.util.List;
 import java.util.logging.Logger;
+import org.bukkit.Material;
+import org.bukkit.entity.Animals;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
@@ -49,6 +51,17 @@ public class EssentialsEntityListener extends EntityListener
 					}
 				}
 			}
+			if (eDefend instanceof Animals && eAttack instanceof Player)
+			{
+				User player = ess.getUser(eAttack);
+				ItemStack hand = player.getItemInHand();
+				if (hand != null && hand.getType() == Material.MILK_BUCKET) {
+					((Animals)eDefend).setAge(-24000);
+					player.setItemInHand(new ItemStack(Material.BUCKET, hand.getAmount()));
+					player.updateInventory();
+					event.setCancelled(true);
+				}
+			}
 		}
 		if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled())
 		{

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

@@ -1,5 +1,6 @@
 package com.earth2me.essentials;
 
+import java.io.File;
 import java.util.List;
 import java.util.UUID;
 import org.bukkit.*;
@@ -515,4 +516,10 @@ public class FakeWorld implements World
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
+
+	@Override
+	public File getWorldFolder()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
 }

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

@@ -185,6 +185,15 @@ public class Commandspawnmob extends EssentialsCommand
 				throw new Exception(_("slimeMalformedSize"), e);
 			}
 		}
+		if (("Sheep".equalsIgnoreCase(type)
+			 || "Cow".equalsIgnoreCase(type)
+			 || "Chicken".equalsIgnoreCase(type)
+			 || "Pig".equalsIgnoreCase(type))
+			&& data.equalsIgnoreCase("baby"))
+		{
+			((Animals)spawned).setAge(-24000);
+			return;
+		}
 		if ("Sheep".equalsIgnoreCase(type))
 		{
 			try

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

@@ -586,4 +586,10 @@ public class FakeServer implements Server
 	{
 		return "Essentials Fake-Server";
 	}
+
+	@Override
+	public File getWorldContainer()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
 }