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

1905 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan Williams
8aec9e345e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-16 01:37:17 -05:00
Jonathan Williams
df97873d32 Fixed index issue with lobby balancer 
Added performance output for server monitor.

Removed logging of debug stuff.
 2014-08-16 01:37:06 -05:00
Chiss
d8123795aa changed the way disguises show rank. 2014-08-16 16:33:18 +10:00
Jonathan Williams
686203ed8a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-16 00:39:36 -05:00
Chiss
a888d4f14b Fixed leaks 2014-08-16 15:39:02 +10:00
Jonathan Williams
249a56360e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-15 23:19:13 -05:00
Chiss
508ef65fcf Added missing file 2014-08-16 14:17:15 +10:00
Jonathan Williams
f98dc0c66d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-15 23:03:34 -05:00
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
3c4c537998 Fix issue where broken Jedis instances were returned as functional instances. 2014-08-15 14:49:01 -04:00
Jonathan Williams
3f827a310a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-15 11:54:19 -05:00
Jonathan Williams
efdaa21ae7 Proper cleanup on lobby menu update. 2014-08-15 11:52:57 -05: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
Chiss
29db90837d Spleef Update 
Map parser block stuff
 2014-08-15 15:28:50 +10:00
Chiss
697897b967 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-15 09:49:12 +10:00
Chiss
85522cddca Debug (will clean once fixed) 
Game stats
 2014-08-15 09:49:00 +10: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
cacf736f4f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-14 04:10:21 -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
Chiss
282219fb4c Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-14 17:31:27 +10:00
Chiss
74435bac12 fixed bug where players kept inventory open, to be able to enable morphs ingame. 2014-08-14 17:31:14 +10:00
Jonathan Williams
f524ffb093 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-13 21:53:15 -05:00
Jonathan Williams
d1e69a34f1 Fix chiss path errorrrrrrrrrrrrrrrrrrrrs. 2014-08-13 21:53:03 -05:00
Chiss
c72f4b6057 Dragon target cancel fix 2014-08-14 12:35:49 +10:00
Chiss
5f80d9c57a Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
 2014-08-14 11:24:51 +10:00
Chiss
b6ba142c5a Mineplex in scoreboard is fancier. 2014-08-14 11:23:48 +10:00
Shaun Bennett
b9534bd245 Merge remote-tracking branch 'origin/master' 2014-08-13 20:07:01 -05:00
Shaun Bennett
cfe45139b6 Adjust lobby text for the removal of premium kits 2014-08-13 19:56:47 -05:00
Shaun Bennett
83f04273fa Sort kits properly when a game uses NullKit 2014-08-13 19:45:38 -05:00
Chiss
b21ae8ef72 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-14 10:32:52 +10:00
Chiss
7a3bba45a7 Mergey! 2014-08-14 10:32:41 +10:00
Jonathan Williams
27032ac2ed Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java
	Plugins/Mineplex.Core/src/mineplex/core/portal/PortalRepository.java
 2014-08-13 18:59:59 -05:00
Jonathan Williams
6039168601 Updated code base to build #1604 spigot 2014-08-13 18:57:37 -05:00
Ty
5c5a57b048 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-13 16:37:20 -04: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
Jonathan Williams
93811b200d Small adjustment to lobby balancer code. 2014-08-12 17:01:54 -05:00
Jonathan Williams
5363f686e5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-12 13:00:24 -05:00
Jonathan Williams
5618a3edad Removed extra free version generator in server monitor. 2014-08-12 13:00:17 -05:00
Ty
1bbb42214d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-12 11:14:53 -04:00
Ty
5b059e96ca Commit missing PortalRepository.java file and finish clean() method. 2014-08-12 11:14:31 -04:00
Chiss
95394c51cc Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-12 11:24:12 +10:00
Chiss
2d67d4ce36 Achievement fix + active 2014-08-12 11:23:53 +10:00
Ty
36d6a58e0a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/GroupStatusData.java
	Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java
 2014-08-11 15:39:56 -04:00
Shaun Bennett
d63137ead2 Merge remote-tracking branch 'origin/master' 2014-08-11 12:44:28 -05:00
Shaun Bennett
4006c454c3 Change order of events when enabling a gadget (Fixes bug where switching gadgets while a gadget is enabled doesn't show up on gadget page) 2014-08-11 12:39:26 -05:00
Shaun Bennett
482b964580 Display particles when shouldDisplay() is true instead of false 2014-08-11 12:30:03 -05:00
Shaun Bennett
7e93ed657f Display boss bar properly while a dragon mount is spawned in arcade 2014-08-11 12:26:56 -05:00