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

Merge branch 'master' of https://github.com/Gibstick/DiscoSheep

Browse Source 
Conflicts:
	src/gibstick/bukkit/discosheep/DiscoParty.java
This commit is contained in:
Charlie Wang 2013-06-30 20:22:48 -04:00
commit 59a1bbbdac
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,3 @@
/*
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
package gibstick.bukkit.discosheep; package gibstick.bukkit.discosheep;
import java.util.ArrayList; import java.util.ArrayList;
@ -22,7 +18,7 @@ public class DiscoParty {
private DiscoSheep ds; private DiscoSheep ds;
private Player player; private Player player;
private ArrayList<Sheep> sheepList; private ArrayList<Sheep> sheepList= new ArrayList<Sheep>();
private int duration, frequency = 20, numSheep = 5; private int duration, frequency = 20, numSheep = 5;
private final int defaultDuration = 300; // ticks for entire party private final int defaultDuration = 300; // ticks for entire party
private final int defaultFrequency = 10; // ticks per state change private final int defaultFrequency = 10; // ticks per state change