Commit Graph

111 Commits

Author SHA1 Message Date
CoderTim ae6cb4aa22 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-15 15:56:44 -04:00
CoderTim 19222c6815 Updated IntelliJ environment to be compatible with latest changes 2014-08-15 15:51:29 -04:00
Ty 5c0e1ad484 Fix issue where null MinecraftServer entries were being returned in getServerStatuses() method in RedisServerRepository. 2014-08-15 15:32:01 -04:00
Ty 0d38ac4e96 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.ServerData/src/mineplex/serverdata/RedisServerRepository.java
2014-08-15 11:40:15 -04:00
Ty da8aa3f1e3 Fix issue where broken Jedis resources were not being properly handled. 2014-08-15 11:33:34 -04:00
Jonathan Williams 846c75453c Revamping Redis Server status so it uses a consistent time value from redis database. 2014-08-14 07:41:04 -05:00
Jonathan Williams 682735e994 Added build fixes for ServerMonitor.java
Added redis fixes for ServerMonitor
Added ServerStatusManager fixes.
2014-08-14 04:10:11 -05:00
Ty 4b4f43ac16 Convert PortalRepository's redis host fetch to ServerManager constant, and remove debug code section. 2014-08-13 16:37:05 -04:00
Ty 5b059e96ca Commit missing PortalRepository.java file and finish clean() method. 2014-08-12 11:14:31 -04:00
Ty 2e43d565bd Resolve merge conflicts. 2014-08-04 19:14:04 -04:00
Ty 6a9255e97b Add new Mineplex.ServerData library for interfacing with the ServerRepository, and modify Mineplex.ServerMonitor, Mineplex.Bungee.Mineplexer and Mineplex.Core to integrate changes. 2014-08-01 17:56:29 -04:00