Commit Graph

2482 Commits

Author SHA1 Message Date
libraryaddict a1529e0884 Notify player when no friends found when searching 2015-01-30 19:28:04 +13:00
Jonathan Williams 352a29390b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-01-29 22:19:12 -08:00
Jonathan Williams ed08e4b112 Changed coloring for server line in friends gui. 2015-01-29 22:18:59 -08:00
Chiss 115f9b58ab Spider nest :) 2015-01-30 17:02:28 +11:00
Shaun Bennett 9b5b1f635f Merge remote-tracking branch 'origin/master' 2015-01-30 00:37:16 -05:00
Shaun Bennett 96ce95b72e treasure changes 2015-01-30 00:37:02 -05:00
Chiss 5b112caa4a Bone Storm buff 2015-01-30 16:10:03 +11:00
Chiss c066cb5185 Fixed Bugs 2015-01-30 16:08:22 +11:00
Chiss 3fdf914d63 Smash Wolf Update! 2015-01-30 15:18:50 +11:00
Chiss 76b76cd38c Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-01-30 14:42:51 +11:00
Chiss c8afa151d9 SSM Zombie + Spider Update 2015-01-30 14:42:39 +11:00
Shaun Bennett 79a60db15d More tweaks 2015-01-29 22:41:54 -05:00
Shaun Bennett 1cc0879ce9 treasure stuff 2015-01-29 22:17:46 -05:00
Jonathan Williams 81a52184c9 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-01-29 17:50:24 -08:00
Jonathan Williams b14d09ed2c Reduced connection checking to every 2 minutes.
Removed kill script call as it was encountering access errors..
2015-01-29 17:47:59 -08:00
libraryaddict 505dcc1e8e Add friends gui, deprecate the old chatbased friends display 2015-01-30 13:46:07 +13:00
Chiss e18107a82f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-01-30 11:08:37 +11:00
Chiss 6a269cc03b More SSM Changes 2015-01-30 11:08:23 +11:00
Shaun Bennett 50a8fb03a9 Work on treasure............ 2015-01-29 18:37:29 -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
libraryaddict ebc74e5565 Fireball still too fast 2015-01-29 15:01:00 +13:00
Chiss 7f4bcd1210 Smash Update
new scoreboard (not implemented yet)
reward changes
2015-01-29 11:54:59 +11:00
libraryaddict 2dfdde4457 Kit mage will now start with two spells 2015-01-28 03:01:44 +13:00
libraryaddict 1da873ab8f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-01-27 21:09:31 +13:00
libraryaddict 94f79990e4 Kit changes to wizards 2015-01-27 21:09:15 +13:00
Chiss 290e4d69df map parser update 2015-01-27 13:59:28 +11:00
Chiss 19208de075 mroe map parser ^_^ 2015-01-26 11:53:48 +11:00
Chiss 90573903da added new gametypes for parser 2015-01-26 11:33:47 +11:00
Chiss b98950b121 map parser visual changes 2015-01-26 11:31:42 +11:00
Chiss f80e640d34 Map Parser voxel update
Disabled spec GUI in bridges
other minor changes
2015-01-26 11:23:08 +11:00
Chiss 10ab390bd7 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-01-26 11:20:12 +11:00
Chiss 40ef3317dd committing necessary files to merge 2015-01-26 11:20:02 +11:00
libraryaddict 76e6b7530f Meteors now explode everything on contact. Added spellbook for spectators and pregame. Mana cost now obvious when cooling down. Lowered some random item amounts 2015-01-26 09:09:46 +13:00
libraryaddict b4b8b307b0 Rename Wizard Battles to Wizards 2015-01-25 18:50:45 +13:00
libraryaddict c19f10aff9 Reduce kit mystic mana regen to 10% 2015-01-25 18:33:22 +13:00
libraryaddict 8262eb9f48 Rebalance explosive rune, fix rank bug and books no longer drop 2015-01-25 18:27:21 +13:00
libraryaddict 7682907478 Wizards modifications - Its amazing how things slip past you 2015-01-25 06:18:07 +13:00
libraryaddict 38aac5bab0 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-01-24 23:14:54 +13:00
libraryaddict 3525243f9d Numerous fixes to Wizards 2015-01-24 23:14:23 +13:00
Jonathan Williams 58a8a32e93 Added cross-server Announcements and Global messages. 2015-01-24 01:44:22 -08:00
Jonathan Williams d6e8fdd2ed Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-01-23 23:33:39 -08:00
Jonathan Williams 39d1a48bc1 Added cross-server instant punishments.
[Punish] Banning doesn't kick.
2015-01-23 23:33:24 -08:00
libraryaddict 3ff0592d2d Mild fix on fireball, fix heal given less cooldown and lower heal spell heals 2015-01-24 13:51:18 +13:00
libraryaddict 31c1be9dd8 Nerf the spell heal 2015-01-23 23:25:03 +13:00
libraryaddict 99c9bfbf33 Left clicking a chest is harmless 2015-01-23 23:18:29 +13:00
libraryaddict da81d131a7 Don't open wizard spell menu if they right clicked a chest 2015-01-23 23:17:45 +13:00
libraryaddict b00deb683e Red overtime 2015-01-23 22:28:07 +13:00
Jonathan Williams 5b39f1642d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-01-23 01:17:38 -08:00
Jonathan Williams 34cd48cfb6 Fix for duplicate check. 2015-01-23 01:17:27 -08:00
libraryaddict def2018c8b Remove center blocks of stone wall wizard spell 2015-01-23 22:15:27 +13:00
libraryaddict 92ef0af39d Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
2015-01-23 22:01:51 +13:00
Jonathan Williams b92226a771 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-01-23 00:55:36 -08:00
libraryaddict c5b444ae6e Wizards push 2015-01-23 21:52:03 +13:00
Jonathan Williams 73866669b8 Added RestartCommand and SuicideCommand
ServerMonitor will now cleanup bloated Lobbies starting from the highest number lobby.

Fixed issue with new servers getting cleaned up as excess as soon as they started.
2015-01-22 23:19:40 -08:00
Jonathan Williams 08078c1622 Removed Logger 2015-01-22 23:18:38 -08:00
Shaun Bennett 8bf64ec55c Database and code implementation of enemies 2015-01-22 22:17:19 -05:00
Shaun Bennett 882eb46479 Unclaiming land when you run out of energy 2015-01-22 21:32:10 -05:00
Shaun Bennett 2bab4133b0 Fix ugly /gold command 2015-01-22 20:41:05 -05:00
Shaun Bennett a1f2a3a2a1 Clan Energy 2015-01-22 20:34:44 -05:00
libraryaddict 0b8babb36d Spectator menu shouldn't be opened when standing on pressure plates should it.. 2015-01-23 02:31:38 +13:00
libraryaddict fa47f33407 *cough* fixes to UtilTime *cough* 2015-01-23 02:31:00 +13:00
libraryaddict 74d7c7df2b More wizard modifications 2015-01-23 02:30:44 +13:00
libraryaddict 29dc598c00 Update the fireball times to 20min 2015-01-22 01:00:57 +13:00
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 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
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