Commit Graph

4099 Commits

Author SHA1 Message Date
AlexTheCoder f05cdd4915 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-09-04 02:57:47 -04:00
Jonathan Williams 921292a5c6 Added timings capture and server log copy on server kill inside server monitor. 2015-09-03 09:38:26 -07:00
Jonathan Williams 890c9d59e1 Fixed loading window bug.
Added default rank for CoreClient in case of bugged login.
2015-09-03 09:38:02 -07:00
AlexTheCoder 9dc90b0e13 Added CTF to Champions stat group 2015-09-01 01:26:35 -04:00
AlexTheCoder bff9c99e2c Added system to mount flags on carrier's head for easier identification and disabling of abilities as per Chiss' request 2015-08-31 21:48:25 -04:00
AlexTheCoder e93db405d0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-08-31 04:48:43 -04:00
AlexTheCoder 129464a845 Added CTF to MPS menus 2015-08-31 04:42:36 -04:00
AlexTheCoder 788ec97d38 Added CTF wins to achievements for champions 2015-08-31 04:39:07 -04:00
Jonathan Williams c61f9ce3c8 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-31 00:53:23 -07:00
Jonathan Williams 740899c09e Added dummy CoreClient in the rare event a player joins and gets disconnected during the join event????Weird
Fixes Lobby crashes.
2015-08-31 00:53:07 -07:00
AlexTheCoder cbf8b575c6 Changed data for certain types of spawning 2015-08-31 03:28:22 -04:00
AlexTheCoder 39a79eb818 Fixed a nullpointer 2015-08-31 03:05:43 -04:00
AlexTheCoder 474f1bd0b8 Made CTF follow Chiss' specifications and also added more advanced features 2015-08-31 03:04:18 -04:00
Mini-Chiss d79794c6d3 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-30 15:47:57 -07:00
Mini-Chiss bb66d47e8e meow 2015-08-30 15:47:49 -07:00
AlexTheCoder 6fefcbd953 Kit Changes/Fixes:
- Fixed Kit Mobs not opening guis in Champions games
- Fixed Abilities not working in CTF
- Added new event when a player attempts to choose a kit
- Cancelled changing kit while holding a flag
2015-08-30 17:13:08 -04:00
Ty Sayers b0efe35531 Add restriction to ServerCommand that prevents players from directly connection to a Clans-X server, and instead insists that they join through a Clans hub. 2015-08-30 13:14:01 -07:00
Mini-Chiss 519e668d62 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-30 11:01:23 -07:00
AlexTheCoder 149d37caad Forgot to commit with actual game 2015-08-30 04:01:01 -04:00
AlexTheCoder eca69a8ae2 Made new branch up to date and including previous branch's code 2015-08-30 03:58:58 -04:00
Jonathan Williams 47331658ac Merge remote-tracking branch 'remotes/origin/Myst_EVO' 2015-08-30 00:14:53 -07:00
Jonathan Williams b59511ece4 Added duplicate login kick for network. 2015-08-30 00:12:54 -07:00
Mini-Chiss e8b3085ec5 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-29 23:55:18 -07:00
Mini-Chiss d944d2e5c4 Merge branch 'Myst_EVO' 2015-08-29 23:54:28 -07:00
Jonathan Williams c2c23c22e5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-29 14:55:04 -07:00
Jonathan Williams 4e32bad8dd Fixed bug with stats pulling as int.
Fixed bug with Poll recording selections wrong.
2015-08-29 14:54:57 -07:00
Ty Sayers 088068be80 Add 'Clans' to the ignored server groups for ServerMonitor to prevent interference with live Clans servers. 2015-08-29 14:51:17 -07:00
Mysticate 046fa4f8b6 Fixed possible NPE 2015-08-29 14:30:22 -06:00
Mysticate 736d88c82f All achievements fixed. ^_^ 2015-08-29 14:13:15 -06:00
Mysticate 97c7980bbc Fixed evolving into walls. 2015-08-29 10:54:04 -06:00
Mysticate 55a7ea0439 Fixed kit bug. 2015-08-29 10:44:11 -06:00
Mini-Chiss 9ebabed1a8 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-29 00:14:26 -07:00
Mini-Chiss 6a28845cb0 Merge branch 'Myst_EVO' 2015-08-29 00:14:15 -07:00
Mysticate 12d9888a1f Fixed wins.. 2015-08-29 00:58:53 -06:00
Jonathan Williams f8729cbd66 Fixed Gadget. 2015-08-28 23:47:27 -07:00
Mini-Chiss d35b5940fc fixed achievements 2015-08-28 23:30:21 -07:00
Mini-Chiss 5ae01f95a8 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-28 23:27:35 -07:00
Mini-Chiss 181afaa2d6 Merge branch 'Myst_EVO' 2015-08-28 23:25:51 -07:00
Mysticate b71bcfab4b Fixed achievements. Merge ASAP 2015-08-29 00:19:39 -06:00
Jonathan Williams d4d0c4bed6 Updated Motd. 2015-08-28 23:17:14 -07:00
Jonathan Williams c98a85c2ba Added local storage of login time.
Hooked in onlineTime bonus feature to real values.
2015-08-28 22:09:42 -07:00
Jonathan Williams ba4da32939 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-28 21:44:07 -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
Mini-Chiss 829c1d2ae8 Merge branch 'Myst_EVO' 2015-08-28 21:30:10 -07:00
Mysticate c40fecb03f Removed warning from private servers 2015-08-28 22:06:13 -06:00
Mini-Chiss 041c5ab53c Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-28 21:00:34 -07:00
Mini-Chiss 3f1c4d24b9 Merge branch 'Myst_EVO' 2015-08-28 21:00:00 -07:00
Jonathan Williams ad4ba010b7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-28 20:59:08 -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
Mysticate bb09720450 removed previous commit jesus 2015-08-28 21:56:35 -06:00