Merge branch 'master' of github.com:essentials/Essentials

This commit is contained in:
KHobbits 2012-03-03 13:49:26 +00:00
commit 860f6a41ac
2 changed files with 15 additions and 0 deletions

View file

@ -9,6 +9,7 @@ import org.bukkit.Material;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -35,6 +36,10 @@ public class Commandessentials extends EssentialsCommand
{ {
run_nya(server, sender, commandLabel, args); run_nya(server, sender, commandLabel, args);
} }
else if (args[0].equalsIgnoreCase("moo"))
{
run_moo(server, sender, commandLabel, args);
}
else { else {
run_reload(server, sender, commandLabel, args); run_reload(server, sender, commandLabel, args);
} }
@ -159,4 +164,12 @@ public class Commandessentials extends EssentialsCommand
} }
noteBlocks.clear(); noteBlocks.clear();
} }
private void run_moo(final Server server, final CommandSender sender, final String command, final String args[])
{
if(sender instanceof ConsoleCommandSender)
sender.sendMessage(new String[]{" (__)", " (oo)", " /------\\/", " / | ||", " * /\\---/\\", " ~~ ~~", "....\"Have you mooed today?\"..." } );
else
sender.sendMessage(new String[]{" (__)", " (oo)", " /------\\/", " / | | |", " * /\\---/\\", " ~~ ~~", "....\"Have you mooed today?\"..." } );
}
} }

View file

@ -216,6 +216,8 @@ public class Commandspawnmob extends EssentialsCommand
|| type == EntityType.MUSHROOM_COW || type == EntityType.MUSHROOM_COW
|| type == EntityType.CHICKEN || type == EntityType.CHICKEN
|| type == EntityType.PIG || type == EntityType.PIG
|| type == EntityType.VILLAGER
|| type == EntityType.OCELOT
|| type == EntityType.WOLF) || type == EntityType.WOLF)
&& data.equals("baby")) && data.equals("baby"))
{ {