PandacubeFr/DiscoSheep
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor refactorization of DiscoSheep.startParty() and DiscoParty.startDisco()

Browse Source
This commit is contained in:
Gibstick 2013-07-18 21:43:14 -04:00
parent b59ccc776f
commit 4e3d54f3a4
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
dist/DiscoSheep.jar vendored
View File

Binary file not shown.

6
src/gibstick/bukkit/discosheep/DiscoParty.java
View File

@ -312,6 +312,12 @@ public class DiscoParty {
this.scheduleUpdate(); this.scheduleUpdate();
ds.getPartyMap().put(this.player.getName(), this); ds.getPartyMap().put(this.player.getName(), this);
} }
void startDisco() {
this.spawnSheep(sheep, radius);
this.scheduleUpdate();
ds.getPartyMap().put(this.player.getName(), this);
}
void stopDisco() { void stopDisco() {
removeAllSheep(); removeAllSheep();

8
src/gibstick/bukkit/discosheep/DiscoSheep.java
View File

@ -110,7 +110,13 @@ public final class DiscoSheep extends JavaPlugin {
public void startParty(Player player, int duration, int sheepAmount, int radius, int period, boolean fireworksEnabled) { public void startParty(Player player, int duration, int sheepAmount, int radius, int period, boolean fireworksEnabled) {
if (!hasParty(player.getName())) { if (!hasParty(player.getName())) {
new DiscoParty(this, player).startDisco(duration, sheepAmount, radius, period, fireworksEnabled); DiscoParty ds = new DiscoParty(this, player);
ds.setDuration(duration);
ds.setSheep(sheepAmount);
ds.setRadius(radius);
ds.setPeriod(period);
ds.setDoFireworks(fireworksEnabled);
ds.startDisco();
} }
} }
} }

5
src/gibstick/bukkit/discosheep/DiscoSheepCommandExecutor.java
View File

@ -15,6 +15,7 @@ public class DiscoSheepCommandExecutor implements CommandExecutor {
public DiscoSheepCommandExecutor(DiscoSheep parent) { public DiscoSheepCommandExecutor(DiscoSheep parent) {
this.parent = parent; this.parent = parent;
} }
private static final String PERMISSION_PARTY = "discosheep.party"; private static final String PERMISSION_PARTY = "discosheep.party";
private static final String PERMISSION_ALL = "discosheep.partyall"; private static final String PERMISSION_ALL = "discosheep.partyall";
private static final String PERMISSION_FIREWORKS = "discosheep.fireworks"; private static final String PERMISSION_FIREWORKS = "discosheep.fireworks";
@ -205,7 +206,7 @@ public class DiscoSheepCommandExecutor implements CommandExecutor {
if (args.length > 0) { if (args.length > 0) {
if (args[0].equalsIgnoreCase("all")) { if (args[0].equalsIgnoreCase("all")) {
return partyAllCommand(player, duration, sheepNumber, radius, period, fireworks); return partyAllCommand(sender, duration, sheepNumber, radius, period, fireworks);
} else if (args[0].equalsIgnoreCase("stopall")) { } else if (args[0].equalsIgnoreCase("stopall")) {
return stopAllCommand(sender); return stopAllCommand(sender);
} else if (args[0].equalsIgnoreCase("stop") && isPlayer) { } else if (args[0].equalsIgnoreCase("stop") && isPlayer) {
@ -219,7 +220,7 @@ public class DiscoSheepCommandExecutor implements CommandExecutor {
} else if (args[0].equalsIgnoreCase("reload")) { } else if (args[0].equalsIgnoreCase("reload")) {
return reloadCommand(sender); return reloadCommand(sender);
} else { } else {
sender.sendMessage(ChatColor.RED + "Invalid argument."); sender.sendMessage(ChatColor.RED + "Invalid argument (certain commands do not work from console).");
return false; return false;
} }