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

Changed constructors for DiscoParty and renamed clone method.

Browse Source
This commit is contained in:
RangerMauve 2013-07-29 21:06:54 -04:00
parent bf1e1feaa0
commit 54cbc2f8c1
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ca/gibstick/discosheep/DiscoParty.java
View File

@ -61,18 +61,12 @@ public class DiscoParty {
DyeColor.BLACK, DyeColor.BLACK,
DyeColor.WHITE DyeColor.WHITE
}; };
private Random r; private Random r=new Random();
private PartyEvents partyEvents; private PartyEvents partyEvents;
public DiscoParty(DiscoSheep parent, Player player) { public DiscoParty(DiscoSheep parent, Player player) {
this.parent = parent; this(parent);
this.player = player; this.player = player;
this.duration = DiscoParty.defaultDuration;
this.period = DiscoParty.defaultPeriod;
this.radius = DiscoParty.defaultRadius;
this.sheep = DiscoParty.defaultSheep;
this.guestNumbers = new HashMap<String, Integer>(DiscoParty.defaultGuestNumbers);
r = new Random();
} }
public DiscoParty(DiscoSheep parent) { public DiscoParty(DiscoSheep parent) {
@ -87,7 +81,7 @@ public class DiscoParty {
// copy but with new player // copy but with new player
// used for /ds other and /ds all // used for /ds other and /ds all
public DiscoParty DiscoParty(Player player) { public DiscoParty clone(Player player) {
DiscoParty newParty; DiscoParty newParty;
newParty = new DiscoParty(this.parent, player); newParty = new DiscoParty(this.parent, player);
newParty.doFireworks = this.doFireworks; newParty.doFireworks = this.doFireworks;
@ -95,8 +89,8 @@ public class DiscoParty {
newParty.period = this.period; newParty.period = this.period;
newParty.radius = this.radius; newParty.radius = this.radius;
newParty.sheep = this.sheep; newParty.sheep = this.sheep;
newParty.doLightning = this.doLightning;
newParty.guestNumbers = this.getGuestNumbers(); newParty.guestNumbers = this.getGuestNumbers();
newParty.r = new Random();
return newParty; return newParty;
} }

4
src/ca/gibstick/discosheep/DiscoSheep.java
View File

@ -226,7 +226,7 @@ public final class DiscoSheep extends JavaPlugin {
p = Bukkit.getServer().getPlayer(playerName); p = Bukkit.getServer().getPlayer(playerName);
if (p != null) { if (p != null) {
if (!hasParty(p.getName())) { if (!hasParty(p.getName())) {
DiscoParty individualParty = party.DiscoParty(p); DiscoParty individualParty = party.clone(p);
individualParty.startDisco(); individualParty.startDisco();
} }
} else { } else {
@ -243,7 +243,7 @@ public final class DiscoSheep extends JavaPlugin {
if (sender.hasPermission(PERMISSION_ALL)) { if (sender.hasPermission(PERMISSION_ALL)) {
for (Player p : Bukkit.getServer().getOnlinePlayers()) { for (Player p : Bukkit.getServer().getOnlinePlayers()) {
if (!hasParty(p.getName())) { if (!hasParty(p.getName())) {
DiscoParty individualParty = party.DiscoParty(p); DiscoParty individualParty = party.clone(p);
individualParty.startDisco(); individualParty.startDisco();
p.sendMessage(ChatColor.RED + "LET'S DISCO!!"); p.sendMessage(ChatColor.RED + "LET'S DISCO!!");
} }