Commit Graph

2555 Commits

Author SHA1 Message Date
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 0e59d9b21e Merge pull request #8 from feature/clans-energy to master
* commit '882eb464798f07fcd6cd929342ecdc85d2244378':
  Unclaiming land when you run out of energy
  Fix ugly /gold command
  Clan Energy
2015-01-22 20:33:41 -06: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