JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,046 Commits 1 Branch 0 Tags 481 MiB
dafd336526
Commit Graph

147 Commits

Author SHA1 Message Date
Thanos paravantis
5ac841dbf1 Merge branch 'master' into thanos-mineware 2016-01-02 16:34:30 +02:00
Shaun Bennett
16ee74885e Add maintenance line 2015-12-29 02:52:53 -06:00
Thanos paravantis
499ad655c9 Merge branch 'MortensRawBugFixes' into thanos-mineware 
Conflicts:
	Plugins/Mineplex.Core/.classpath
 2015-12-26 12:29:26 +02: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
Morten
7c52b813f9 Merge branch 'MortensRawBugFixes' of http://184.154.0.242:7990/scm/min/mineplex into MortensRawBugFixes 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeBouncingBlock.java
 2015-12-19 23:32:21 +01: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
Morten
5ca997f2a8 Merge branch 'BotspamImprovement' of http://184.154.0.242:7990/scm/min/mineplex into MortensRawBugFixes 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/PerkCowAngryHerd.java
 2015-12-12 00:11:27 +01:00
Morten
cecc7d8141 Updated to JAVA 8... Weird bugs happened :( 2015-12-12 00:06:28 +01: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
Jeremiah Bishop
03c45116ef Various fixes, and added the new data to Zoologist kit 2015-06-21 23:38:25 -04:00
Jonathan Williams
f92e864c30 Updated motd. 2015-06-20 03:37:22 -05:00
Jonathan Williams
88328148d1 Modified hardcoded IPs for Bungee player counts. 
Added Jr Dev rank.
 2015-06-15 12:52:59 -05:00
Jonathan Williams
96b1df4ee0 Fixed global player count. 
Fixed tasks.
 2015-05-22 14:33:25 -07:00
Jonathan Williams
f2c8086421 Updated default motd on bungees. 2015-05-06 22:41:36 -07:00
Jonathan Williams
677c8d1198 Updated default MOTD. 2015-05-04 00:42:59 -05:00
Jonathan Williams
84a5e5e521 Added motd. 2015-05-01 02:29:34 -05:00
Shaun Bennett
3dddd7112c Update MOTD to not use animation anymore (Bug fixed in 1.8.4!) 2015-04-20 17:16:57 -04:00
Jonathan Williams
c454973398 Changed login deets for new new db cluster. 2015-04-14 01:59:29 -05:00
Jonathan Williams
eea4b98069 Removed unused AccountManager.java 2015-04-14 01:59:09 -05:00
Jonathan Williams
679d5faa9b Motd pull on start. 2015-04-06 04:14:04 -07:00