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 | 860f6a41acfb2f2b37c6869ef6bb75e2f5ca2c9b (patch) | |
| tree | adbdb9ee21e53c8c6aec8ee3735e9714c7f610e7 | |
| parent | 8aa7b1f301764d747c5da2109601ec0e93570982 (diff) | |
| parent | cea5c81d4463d7da71f9b4c3729b87ad3e9748bc (diff) | |
| download | Essentials-860f6a41acfb2f2b37c6869ef6bb75e2f5ca2c9b.tar Essentials-860f6a41acfb2f2b37c6869ef6bb75e2f5ca2c9b.tar.gz Essentials-860f6a41acfb2f2b37c6869ef6bb75e2f5ca2c9b.tar.lz Essentials-860f6a41acfb2f2b37c6869ef6bb75e2f5ca2c9b.tar.xz Essentials-860f6a41acfb2f2b37c6869ef6bb75e2f5ca2c9b.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")) { |