Commit Graph

2662 Commits

Author SHA1 Message Date
Cheese 3ceb0ff678 Converted spec away from CREATIVE 2015-03-12 15:31:40 +11:00
Cheese bf901b2280 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-12 12:15:48 +11:00
Cheese 8e77d1fc21 more event server updates 2015-03-12 12:14:49 +11:00
libraryaddict 9cf0e4d1e8 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-03-11 13:17:16 +13:00
libraryaddict f47447134e Cleanup hologram class, remove witherskull option for 1.8 and fix duplicate nametags and non-invisibility on armorstands 2015-03-11 13:16:00 +13:00
Tim Ziankoski 759db08679 Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex"
This reverts commit 2e06a272b4, reversing
changes made to e443b41e15.
2015-03-09 17:24:01 -04:00
Tim Ziankoski 2e06a272b4 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-09 16:43:00 -04:00
Cheese e443b41e15 removed unfinished code 2015-03-09 22:16:08 +11:00
Cheese 16a8fbe088 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-09 22:15:38 +11:00
Cheese 3a0e597276 more event server stuff 2015-03-09 22:15:24 +11:00
Ty Sayers 7dbf970df7 Add support for multiple slave connections for load balancing. 2015-03-08 19:17:28 -04:00
Ty Sayers 2b74e774f1 Redirect ServerCommand PubSub connections to standalone redis instance to distribute load. 2015-03-08 16:46:35 -04:00
libraryaddict dbeea5bf69 Pre-Frost changes 2015-03-09 05:17:04 +13:00
Ty Sayers 60e41c08b4 Merge pull request #13 in MIN/mineplex from redis_replication to master
* commit '4237cd082c9871432d4beee325b102068e632f13':
  Add support for master-slave replication in redis to balance load of read and writes. Redis based repositories now read/write to specified connection pools (master or slave).
2015-03-07 22:51:28 -06:00
Ty Sayers 4237cd082c Add support for master-slave replication in redis to balance load of read and writes. Redis based repositories now read/write to specified connection pools (master or slave). 2015-03-07 23:19:35 -05:00
Tim Ziankoski ac4b495301 Created internationalization helper class and began i18n process 2015-03-07 20:50:47 -05:00
Cheese e0ba667613 old chests drop a little more frequently 2015-03-07 11:53:18 +11:00
Cheese 480a5225f3 increased coin loot from rare chest drops 2015-03-07 11:49:01 +11:00
Cheese f2a71b2ea9 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-07 11:13:30 +11:00
Cheese 683f86bd89 event server fixes and parser gamtypes 2015-03-07 11:13:17 +11:00
Jonathan Williams 90dbd64b17 Added closes to connections in RepositoryBase that use DataSource. 2015-03-06 04:12:46 -08:00
Jonathan Williams c15c6e2dd8 Removed threading for ServerCommandManager
Removed target server check (some commands are broadcasted)

Disabled Message/Party crossserver listeners.
2015-03-06 04:12:11 -08:00
Jonathan Williams 2d7f65588c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-06 01:36:38 -08:00
Jonathan Williams 09ecb994f6 Pooled Friend/Ignore/Preferences/Poll/Elo repositories.
Removed ArcadeRepository as its unused.

Removed target server check for RedisCommand because it breaks other commands.
2015-03-06 01:36:25 -08:00
Cheese 0336df55aa Event update 2015-03-06 19:43:17 +11:00
Cheese e62d9774a9 Initial Event Game push 2015-03-06 19:11:26 +11:00
Jonathan Williams 5c738a2e3c Added two-strike system to NCP hooks. 2015-03-05 16:46:50 -08:00
Jonathan Williams 8ddce7cb32 Reduced process wait time per server kill/create
Added kill bypass for first startup (network reset)

Fixed some log messages that weren't being logged.
2015-03-02 13:42:34 -08:00
Jonathan Williams 3e27675d96 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-02 12:50:28 -08:00
Jonathan Williams 5e78b43860 Added StaffOnly code to ServerConfiguration 2015-03-02 12:33:04 -08:00
libraryaddict c09a23f2bc Save MapParser's new world spawn location to 0,0 on creation 2015-03-02 03:45:26 +13:00
libraryaddict d6c3b330b5 Fix redis working on the same thread 2015-03-02 03:44:38 +13:00
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