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

2434 Commits

Author SHA1 Message Date
libraryaddict a64e082f2c Only add a 's' to UtilTime's convertString if the number in the string is not a 1 2015-01-18 21:23:03 +13:00
libraryaddict 5a5946c0d0 Current progress on wizards - Working on scoreboards in a new branch 2015-01-18 21:23:02 +13:00
libraryaddict a3e0a6b4fd Wizards Commit 2015-01-18 21:23:02 +13:00
Shaun Bennett c8be08e5b9 Merge remote-tracking branch 'origin/master' 2015-01-16 15:30:16 -05:00
Shaun Bennett b395508f0e 54b7f21604c94e9ad2f53956 Flag for Poll DIsplay 2015-01-16 15:30:06 -05:00
Jonathan Williams 78cd5e7070 Changed hub to normal. 2015-01-15 00:39:07 -08:00
Jonathan Williams 934d1078cd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/scoreboard/GameScoreboard.java
 2015-01-13 12:24:00 -08:00
Jonathan Williams c83643564b Fixed scoreboards reading from file. 
Fixed scoreboard server name length
Changed how we pull server group on startup.
 2015-01-13 12:22:47 -08:00
libraryaddict 09cc894c77 Fix scoreboard 2015-01-13 14:03:40 +13:00
Jonathan Williams b32259d7f1 Fixed length checking with team prefix in GameScoreboard 2015-01-12 12:58:40 -08:00
Jonathan Williams d9360f2599 Ok testing fail. Reverted ServerConfiguration change. 2015-01-12 12:48:57 -08:00
Jonathan Williams cd5574ab43 Changed ServerConfiguration to only pull its groupName specifically. 
Changed StatsManager to only run once every second and to upload all stats.
 2015-01-12 12:19:13 -08:00
Jonathan Williams 9839edeeee Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-01-12 09:55:44 -08:00
Jonathan Williams e14dfcf313 Fixed Lobby sending with Portal. 2015-01-12 09:55:32 -08:00
libraryaddict b2fde6c6ca Do a for(15) loop instead of while true. Don't update scoreboard if its unchanging 2015-01-12 12:22:01 +13:00
libraryaddict 1006d66e0a Format Scoreboard, fix displaying more than 15 lines 2015-01-12 12:09:45 +13:00
Jonathan Williams ac709d09ce Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-01-11 00:42:55 -08:00
Jonathan Williams 8e04a2a5f2 Portal now checks server status and player's rank before sending them to a server to prevent login spam. 
Refactored portal method names.
 2015-01-11 00:42:31 -08:00
Jonathan Williams 47fc6e3b94 Revert "Added pool based repository and converted everything but account and donation repositories to it." 
This reverts commit 8de8d31eec.
 2015-01-11 00:41:40 -08:00
Jonathan Williams 0a99a9aa40 Debug flag now depends on file. 2015-01-10 13:19:33 -08:00
libraryaddict fa59ed52b9 Fixed arrow count not updating on shoot cancel 
Spectators are now permitted to walk on enemy turf
 2015-01-11 09:49:46 +13:00
Jonathan Williams 0d27649e85 Fixed minor bug in ServerMonitor. 2015-01-10 11:53:51 -08:00
Jonathan Williams 8de8d31eec Added pool based repository and converted everything but account and donation repositories to it. 2015-01-10 11:53:25 -08:00
libraryaddict 6343a00b53 Instead of removing the shot arrow, cancel the event instead. Fixes kit Shredder being usable during buildtime 2015-01-10 09:08:35 +13:00
libraryaddict 9863b701d8 Fixed typos in descriptions of SSM kits Wolf and WitherSkele 2015-01-10 08:54:00 +13:00
Chiss 7db748bbe1 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-01-08 13:08:57 +11:00
Chiss 9daee9733f Fixed UHC height limit 
fixed UHC rejoin health bug
 2015-01-08 13:08:15 +11:00
Jonathan Williams 836547f4f6 Added a delay to killing 'dead' servers and a verification run after the initial test before killing. 2015-01-06 10:39:18 -06: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
Chiss 8ce097d837 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-01-04 13:21:35 +11:00
Jonathan Williams a472404316 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-01-03 18:04:08 -06:00
Shaun Bennett 7de1c05d1c Clans run configuration, build configurations, and minor fixes on hub and arcade build configs. (IntelliJ IDEA) 2015-01-03 15:35:47 -05:00
Jonathan Williams 86993ddd55 Fixes again for number player names. 2015-01-03 04:27:28 -06:00
Jonathan Williams cc06b0ad33 Refactored statmanager to only upload stats on disconnect and only one player per tick. 
Fixed derp json crap with redis treating a name with only numbers as a number and adding .0 on it.
 2015-01-03 01:58:04 -06:00
Jonathan Williams 2a29def670 Bungee rotator only waits 5 minutes before determining a bungee is offline. 2015-01-03 01:53:38 -06:00
Jonathan Williams aca7fd6849 Removed all create calls 2014-12-31 09:38:41 -05:00
Jonathan Williams 4b937dfade Refactored inventory repository to use 1 second queue 
Added 15 second timeout for server connection if db freezes.
 2014-12-31 09:38:28 -05:00
Chiss 5f36c8e424 minor scoreboard changes 
legend loot bonus
 2014-12-30 08:50:37 +11:00
Jonathan Williams f0e3520343 Prevent inferior ranks to override actual ranks unless its Rank.ALL via Enjin 2014-12-29 08:02:14 -05:00
Jonathan Williams 01bc2ed2ba Uno mas warning cleanup. 2014-12-29 07:11:21 -05:00
Jonathan Williams 8b5d6ecb6c Cleanup of warnings. 2014-12-29 07:10:41 -05:00
Jonathan Williams 419f33fcc3 Refactored AntiHack a bit to try and remove CCM 2014-12-29 07:07:05 -05:00
Jonathan Williams 97f57b655b Prevent horses from spawning in Clans 
Added Building supplies shop and pvp shop to clans.
 2014-12-29 06:44:00 -05:00
Jonathan Williams a7f77c09fe Work towards another memory fix. 2014-12-29 06:42:43 -05:00
Jonathan Williams 5a57c5f372 Added Gold saving/retrieval from mysql. 
Converted DonationManager to MiniDbClientPlugin.
Fixed bug in DonationRepository with gold.
 2014-12-29 06:42:20 -05:00
Jonathan Williams 2480361421 LightningOrb now strikes all living entities instead of just players. 2014-12-27 03:25:54 -05:00
Jonathan Williams d83a63ef57 Changed FriendManager to start supporting expiry friend requests. 2014-12-26 07:36:07 -05:00
Jonathan Williams 8702bafbd0 Changed storage to player names instead of Player object for CustomTagFix 2014-12-26 00:29:57 -05:00
Jonathan Williams 81e423fa4f Fixed Server transfer stuff. Portal send works! 2014-12-24 14:35:34 -05:00
Jonathan Williams eb5a7b4276 Added Legend package for support. 
Refactored Key/Chest commands and added FrostLord package.

Removed password, added whitelist.
 2014-12-24 03:41:17 -05:00