Commit Graph

2830 Commits

Author SHA1 Message Date
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
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