Commit Graph

158 Commits

Author SHA1 Message Date
md_5
dad453bd84 Remove Sentry - Unused 2016-08-02 11:42:16 +10:00
AlexTheCoder
e396acc69c Fix clans ips being added to the bungee rotator 2016-07-26 07:15:09 -04:00
AlexTheCoder
9fab8366b7 Add support for clans hub connection inside bungees 2016-07-25 10:52:48 -04:00
Shaun Bennett
23232efd63 Merge remote-tracking branch 'remotes/origin/develop' into clans/beta
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
#	Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResourcePackManager.java
2016-04-05 13:04:39 +10:00
Shaun Bennett
8d7453b78e Merge remote-tracking branch 'origin/develop' into develop 2016-02-19 19:33:52 -06:00
Shaun Bennett
7032568a92 Add PLAYER_STATS DBPool 2016-02-19 19:33:39 -06:00
md_5
a84f8dd2d0 Fix dbcp, tone down sentry 2016-02-19 20:28:22 +11:00
md_5
d575266522 Fix sentry 2016-02-19 19:44:36 +11:00
Shaun Bennett
7714e4960c Use DBPool for everything 2016-02-19 00:17:38 -06:00
md_5
f7b8dada6d Add Sentry to BungeeCord too. 2016-02-07 21:40:51 +11:00
md_5
852f96a314 Speed up LobbyBalancer to 500ms 2016-01-31 09:45:34 +11:00
md_5
1f2fc65f99 Tone down lobby balancer too. 2016-01-30 13:55:58 +11:00
md_5
7ed0ab442f Emergency patch to slow down redis player count updates. 2016-01-30 12:36:20 +11:00
Shaun Bennett
c7bb380a56 Merge pull request #128 in MIN/mineplex from md_5/mineplexer/leak to develop
* commit '6cf08193dfbedb08352fd3a450022afac0ecd331':
  Fix small memory leak in Mineplexer.
2016-01-20 12:23:13 -06:00
md_5
bb4091c7a6 Use Maven for Compilation 2016-01-20 11:20:58 +11:00
md_5
6cf08193df Fix small memory leak in Mineplexer.
* Leak was on line 74 (toString omitted when removing from String collection).
* Impact was actually pretty much nil - collection is rebuilt every minute.
* Side effect of optimization by using UUID itself which has a good hashCode and fast equals implementation.
2016-01-16 20:36:49 +11:00
Shaun Bennett
16ee74885e Add maintenance line 2015-12-29 02:52:53 -06:00
Shaun Bennett
dd8e91e463 Update MOTD 2015-12-25 03:03:53 -06:00
Shaun Bennett
7a72762c78 Update MOTD 2015-12-21 12:56:37 -05:00
Shaun Bennett
e8b0e5dd8e Fix IntellIJ Files 2015-12-13 23:51:47 -05:00
libraryaddict
e7213fdb7e Remove project specific settings 2015-12-13 16:41:37 +13:00
Jonathan Williams
95a81ef368 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
2015-12-11 01:26:20 -05:00
Jonathan Williams
b5c157c123 Changed PlayerCache to Cache 2015-12-11 01:24:16 -05:00
Shaun Bennett
c3ace42a68 Winter MOTD, Stat fixes (maybe?!) 2015-12-07 13:21:11 -05:00
Jonathan Williams
700e4c9a1f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-19 22:12:08 -06:00
Jonathan Williams
411d6fdb22 Made PlayerTracker use existing code for determining region. 2015-11-19 22:11:45 -06:00
Shaun Bennett
e35eec4cb1 Update motdmanager and compiler.xml 2015-11-16 16:39:34 -05:00
Shaun Bennett
2bb82da735 Motd update 2015-11-14 01:45:55 -05:00
Jonathan Williams
fd3ccf7ce0 Fix Bungee lobby balancer code. 2015-11-08 17:25:54 -06:00
Jonathan Williams
9e7629b1fe Added 43k player chest benefit.
Updated MOTD.
2015-10-18 00:21:01 -05:00
Jonathan Williams
172bd65c57 Monster Maze motd. 2015-10-16 04:22:54 -05:00
Shaun Bennett
1aecc9505c Add region to titan, new MOTD 2015-10-12 01:30:31 -04:00
Jonathan Williams
0d8ef7fea3 Fixed lobby balancing technique.
Removed random UUID for bungee redis database.
Enabled bungee name in debug output for bungee rotator.
2015-09-26 18:25:29 -04:00
Jonathan Williams
b59511ece4 Added duplicate login kick for network. 2015-08-30 00:12:54 -07:00
Jonathan Williams
d4d0c4bed6 Updated Motd. 2015-08-28 23:17:14 -07:00
Jonathan Williams
e47662f855 Added LoginTime setting as RedisTime for use in calculating time on server.
Optimized redis util for time calls to calculate time different and only pull redis time once.
2015-08-28 21:44:00 -07:00
Jonathan Williams
6f0309622c Removed AccountCache.
Converted that to PlayerCache and store account id in there.
2015-08-28 20:58:58 -07:00
Jonathan Williams
61c80fd31d Fixed issue with player login sessions. 2015-08-24 20:21:14 -07:00
Jonathan Williams
b64a75cbf3 Added maintenance message. 2015-08-24 18:35:11 -07:00
Jonathan Williams
34a5d9c722 Updated MotdManager to update both repositories. 2015-08-23 15:46:23 -07:00
Shaun Bennett
05b1b91686 Carl! 2015-08-13 03:32:31 -05:00
Jonathan Williams
e5dd4d1ebf Updated MOTD 2015-08-04 13:13:31 -05:00
Jonathan Williams
d3c5d0cbe6 Only store account cache stuff for 6 hours.
Update MOtd.
2015-08-01 01:12:01 -05:00
Jonathan Williams
52dd9df834 Motd changes. 2015-07-17 11:39:01 -05:00
Jonathan Williams
a20a9ba9e7 Fixed issue and updated bungee motd manager. 2015-07-09 11:07:43 -05:00
Jonathan Williams
cf035eeb37 Fixed Bungee issues with new redis configs. 2015-07-03 02:17:27 -04:00
Jonathan Williams
c6e4c5c5e4 Fixed mineplexer server status link.
Fixed issue with ServerManager and default connection.
2015-06-30 03:49:53 -04:00
Jonathan Williams
c1ef96bdcd Fixed jre for staff server 2015-06-26 03:12:00 -05:00
Cheese
257c088948 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-26 16:08:17 +10: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