Commit Graph

3449 Commits

Author SHA1 Message Date
Cheese
bb569a26e2 skywars update 2015-06-26 11:22:33 +10:00
Cheese
b48820a753 ore gen fixed! 2015-06-26 10:50:38 +10:00
Cheese
d9a8d2b6ab ore changes 2015-06-26 10:36:45 +10:00
Jeremiah Bishop
0342a5ac61 Fixed Achievements
Reordered Kits
Added new Kit
etc, etc, etc...
2015-06-25 19:03:25 -04:00
fooify
2679d19a81 Missed a spot. 2015-06-25 08:19:12 -07:00
fooify
ba9e4ba5d9 Fix staff server not hiding in friends list 2015-06-25 08:17:28 -07:00
Cheese
2179795677 Merge branch 'SkyWars' of ssh://184.154.0.242:7999/min/Mineplex into SkyWars
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/SkyWars.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/data/TNTGenerator.java
2015-06-25 20:48:34 +10:00
Cheese
2bf1faa70d fixed a few skywars bugs
added ore generation (but theres some wierd bug, still working on it)
2015-06-25 20:24:31 +10:00
Jonathan Williams
526b0dadb6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-25 04:58:26 -05:00
Jonathan Williams
567bb5cd6c Fixed up MotdManager so that old values don't overwrite in the db. 2015-06-25 04:58:16 -05:00
Jonathan Williams
5bdb90b459 Changed disguise perm to YOUTUBE 2015-06-25 04:57:56 -05:00
Jeremiah Bishop
ed667fedee Added more achievements 2015-06-24 22:59:28 -04:00
Cheese
b77279a160 fixed notif msg 2015-06-25 11:22:23 +10:00
Jeremiah Bishop
cd10a2ad79 Fixed both kits
Added game achievements.
2015-06-24 20:08:31 -04:00
fooify
a36af0acc4 Remove space :) I assume this isn't intended 2015-06-24 10:28:39 -07:00
fooify
ea3c04b8c1 Add fooify to list of AFKers 2015-06-24 10:24:08 -07:00
Jeremiah Bishop
5b4a3249ca Added chest loot and such. 2015-06-22 21:42:45 -04:00
Jeremiah Bishop
7583e4170b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SkyWars 2015-06-22 21:40:43 -04:00
Cheese
3a06b54b7f Changed notifications to 50% off sale 2015-06-22 17:10:03 +10:00
Jeremiah Bishop
03c45116ef Various fixes, and added the new data to Zoologist kit 2015-06-21 23:38:25 -04:00
Cheese
648355ac17 mapparser skywars 2015-06-22 11:33:25 +10:00
Jeremiah Bishop
a05c2d085d Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SkyWars 2015-06-21 16:17:51 -04:00
Jeremiah Bishop
e12ff7ef7d Fixed? 2015-06-20 22:20:30 -04:00
Jeremiah Bishop
3cf1297d89 Added SkyWars ;) 2015-06-20 22:08:15 -04:00
Aaron Brock
5280433dbd Added the Pair class for simple 2 object storing, and added upperCaseCount and lowerCaseCount to UtilText.
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-06-20 10:03:53 -04:00
Aaron Brock
3532dea892 Allowed Helper+ to bypass anti-hackusating
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-06-20 10:01:50 -04:00
Jonathan Williams
91b5beaff2 Fixed new Chat constructor requirement. 2015-06-20 03:43:38 -05:00
Jonathan Williams
90e13b4b9e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-20 03:37:33 -05:00
Jonathan Williams
f92e864c30 Updated motd. 2015-06-20 03:37:22 -05:00
Jonathan Williams
dbde6890a0 Add fallback to load by name if no uuid. 2015-06-20 03:36:55 -05:00
Aaron Brock
8ea23f96fc Froze time using doDayNightCycle instead of setting the time on UpdateEvent.
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-06-20 01:36:05 -04:00
Aaron Brock
da981980df Added world.setThundering(false);
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-06-20 01:35:11 -04:00
Aaron Brock
9cedb3b742 Rewrote how hackusations are detected.
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-06-20 01:10:26 -04:00
Aaron Brock
1f0accd2a1 Fixed a little boolean derp that stopped people from breaking blocks.
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-06-20 01:09:21 -04:00
Cheese
478a3c8591 some champs fixes/balance
duplicate message improvement
2015-06-20 15:00:16 +10:00
Cheese
77bf332c29 level 25 is uneffected by chat delay 2015-06-20 11:18:31 +10:00
Cheese
2c43dc76c9 DMT no longer effected by 3s chat delay
Minestrike no longer has 'terrorists'
Jr.Dev rank up!
2015-06-20 11:12:24 +10:00
Aaron Brock
750dddeabc Editing .classpath and a main testing method in UtilBlock
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-06-19 21:10:10 -04:00
Aaron Brock
61494f93ba Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into bench 2015-06-19 18:13:48 -04:00
Cheese
13ae7a19db jr.dev rank up 2015-06-19 18:06:40 +10:00
Cheese
cf152c4897 fixed notifs being sent to people who didnt need them 2015-06-19 13:46:56 +10:00
Cheese
de83e58e75 removed debug 2015-06-19 13:29:32 +10:00
Cheese
8a224950b3 Added sale notifications
Added 3s chat delay
2015-06-19 13:27:59 +10:00
Aaron Brock
76e4dc6056 Stopped blocks from dropping and stopped people from breaking the other teams blocks with their fist.
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-06-18 19:50:06 -04:00
Jeremiah Bishop
dd9e6a6866 Started adding SkyWars game mechanics 2015-06-18 14:54:26 -04:00
Cheese
9a3a014dd5 removed debug! 2015-06-18 12:04:49 +10:00
Aaron Brock
b0ca5ca4aa Freezes the time using doDayLightCycle instead of using a UpdateEvent.
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-06-17 20:54:28 -04:00
Aaron Brock
41e77b1ade Fixed double-half-slabs (line 68)
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-06-17 20:49:35 -04:00
Cheese
6886484d79 Fixed Micro Battles lag (stupid lava)
cmds for jnr devs
smaller head hitbox in MS
added MB to parser plugin
2015-06-17 13:02:12 +10:00
Cheese
47744a80e9 jnr dev 2015-06-17 10:44:29 +10:00