From 8ee6a3465e782fcd901ff82b04825b2e56db56dc Mon Sep 17 00:00:00 2001 From: Gibstick Date: Wed, 7 Aug 2013 14:51:44 -0400 Subject: [PATCH] preparations for 1.1.1 release --- src/ca/gibstick/discosheep/DiscoParty.java | 2 +- src/ca/gibstick/discosheep/DiscoSheep.java | 3 ++- src/ca/gibstick/discosheep/DiscoSheepCommandExecutor.java | 2 +- src/plugin.yml | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/ca/gibstick/discosheep/DiscoParty.java b/src/ca/gibstick/discosheep/DiscoParty.java index 4e1cc5b..89a7187 100644 --- a/src/ca/gibstick/discosheep/DiscoParty.java +++ b/src/ca/gibstick/discosheep/DiscoParty.java @@ -266,7 +266,7 @@ public class DiscoParty { } void spawnGuest(World world, Location loc, EntityType type) { - Entity newGuest = world.spawnEntity(loc, type); + Entity newGuest = loc.getWorld().spawnEntity(loc, type); getGuestList().add(newGuest); if (doLightning) { world.strikeLightningEffect(loc); diff --git a/src/ca/gibstick/discosheep/DiscoSheep.java b/src/ca/gibstick/discosheep/DiscoSheep.java index 8f66a72..706a5a8 100644 --- a/src/ca/gibstick/discosheep/DiscoSheep.java +++ b/src/ca/gibstick/discosheep/DiscoSheep.java @@ -43,7 +43,7 @@ public final class DiscoSheep extends JavaPlugin { getConfig().addDefault("default.radius", DiscoParty.defaultRadius); getConfig().addDefault("default.duration", toSeconds_i(DiscoParty.defaultDuration)); getConfig().addDefault("default.period-ticks", DiscoParty.defaultPeriod); - + /* * Iterate through all live entities and create default configuration values for them * excludes bosses and other mobs that throw NPE @@ -177,6 +177,7 @@ public final class DiscoSheep extends JavaPlugin { + "-p : set the number of ticks between each disco beat\n" + "-r : set radius of the area in which sheep can spawn\n" + "-g : set spawns for other mobs" + + "-l: enables lightning" + "-fw: enables fireworks"); return true; } diff --git a/src/ca/gibstick/discosheep/DiscoSheepCommandExecutor.java b/src/ca/gibstick/discosheep/DiscoSheepCommandExecutor.java index 188559c..72bdca7 100644 --- a/src/ca/gibstick/discosheep/DiscoSheepCommandExecutor.java +++ b/src/ca/gibstick/discosheep/DiscoSheepCommandExecutor.java @@ -162,7 +162,7 @@ public class DiscoSheepCommandExecutor implements CommandExecutor { try { mainParty.setGuestNumber(guests[j], getNextIntArg(guests, j)); } catch (IllegalArgumentException e) { - sender.sendMessage("Invalid arguments: " + guests[j] + ", " + guests[j + 1] + sender.sendMessage(ChatColor.RED + "Invalid arguments: " + ChatColor.WHITE + guests[j] + ", " + guests[j + 1] + ".\nEither a name typo or a number that is not within limits."); } j += 2; // skip over two arguments, since they come in pairs of entity-number diff --git a/src/plugin.yml b/src/plugin.yml index d39ee6e..f82c28f 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -1,7 +1,7 @@ name: DiscoSheep main: ca.gibstick.discosheep.DiscoSheep authors: [Gibstick, RangerMauve] -version: 1.1 +version: 1.1.1 commands: ds: description: "Main DiscoSheep command"