Commit Graph

2555 Commits

Author SHA1 Message Date
libraryaddict 94607585a3 Fixed UtilTime being bugged 2015-01-21 19:00:39 +13:00
libraryaddict eb7e68885b Hunger now takes longer to decrease 2015-01-21 19:00:26 +13:00
libraryaddict dd2418232c Wizards progress 2015-01-21 19:00:07 +13:00
Jonathan Williams d5ddb9c640 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-01-19 00:50:13 -08:00
Jonathan Williams d90a46252e Allow commands to pass when muted. 2015-01-19 00:50:05 -08:00
libraryaddict 52d83587cd Fix dragon bossbar not being halved 2015-01-18 21:23:50 +13:00
libraryaddict e11e2090ad Fix up spells somewhat 2015-01-18 21:23:50 +13:00
libraryaddict 9b574de541 Current wizards 2015-01-18 21:23:49 +13:00
libraryaddict 1ea19ee2e7 Add spell HealingRune, deny weapon crafting, use scoreboard for a simply display 2015-01-18 21:23:49 +13:00
libraryaddict ea452d8fa5 Wizards progress 2015-01-18 21:23:48 +13:00
libraryaddict 72e61a02df Changes to wizards 2015-01-18 21:23:48 +13:00
libraryaddict 9b4f1a491e Add new method to Hologram - Remove hologram on entity death 2015-01-18 21:23:47 +13:00
libraryaddict 611d184024 Cleanup code, add custom explosion, add lance and traprune spell 2015-01-18 21:23:47 +13:00
libraryaddict a42cfed226 Add a comment on what each of the block hashsets do in UtilBlock to make it easier to use without struggling to remember 2015-01-18 21:23:46 +13:00
libraryaddict 0ad4034f96 The beginnings of a api to calculate shapes; mainly for particle use 2015-01-18 21:23:46 +13:00
libraryaddict d6b5439eb5 Initilize the static byte HashSet's in UtilBlock not when you try to compare a block, but on class load 2015-01-18 21:23:45 +13:00
libraryaddict b40393af10 Modify UtilPlayer to get the entity someone is looking at 2015-01-18 21:23:45 +13:00
libraryaddict d6d01241cb Progress on wizards 2015-01-18 21:23:44 +13:00
libraryaddict d232bab051 Wizards Game Progress. Now workable 2015-01-18 21:23:43 +13:00
libraryaddict 0648276720 Current progress on wizards 2015-01-18 21:23:03 +13:00
libraryaddict 34ce818614 Stupid else ifs 2015-01-18 21:23:03 +13:00
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