Commit Graph

2830 Commits

Author SHA1 Message Date
Jonathan Williams 789e750cbf Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-01 01:09:28 -08:00
Jonathan Williams 5816da496d Adopted StaffServer project to refactors.
Added default rank package for staff server.
2015-03-01 01:09:22 -08:00
libraryaddict 1fbadfa4f4 Don't compare player world to a plugin fetched world, instead compare the name. 2015-03-01 18:18:53 +13:00
libraryaddict 26e6b66cf5 Fix staff server capitalization changes 2015-03-01 17:41:17 +13:00
libraryaddict 3f7eceb907 Disable redis being sent for player messaging and parties. 2015-03-01 17:40:52 +13:00
libraryaddict 3b4075392a Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-03-01 15:16:15 +13:00
Jonathan Williams e5189bea40 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-28 10:26:25 -08:00
Shaun Bennett 81a7e1f1f2 Better hover effect for treasure chests - also fixes hover only showing for old chests 2015-02-28 00:37:22 -05:00
Shaun Bennett 42600a0c70 Call direct methods in friends gui instead of running commands (prevents getting command spam errors when trying to mass add/delete friends) 2015-02-27 23:36:36 -05:00
Shaun Bennett d6e957552e Merge branch 'DEVP-66' 2015-02-27 23:24:15 -05:00
Shaun Bennett c916957a07 Fix block morph with treasure chests 2015-02-27 23:22:45 -05:00
Shaun Bennett 78e1b8bbbe Merge pull request #12 in MIN/mineplex from DEVP-66 to master
* commit '90ebbd9962f23033b9a7b253955540b992c4c68c':
  More refactors
  DEVP-66 Refactor commonly used classes to Java conventions
2015-02-27 21:56:49 -06:00
Shaun Bennett 90ebbd9962 More refactors 2015-02-27 22:53:55 -05:00
libraryaddict d23d146f35 Fix up admin message typos 2015-02-27 21:12:31 +13:00
libraryaddict 9802c00ec5 Add /spawn and /setspawn commands to MapParser 2015-02-26 21:40:09 +13:00
Shaun Bennett efce714375 DEVP-66 Refactor commonly used classes to Java conventions
Refactoring + testing jira
2015-02-26 00:07:07 -05:00
libraryaddict d9184ad423 Disable /a for muted players 2015-02-25 23:20:40 +13:00
Shaun Bennett 145bf98590 Add JIRA configuration for IntellIJ IDEA 2015-02-24 21:18:08 -05:00
Shaun Bennett cf7e2eed69 Merge with MPS Update 2015-02-24 21:11:16 -05:00
Shaun Bennett 85ee98782e Revert "Move clans database calls to a seperate thread"
This reverts commit 61b1e3f48b.
2015-02-24 21:04:57 -05:00
Shaun Bennett ad5481ef9c Revert "Remove arcade repository stuff"
This reverts commit a5f7050e40.
2015-02-24 21:04:19 -05:00
Shaun Bennett 45fd3cc537 Revert "Update JOOQ files, update IntelliJ config file for JIRA"
This reverts commit db3f2989c0.
2015-02-24 21:03:59 -05:00
libraryaddict bfb0c157a2 Update jooq libraries in common.xml and EnjinTranslator.xml and eclispe classpaths 2015-02-25 13:56:32 +13:00
Shaun Bennett cea172a713 Give more cpu to SnrMod+/Youtube private servers 2015-02-24 17:39:02 -05:00
Shaun Bennett be591c7d09 Disallow start/stop/kick/setgame while a game is in progress for Donor ranks 2015-02-24 17:22:47 -05:00
Shaun Bennett 857052992d Increase max player cap to 100 for SnrMod+/Youtube 2015-02-24 14:47:10 -05:00
Shaun Bennett 570374fbb4 Add Wither Assault and Wizards gametypes to legend+ private servers 2015-02-24 14:45:31 -05:00
Shaun Bennett 47ef3617f4 Give SnrMod+/Youtube servers 2GB of ram instead of 1GB 2015-02-24 14:43:38 -05:00
Shaun Bennett 48dd5639d2 Kick banned players from games 2015-02-24 14:38:12 -05:00
CoderTim 0bf6866ad7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-23 20:56:34 -05:00
libraryaddict fc5771b33c Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-24 13:04:06 +13:00
libraryaddict 56e03221ad Improve party system 2015-02-24 13:03:51 +13:00
Jonathan Williams e1818a9c32 Fixed stat overrite bug. 2015-02-23 00:45:45 -08:00
Jonathan Williams 0a2e11e8bc Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-20 23:56:24 -08:00
Jonathan Williams 87558eb01a Merge pull request #10 in MIN/mineplex from leaderboards_dev to master
* commit 'e1f7e2dbcc91bb79d393b09ea5b250fe895cfe11':
  Remove old lines of debug code.
  Add in hooks to update statistical events log for leaderboards. Modify leaderboard PHP script for new updated leaderboard table formats.
2015-02-21 01:55:59 -06:00
libraryaddict 53bb67ec4f Magic missile nerfed to no cooldown decrease, nerfed rumble dmg, nerfed lance multihits 2015-02-21 20:41:07 +13:00
Jonathan Williams c02adc0232 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-20 23:29:44 -08:00
Jonathan Williams e6eb938b96 Delayed whitelist additions. 2015-02-20 23:29:19 -08:00
Ty Sayers e1f7e2dbcc Remove old lines of debug code. 2015-02-19 18:55:21 -05:00
Ty Sayers def101cc8d Add in hooks to update statistical events log for leaderboards.
Modify leaderboard PHP script for new updated leaderboard table formats.
2015-02-19 18:53:46 -05:00
CoderTim 6a368454ec Clans database refactoring 2015-02-18 21:31:38 -05:00
CoderTim aebe390c3c Refactored ClanRole enum 2015-02-18 19:56:29 -05:00
CoderTim 44f453c56e Updated jOOQ and database tables 2015-02-18 18:51:36 -05:00
libraryaddict 0aee8042b5 Changed /locate to return the located players name, not fed target 2015-02-18 09:27:58 +13:00
libraryaddict d29b43d645 Parties now persist cross-server, staff messages now display on the sending server for other staff for staff cross-messages. 2015-02-17 15:17:14 +13:00
libraryaddict 3b0a131ca2 If private messaging is turned off, deny messages, even from friends. 2015-02-15 22:10:15 +13:00
libraryaddict 3ef3689e6d Fixed RedisMessageCallback not being registered 2015-02-15 22:01:10 +13:00
Jonathan Williams fd0547d9d3 Added connection re-establishment to database calls if error occurs. 2015-02-14 22:50:52 -08:00
Jonathan Williams c129deb201 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-14 22:05:24 -08:00
Mini-Chiss cdbf6c450e fixed mis-named gameloot chests 2015-02-15 17:35:58 +13:00