Commit Graph

4057 Commits

Author SHA1 Message Date
Cheese
8f3d0ad84b fixed some bugs :O 2015-06-26 14:38:39 +10:00
Cheese
0874178973 skywars update! 2015-06-26 14:14:22 +10:00
Cheese
2d1d65b239 skywars fixes 2015-06-26 13:15:03 +10:00
fooify
7f7edddf42 Fix TNT bug in SG - tested, works fine! :) 2015-06-25 19:36:31 -07:00
Cheese
5710831777 fixed webs dropping webs 2015-06-26 12:34:26 +10:00
Cheese
7d4e36651f less random chests 2015-06-26 12:26:57 +10:00
Cheese
fdbaa4e9c7 dont allow overfill 2015-06-26 12:18:25 +10:00
Cheese
f1da68a82a fixed chickens not spawning 2015-06-26 12:14:35 +10:00
Cheese
00da27a3d6 added middle chests
added chicken spawns
added zombie/chicken loot
2015-06-26 12:06:40 +10:00
Cheese
beb78270e5 skywars loot changes 2015-06-26 11:54:35 +10:00
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
Shaun Bennett
7f530f6593 New border dimensions 2015-06-24 23:18:18 -05:00
Shaun Bennett
a0d97d5d99 Scoreboard changes, Fix region values, add 1.8 Border for map 2015-06-24 22:44:41 -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
Shaun Bennett
2735c81205 Fix bug with leaving and joining clans: online player list wouldnt update 2015-06-23 23:00:07 -05:00
Shaun Bennett
fa612c9c86 Chat filter clan names, Fix scoreboard bug 2015-06-23 22:48:51 -05:00
Shaun Bennett
935aba9c16 Some world event tweaks, refactor clans and clanTerritory to use new clanServer table with serverId, updated jooq classes 2015-06-23 21:45:55 -05:00
Shaun Bennett
e34324b864 Disable auto event now while location and abilities are tweaked 2015-06-23 17:05:47 -05:00
Shaun Bennett
76a1f2b1f0 Reset timer when no players are online 2015-06-23 16:37:49 -05:00
Shaun Bennett
009f8a6764 Merge with twiggy 2015-06-23 16:36:21 -05: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
Shaun Bennett
50ddd23251 Event auto starting, Terrain Finder, Scoreboard Tweaks, Event idle, other random tweaks 2015-06-22 20:34:13 -05:00
Ty Sayers
9816d6d1dd Merge pull request #16 in MIN/mineplex from clans_custom_gear to clans/test-server
* commit '1541dc329ea6f3deb382381fc35af5092121fa95':
  Reimplement clan energy-draining over time. Add combat-logging NPC for players that prematurely log off. Fix bug regarding /logout command for safe-logging. Reduce Shop territory side by 1 chunk radius. Add organic farming shop for purchasing/selling farm produce. Add travel hub for transporting between different spawn and shop locations. Add missing BowAttributes implementations for custom bows, and re-add in probability for dropping bows on custom gear drops. Fix bug related to custom-bow items not properly formatting item descriptions and display name. Update Redis default host IP. Fix bug where ranged attacks triggered melee-based custom gear attributes. Add clan management command for managing/deleting clans during testing phase of alpha/beta Clans.
  Add ability to convert Gems into Gold daily to Bank Shop, including redis-based system for tracking most recent transfers. Fix bug with item attributes that reference potions not properly displaying potion value effects (uses roman numerals). Prepare for custom textured Legendary items by modifying over to record-based materials. Add base for organic produce / farming shop.
2015-06-22 15:27:41 -05:00
Ty Sayers
1541dc329e Merge branch 'clans/test-server' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/economy/GoldManager.java
2015-06-22 16:24:31 -04:00
Ty Sayers
2ffe2badf2 Reimplement clan energy-draining over time. Add combat-logging NPC for players that prematurely log off. Fix bug regarding /logout command for safe-logging. Reduce Shop territory side by 1 chunk radius. Add organic farming shop for purchasing/selling farm produce. Add travel hub for transporting between different spawn and shop locations. Add missing BowAttributes implementations for custom bows, and re-add in probability for dropping bows on custom gear drops. Fix bug related to custom-bow items not properly formatting item descriptions and display name. Update Redis default host IP. Fix bug where ranged attacks triggered melee-based custom gear attributes. Add clan management command for managing/deleting clans during testing phase of alpha/beta Clans. 2015-06-22 16:20:20 -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