Commit Graph

108 Commits

Author SHA1 Message Date
Georgiy
84d77f2f25 Minor changes, whatever 2013-06-30 21:00:43 -04:00
Charlie Wang
9c44f3daec Merge remote-tracking branch 'origin/limit-parties' 2013-06-30 20:53:49 -04:00
Charlie Wang
f2f429f21d only allow one party per player 2013-06-30 20:52:49 -04:00
Georgiy
9ff882c526 Added check for breeding before preventing sheep event 2013-06-30 20:49:34 -04:00
Georgiy
aa07123277 Merge branch 'master' of https://github.com/Gibstick/DiscoSheep.git 2013-06-30 20:41:23 -04:00
Georgiy
28fdb0d055 Added to SheepDeshearer to prevent sheep from breeding. 2013-06-30 20:38:14 -04:00
Charlie Wang
59a1bbbdac Merge branch 'master' of https://github.com/Gibstick/DiscoSheep
Conflicts:
	src/gibstick/bukkit/discosheep/DiscoParty.java
2013-06-30 20:22:48 -04:00
Georgiy
8863b401c9 Initialized sheep array in DiscoParty 2013-06-30 20:15:11 -04:00
Charlie Wang
a8023c3594 wtf I cannot into git
Why is it trying to replace the entire file with the entire file
2013-06-30 20:13:32 -04:00
Georgiy
b185f7d02a Trying to fix null pointer exception. 2013-06-30 20:06:41 -04:00
Georgiy
909ff02922 Huge restructuring to have multiple parties at a time. 2013-06-30 19:54:27 -04:00
RangerMauve
112d3f0f08 Made sure to cancel previously scheduled update before starting a new loop of them. 2013-06-30 18:48:39 -04:00
Charlie Wang
9d4f65cec9 more sounds, state change is now twice as fast 2013-06-30 18:44:25 -04:00
Charlie Wang
0ef9406cfe Sounds are now played 2013-06-30 18:32:25 -04:00
Charlie Wang
e83031769b Fixed random colours, bumped up version number 2013-06-30 18:27:26 -04:00
RangerMauve
2a802cfe81 Fixed some structuring 2013-06-30 18:25:40 -04:00
RangerMauve
7eed130d52 Changed default duration to 300 ticks 2013-06-30 18:14:38 -04:00
Gibstick
64e5f0583d Merge pull request #1 from Gibstick/gibstick-derp
Made sure sheep are dead
2013-06-30 15:08:02 -07:00
RangerMauve
e63fc0e0c4 Merge branch 'master' of https://github.com/Gibstick/DiscoSheep.git 2013-06-30 18:01:48 -04:00
RangerMauve
1c350e844d Refactored to make DiscoUpdater only call the update method on DiscoSheep and moved all the update logic to DiscoSheep. 2013-06-30 18:01:05 -04:00
Charlie Wang
4ccba41757 Made sure sheep are dead 2013-06-30 17:55:15 -04:00
Charlie Wang
0e89570248 fixed package name typo in plugin.yml 2013-06-30 17:41:06 -04:00
RangerMauve
a087e07052 Fixed bad cast, added more structure for handling multiple players. 2013-06-30 17:39:57 -04:00
RangerMauve
c14892f40b Merge branch 'master' of https://github.com/Gibstick/DiscoSheep.git 2013-06-30 17:26:47 -04:00
RangerMauve
14a349e6a0 Added actual command registering stuff, maybe? 2013-06-30 17:25:45 -04:00
Charlie Wang
432e7afb92 Added /ds command to plugin.yml 2013-06-30 17:21:13 -04:00
Charlie Wang
803470a76b Added random sheep colour upon spawn 2013-06-30 16:44:22 -04:00
RangerMauve
572cb5a9d6 Implemented shear prevention on spawned sheep 2013-06-30 16:13:29 -04:00
RangerMauve
9dba2a1be3 Changed access of sheep, added ShepDeshearer. 2013-06-30 16:00:26 -04:00
RangerMauve
76bded66df Changed access of sheep, added ShepDeshearer. 2013-06-30 15:54:28 -04:00
Charlie Wang
c3008d9608 Renamed cycleSheepColours to randomizeSheepColours, and implemented it using a lookup table of accetable disco colours 2013-06-30 15:46:52 -04:00
Charlie Wang
65122cc098 Converted spaces to tabs, except for plugin.yml 2013-06-30 15:17:56 -04:00
RangerMauve
e749635131 Fixed syntax error in sheep ArrayList 2013-06-30 15:06:57 -04:00
Charlie Wang
eda4007b1e I cannot into git 2013-06-30 14:48:36 -04:00
Charlie Wang
bf15d90dcd added sheepSpawnRadius, configurable later 2013-06-30 14:27:46 -04:00
Charlie Wang
d7b075d507 All DiscoSheep methods are now package-protected 2013-06-30 14:17:41 -04:00
Charlie Wang
dd049a3011 fixed package protection for DiscoSheep 2013-06-30 14:16:18 -04:00
Charlie Wang
8533b007e3 Misc fixes for DiscoUpdater 2013-06-30 14:09:30 -04:00
RangerMauve
61dcce06dd Attempting merge fix 2013-06-30 14:00:56 -04:00
RangerMauve
9fc9e01c3b Attempting merge fix 2013-06-30 13:58:47 -04:00
RangerMauve
337a491dc6 Added updater code 2013-06-30 13:53:07 -04:00
Charlie Wang
edef18aa4c implemented spawnSheep(Player, int) 2013-06-30 13:52:31 -04:00
Charlie Wang
76c7cb706c Merge branch 'master' of https://github.com/Gibstick/DiscoSheep.git 2013-06-30 13:00:00 -04:00
Charlie Wang
ca24b9073d testing merge 2013-06-30 12:59:48 -04:00
RangerMauve
f2d1cbde35 Merge branch 'master' of https://github.com/Gibstick/DiscoSheep 2013-06-30 12:56:54 -04:00
Charlie Wang
7ea2d6224a testing merge 2013-06-30 12:56:22 -04:00
RangerMauve
4acb695bfa Testing out merging 2013-06-30 12:55:53 -04:00
Charlie Wang
200dc9b18d sheep now have 10000 health 2013-06-30 12:47:11 -04:00
Charlie Wang
b22d2a625c declared spawnSheep, removeAllSheep and cycleSheepColours for later use 2013-06-30 12:25:16 -04:00
Charlie Wang
23d88c7808 Implemented spawnSheep method that stores the spawned sheep in the sheep array 2013-06-30 12:11:54 -04:00