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

82 Commits

Author SHA1 Message Date
Jonathan Williams
6383cf7ce6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
 2015-02-10 18:17:13 -08:00
libraryaddict
77350e51de Using the wrong servername in PlayerTracker 2015-02-11 00:58:21 +13:00
libraryaddict
ea30645d42 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-04 18:37:32 +13:00
libraryaddict
55b9435877 Change event used to track player's in bungee 2015-02-04 18:36:44 +13:00
Shaun Bennett
b0a2e655c1 Changes to IntellIJ Files 2015-02-03 14:12:52 -05:00
Jonathan Williams
908533b232 Added some exception protection in Redis retrieve dedicated servers. 
Removed Statifier project.

Improved ServerMonitor:
- Added recording of dedicated server stats
- Added recording of server group stats
- Added recording of bungee stats
- Added recording of network stats
 2015-01-29 07:05:50 -08:00
Jonathan Williams
fc45b80e2b Added rank pulling on bungee login and the ability to put a cap on network player count. 
Removed log message for converted server group.
 2015-01-03 23:37:04 -06:00
Shaun Bennett
9a9936bc8c Allow animated motd to be enabled or disabled through database 2014-12-22 16:39:34 -06:00
Jonathan Williams
28dc4059a4 Don't reset Lobby index else lower lobby counts can crash due to spam connects. 2014-12-13 20:22:37 -05:00
Jonathan Williams
52fad77297 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-12-12 05:21:45 -05:00
Jonathan Williams
771c7cba0a Changed playercount back to current +1 2014-12-12 05:21:23 -05:00
Shaun Bennett
56bc8dc232 Trying to do some hacky things! 2014-12-12 04:18:47 -06:00
Shaun Bennett
b65ca5f7dd Update bungee cord, comment out debug stuff 2014-12-12 02:53:56 -06:00
Shaun Bennett
7b42bd661f Fix icon animation + some more tweaks 2014-12-12 01:13:02 -06:00
Shaun Bennett
ac02201262 Some adjustments 2014-12-12 00:48:08 -06:00
Shaun Bennett
30a7eea628 Motd stuff for xmas update 2014-12-12 00:28:29 -06:00
Shaun Bennett
93dc3c9090 pushing this for my laptop. not final code! 2014-12-11 09:17:19 -06:00
Jonathan Williams
92ea94c3be Fixed creating clan delay in clans/ClientClan.java 
Added logging for Mineplexer startup.
Fixed return generated keys in RepoBase
 2014-11-28 14:06:41 -08:00
Jonathan Williams
1372f74921 Refactored some names in MiniPlugin 
Work on clans.
 2014-11-12 19:21:12 -08:00
Jonathan Williams
7fb679e7f5 Changed lobbyBalancer to send one player to each lobby that wasn't full. 2014-11-08 14:32:24 -08:00
Jonathan Williams
f03fe663f6 Simplified Lobby balancer code to randomize server selection on best 10 servers. 
Increased rate at which bungee retrieves server information.

Increased rate at with servers sends server information.
 2014-11-07 22:04:51 -08:00
Jonathan Williams
ecad60eee3 Added PlayerTracker to Mineplexer 
Changed how max players is displayed in Mineplexer

Added a cut-off of 900 players for each bungee in BungeeRotator, minimum of two records.
 2014-11-05 14:40:40 -08:00
Jonathan Williams
1a09c14642 Reverted database connection pooling because it caused severe login delays. 2014-11-05 14:39:22 -08:00
Jonathan Williams
409e2c6141 Tweaked menus for quick game, Cosmetic menu. 
Removed debug for Hub
Output a little debug info in LobbyBalancer
Added duplicate check to ServerMonitor
updated Customer SUpport server to have changeable password, added logging of command executors, added lifetime perks for hero/ultra
 2014-08-28 14:01:37 -07: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
508ef65fcf Added missing file 2014-08-16 14:17:15 +10:00
CoderTim
19222c6815 Updated IntelliJ environment to be compatible with latest changes 2014-08-15 15:51:29 -04:00
Jonathan Williams
6039168601 Updated code base to build #1604 spigot 2014-08-13 18:57:37 -05:00
Jonathan Williams
93811b200d Small adjustment to lobby balancer code. 2014-08-12 17:01:54 -05:00
Ty
ecb0b2d3bb Fix LobbyBalancer merge issue and convert PortalRepository to a redis-based system instead of MySQL. 2014-08-08 17:35:37 -04:00
Ty
2e43d565bd Resolve merge conflicts. 2014-08-04 19:14:04 -04:00
Ty
1b7c762942 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/lobbyBalancer/LobbyBalancer.java
	Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/lobbyBalancer/LobbyBalancerRepository.java
	Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/GroupStatusData.java
	Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/Repository.java
	Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerGroupData.java
	Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java
 2014-08-04 18:47:49 -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
Jonathan Williams
9c952a7b04 Cleaned up date format creation every call in LobbyBalancer 
Reduced times to call per second.
 2014-07-29 21:10:08 -07:00
Jonathan Williams
d6e06f4556 Removed some unnecessary logic in Lobby Balancer 
REmoved unused code in mineplexer.
 2014-07-25 23:37:24 -07:00
Jonathan Williams
e6818c4c46 Added small tweaks to lobby balancer and sorter for better spread on connect. 2014-07-19 13:54:03 -07:00
Jonathan Williams
74817f5f2e Added rule book to Hub. 
Fixed mineplexer bungee internet status.

Fixed up ddosprotectionswitcher.
 2014-07-08 18:01:03 -07:00
Jonathan Williams
fb5f92df2a Finalized internet status for bungees 2014-07-08 15:04:59 -07:00
Jonathan Williams
2e5b003cff More work on internet status stuff. 
Fixed some buggies with parser.
 2014-07-08 13:18:27 -07:00
Jonathan Williams
963c71f128 Fixed internet status stuff for bungees. 
Fixed new portal arg req.
 2014-07-08 12:44:17 -07:00
Jonathan Williams
e6e86c2042 Updated DnsMadeEasy api. 
Cleaned up some bungee code.

Added InternetStatus to Bungees.

Fixed some portal stuff.
 2014-07-08 12:20:19 -07:00
Jonathan Williams
a66e877028 Cleaned up Bungee mineplexer a bit. 
Refactored send/server commands for Portal.
 2014-07-05 10:56:20 -07:00
Jonathan Williams
d5ea6c5377 Removed dead project ServerStatus 
Tweaked connection strings so they autoreconnect.

Added dragon sound to pre-queue prompt.

Added rest of missing files.
 2014-05-28 11:18:30 -07:00
Jonathan Williams
449fa13cc3 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 
Conflicts:
	.gitignore
 2014-05-27 02:23:22 -07:00
Jonathan Williams
0634ee5543 Removed unused global stuff in Mineplexer. 
Did some edits in GroupManager...need to pick that up.

Changed TimeUtil to pop last entry when stopping.
Fixed WorldUtil's dimension thing for UHC.
Fixed Exception with AntihackRepository and no static lock object on _connection

Work on Elo manager.
Work on Queue.

Added checking for player to server transfer records.

Added option for rejoin time in TeamGame (UHC...yay)
 2014-05-27 02:10:29 -07:00
CoderTim
49de140f41 Configured eclipse to use UTF-8 2014-05-25 21:04:14 -04:00
CoderTim
c45e7d2a80 Converted file encoding from ISO-8859-1 to UTF-8 2014-05-25 19:42:39 -04:00
CoderTim
aa6b5324eb Set up IntelliJ IDEA 2014-05-20 00:39:50 -04:00
Jonathan Williams
e958a922fe Fixed Hub chat so it goes through filter. 
Added back in server name so it tracks correctly.

Fixed PlayerCount in Mineplexer AGAIN.
 2014-04-29 12:53:22 -07:00
Jonathan Williams
7c9017f184 Fixed Bungee issue with ServerPing in MOTD. 
UPdated to latest spigot again.

Removed useless 1.7 stat tracking.

Fixed Party issue in hub
 2014-04-26 02:47:04 -07:00