diff options
| author | KHobbits <rob@khobbits.co.uk> | 2012-03-03 13:49:26 +0000 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2012-03-03 13:49:26 +0000 |
| commit | f105c78c7e9e741d48d9f2796feb09c6a8351353 (patch) | |
| tree | d89d866e5ebf7f7dc8410511ca5a41e74822e82a | |
| parent | 623d134a162eba47797f9451e1f9e42e537783a2 (diff) | |
| parent | ba218eb62589fd280652e9edf7584a36e5a27a75 (diff) | |
| download | Essentials-f105c78c7e9e741d48d9f2796feb09c6a8351353.tar Essentials-f105c78c7e9e741d48d9f2796feb09c6a8351353.tar.gz Essentials-f105c78c7e9e741d48d9f2796feb09c6a8351353.tar.lz Essentials-f105c78c7e9e741d48d9f2796feb09c6a8351353.tar.xz Essentials-f105c78c7e9e741d48d9f2796feb09c6a8351353.zip | |
Merge branch 'master' of github.com:essentials/Essentials
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/commands/Commandessentials.java | 13 | ||||
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java | 2 |
2 files changed, 15 insertions, 0 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandessentials.java b/Essentials/src/com/earth2me/essentials/commands/Commandessentials.java index 14bbf5e02..56432a91f 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandessentials.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandessentials.java @@ -9,6 +9,7 @@ import org.bukkit.Material; import org.bukkit.Server; import org.bukkit.block.Block; import org.bukkit.command.CommandSender; +import org.bukkit.command.ConsoleCommandSender; import org.bukkit.entity.Player; @@ -35,6 +36,10 @@ public class Commandessentials extends EssentialsCommand { run_nya(server, sender, commandLabel, args); } + else if (args[0].equalsIgnoreCase("moo")) + { + run_moo(server, sender, commandLabel, args); + } else { run_reload(server, sender, commandLabel, args); } @@ -159,4 +164,12 @@ public class Commandessentials extends EssentialsCommand } 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?\"..." } ); + } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java b/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java index 341a702ff..c64d75d2b 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java @@ -216,6 +216,8 @@ public class Commandspawnmob extends EssentialsCommand || type == EntityType.MUSHROOM_COW || type == EntityType.CHICKEN || type == EntityType.PIG + || type == EntityType.VILLAGER + || type == EntityType.OCELOT || type == EntityType.WOLF) && data.equals("baby")) { |