Commit Graph

1528 Commits

Author SHA1 Message Date
Cheese da9e7892f0 fixed aprilfools bugs
mamapig debug :(
2015-04-01 18:01:09 +11:00
Cheese 24ba42cb16 fixed armor stands blocking attacks in bacon brawl 2015-04-01 17:49:49 +11:00
Cheese 8bd883cb26 fixed damage transfer for mama pigglez kit 2015-04-01 17:43:46 +11:00
Cheese 59fce1cd88 adding some mmoooo text
changed pig kit for baconbrawl
2015-04-01 17:15:56 +11:00
Cheese ed35d2a992 April Fools update 2015-04-01 16:56:13 +11:00
libraryaddict b84756ef7a Revert wizard commits 2015-03-27 22:13:50 +13:00
libraryaddict a772d4cbf2 BlockHunt: Use new setInvisible method in DisguiseChicken 2015-03-27 22:05:16 +13:00
libraryaddict a27e6fba5c Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
2015-03-27 06:00:14 +13:00
Cheese 821c7f0cb6 Replaced bebe piggles kit with a new kit 2015-03-26 17:43:22 +11:00
Jonathan Williams f4061854cd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-25 15:11:17 -07:00
Jonathan Williams 6472194d44 Optimized queries to retrieve and update player information by removing inner join calls on the account.
Added account id retrieval on login.
Added account id caching in redis.
2015-03-25 15:10:59 -07:00
libraryaddict db5e6ad745 Wizards: Summoned wolves are one-hittable, and one per spell level 2015-03-25 19:25:32 +13:00
libraryaddict be5086e2a5 Wizards: Give warning before lightning spell hits 2015-03-25 19:22:08 +13:00
libraryaddict be542b9ce4 Rebalance wizard spell SpeedBoost 2015-03-25 19:21:38 +13:00
libraryaddict 853e6420dd Add instant-casting to wizards 2015-03-25 19:21:20 +13:00
Cheese 4a25265c7c Added utility methods to check for players within a sight pyramid 2015-03-25 17:13:22 +11:00
libraryaddict 4988b90d0e Prevent TNT from being moved in inventories in PerkBomberHG 2015-03-25 16:56:37 +13:00
libraryaddict 63c55a1449 SurvivalGames: Prevent wood dropping, add mushroom soup to base loot and change bowl to soup. Add throwing tnt to loot. 2015-03-25 16:56:05 +13:00
libraryaddict ad967a092a Remove TNT from SG placeable and breakable 2015-03-25 16:19:56 +13:00
Cheese 9142227dd4 updates to SG border
balanced cleave for SG and Champs
2015-03-25 14:16:09 +11:00
Cheese 5fded981d9 Timings for Visibility 2015-03-23 16:38:17 +11:00
Cheese 46dfb532fb Bridges scoreboard fix
SG balance
DONT QUIT msg improvement
2015-03-23 11:50:09 +11:00
Cheese 3f2b7444a3 made SG scoreboard display individual player names once there's less then 8 2015-03-22 10:06:11 +11:00
libraryaddict f99edecba0 Change deathmatch color to red 2015-03-22 00:05:24 +13:00
Cheese 2bbf035d4c SG borders now have audio and attack nearby players. 2015-03-21 12:22:47 +11:00
libraryaddict ee7ae77311 Use VisibilityManager instead of hidePlayer showPlayer in SG Deathmatch 2015-03-21 01:38:20 +13:00
Cheese 0a766cd7bb increased food and weapons 2015-03-20 22:23:25 +11:00
Cheese 376824edfc slowly tnt explosion by 0.5s 2015-03-20 20:46:11 +11:00
Cheese 446951d8af balance changes for SG 2015-03-20 20:43:42 +11:00
Cheese 57502c226f changed slasher to barb 2015-03-20 19:39:23 +11:00
Cheese 392a648f8e fixed cleave hurting self 2015-03-20 18:43:44 +11:00
Cheese 810517b142 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-20 18:22:10 +11:00
Cheese cdd9400ec2 added slasher kit to SG 2015-03-20 18:21:56 +11:00
libraryaddict f2ffc57ae2 Fix error, allow snowball and egg to do damage 2015-03-20 20:15:10 +13:00
libraryaddict baaebd3662 Chiss wants a shorter Assassin Description 2015-03-20 19:43:27 +13:00
libraryaddict 11dcc4af8b Fix description of Assassin Kit 2015-03-20 19:41:56 +13:00
libraryaddict 83b18129f2 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
2015-03-20 19:33:27 +13:00
libraryaddict 7bf9c13fd8 Kit Assassin in SG has nametag visiblity set to 8 blocks, normal set to 24 2015-03-20 19:30:08 +13:00
Cheese 6c78bc6f8f added 10s delay on getting bow in block hunt 2015-03-20 16:51:24 +11:00
Cheese 746fa9e11b stealer kit for SG 2015-03-20 16:20:55 +11:00
libraryaddict 6c257c1e7d Store killed players in a hashmap in SG 2015-03-20 18:17:34 +13:00
libraryaddict 19cc6dc12b Minor bug-fix in the hopes it fixes a major bug for SG 2015-03-20 17:51:03 +13:00
libraryaddict 6e30834565 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-03-20 17:35:42 +13:00
libraryaddict 03bcb120fc Change border damage from Void to Border Damage 2015-03-20 17:35:27 +13:00
libraryaddict 3e7346618b Change border creep speed, boats only placeable on water 2015-03-20 17:34:44 +13:00
Cheese e4475eb7b1 allowed mapleads to stop games
removed nametag (long range) on wolf pet, and lowered damage from 4 to 3
2015-03-20 12:37:18 +11:00
libraryaddict 7b41649d94 Removed debug logging in SurvivalGames 2015-03-18 22:10:03 +13:00
Cheese ee237c9f5b re-enabled SG in gamefactory 2015-03-17 22:20:40 +11:00
libraryaddict 1f0e204eb3 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SurvivalGames
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/subclasses/HealingRune.java
2015-03-18 00:04:41 +13:00
libraryaddict 261b18fcf0 Add GameType options 2015-03-17 23:59:59 +13:00
libraryaddict 52f0941fb9 Add resourcepack options 2015-03-17 23:59:24 +13:00
libraryaddict 733134f709 Update SurvivalGames 2015-03-17 23:53:43 +13:00
libraryaddict f12d0bf9ef Allow disabling of game start sounds, and changing of the game PrepareTime. 2015-03-17 23:52:58 +13:00
libraryaddict 340441edbe SG kit fletcher no longer can pickup fletched arrows 2015-03-17 18:30:48 +13:00
libraryaddict 06ebbbbc73 Remove SG wolf pet on quit 2015-03-17 18:30:17 +13:00
libraryaddict 41469b198a Change wizards spells to use conditions for potion effects 2015-03-17 18:07:43 +13:00
Cheese 3eba559b01 fixed merge error 2015-03-17 15:02:41 +11:00
Cheese 73c66fa93f Merge branch 'SpecRemoveCreative'
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventGame.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
2015-03-17 14:57:17 +11:00
Cheese e3eb62887d fixed an eventgame bug 2015-03-17 14:50:56 +11:00
Cheese 28c683a37a fixed display for effects 2015-03-16 15:16:17 +11:00
Cheese c941c383e7 fixed hosts not being able to use creative inventroy 2015-03-16 15:01:35 +11:00
Cheese efa2b649bd updated eventserver not expiring 2015-03-16 14:19:43 +11:00
Cheese a700b61613 added WE permissions to event servers. 2015-03-16 14:10:58 +11:00
Cheese 420c4e7229 More work on Event game 2015-03-16 13:39:33 +11:00
libraryaddict bead4a7626 No longer need to constantly set the durability of items in the sheep game 2015-03-15 13:13:06 +13:00
libraryaddict ba04c5e834 Fixed GameScoreboard demanding strings are shortened to 15 chars when the max is 16 2015-03-15 12:35:39 +13:00
libraryaddict e9fe1fb423 Formatted SpellType, fixed lightning spell description 2015-03-15 12:34:45 +13:00
Cheese 98960b6ce7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-13 15:40:41 +11:00
Cheese 6762e4b537 Merge branch 'SpecRemoveCreative' of ssh://184.154.0.242:7999/min/Mineplex into SpecRemoveCreative 2015-03-13 11:34:57 +11:00
Cheese c5d48a82a3 Fixed invisibility bug 2015-03-13 11:34:45 +11:00
Shaun Bennett b18ea22df4 Fix spectator gui bug 2015-03-12 15:50:46 -04:00
Cheese 3ceb0ff678 Converted spec away from CREATIVE 2015-03-12 15:31:40 +11:00
Shaun Bennett f660620e4b Revert "Pre-Frost changes"
This reverts commit dbeea5bf69.
2015-03-11 22:18:29 -04:00
Cheese bf901b2280 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-12 12:15:48 +11:00
Cheese 8e77d1fc21 more event server updates 2015-03-12 12:14:49 +11:00
libraryaddict 9cf0e4d1e8 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-03-11 13:17:16 +13:00
libraryaddict f47447134e Cleanup hologram class, remove witherskull option for 1.8 and fix duplicate nametags and non-invisibility on armorstands 2015-03-11 13:16:00 +13:00
Tim Ziankoski 759db08679 Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex"
This reverts commit 2e06a272b4, reversing
changes made to e443b41e15.
2015-03-09 17:24:01 -04:00
Tim Ziankoski 2e06a272b4 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-09 16:43:00 -04:00
Cheese e443b41e15 removed unfinished code 2015-03-09 22:16:08 +11:00
Cheese 3a0e597276 more event server stuff 2015-03-09 22:15:24 +11:00
libraryaddict dbeea5bf69 Pre-Frost changes 2015-03-09 05:17:04 +13:00
Tim Ziankoski ac4b495301 Created internationalization helper class and began i18n process 2015-03-07 20:50:47 -05:00
Cheese e0ba667613 old chests drop a little more frequently 2015-03-07 11:53:18 +11:00
Cheese f2a71b2ea9 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-07 11:13:30 +11:00
Cheese 683f86bd89 event server fixes and parser gamtypes 2015-03-07 11:13:17 +11:00
Jonathan Williams 2d7f65588c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-06 01:36:38 -08:00
Jonathan Williams 09ecb994f6 Pooled Friend/Ignore/Preferences/Poll/Elo repositories.
Removed ArcadeRepository as its unused.

Removed target server check for RedisCommand because it breaks other commands.
2015-03-06 01:36:25 -08:00
Cheese 0336df55aa Event update 2015-03-06 19:43:17 +11:00
Cheese e62d9774a9 Initial Event Game push 2015-03-06 19:11:26 +11:00
Jonathan Williams 5e78b43860 Added StaffOnly code to ServerConfiguration 2015-03-02 12:33:04 -08:00
libraryaddict 1fbadfa4f4 Don't compare player world to a plugin fetched world, instead compare the name. 2015-03-01 18:18:53 +13:00
Shaun Bennett 90ebbd9962 More refactors 2015-02-27 22:53:55 -05:00
Shaun Bennett efce714375 DEVP-66 Refactor commonly used classes to Java conventions
Refactoring + testing jira
2015-02-26 00:07:07 -05:00
Shaun Bennett cf7e2eed69 Merge with MPS Update 2015-02-24 21:11:16 -05:00
Shaun Bennett ad5481ef9c Revert "Remove arcade repository stuff"
This reverts commit a5f7050e40.
2015-02-24 21:04:19 -05:00
libraryaddict bfb0c157a2 Update jooq libraries in common.xml and EnjinTranslator.xml and eclispe classpaths 2015-02-25 13:56:32 +13:00
Shaun Bennett be591c7d09 Disallow start/stop/kick/setgame while a game is in progress for Donor ranks 2015-02-24 17:22:47 -05:00
Shaun Bennett 857052992d Increase max player cap to 100 for SnrMod+/Youtube 2015-02-24 14:47:10 -05:00
Shaun Bennett 570374fbb4 Add Wither Assault and Wizards gametypes to legend+ private servers 2015-02-24 14:45:31 -05:00
Shaun Bennett 48dd5639d2 Kick banned players from games 2015-02-24 14:38:12 -05:00
CoderTim 0bf6866ad7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-23 20:56:34 -05:00
libraryaddict fc5771b33c Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-24 13:04:06 +13:00
libraryaddict 56e03221ad Improve party system 2015-02-24 13:03:51 +13:00
Jonathan Williams 87558eb01a Merge pull request #10 in MIN/mineplex from leaderboards_dev to master
* commit 'e1f7e2dbcc91bb79d393b09ea5b250fe895cfe11':
  Remove old lines of debug code.
  Add in hooks to update statistical events log for leaderboards. Modify leaderboard PHP script for new updated leaderboard table formats.
2015-02-21 01:55:59 -06:00
libraryaddict 53bb67ec4f Magic missile nerfed to no cooldown decrease, nerfed rumble dmg, nerfed lance multihits 2015-02-21 20:41:07 +13:00
Ty Sayers def101cc8d Add in hooks to update statistical events log for leaderboards.
Modify leaderboard PHP script for new updated leaderboard table formats.
2015-02-19 18:53:46 -05:00
CoderTim 44f453c56e Updated jOOQ and database tables 2015-02-18 18:51:36 -05:00
libraryaddict d29b43d645 Parties now persist cross-server, staff messages now display on the sending server for other staff for staff cross-messages. 2015-02-17 15:17:14 +13:00
Mini-Chiss cdbf6c450e fixed mis-named gameloot chests 2015-02-15 17:35:58 +13:00
Shaun Bennett a5f7050e40 Remove arcade repository stuff 2015-02-13 07:33:50 -05:00
libraryaddict 9bdf248643 Add cross-server message and adminmessage commands. Fixed casing on messagecommands package. 2015-02-12 04:08:06 +13:00
Shaun Bennett e21e27f07f Merge remote-tracking branch 'origin/master' 2015-02-10 13:33:59 -05:00
Shaun Bennett 6b3f2114f2 Holy debug code! 2015-02-10 13:27:29 -05:00
Mini-Chiss 884df48695 disguise command (not yet working fully) 2015-02-10 19:08:54 +13:00
libraryaddict 29f3241098 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-10 02:32:13 +13:00
libraryaddict ce7db289a7 Add commands /ignore and /unignore. Fixed mutes not working with private messaging 2015-02-10 02:31:33 +13:00
Shaun Bennett ed8638ae9f Tablist thingy for 1.8, sort of helps the situation a bit but doesnt perfectly solve it 2015-02-06 23:39:22 -05:00
Chiss 417122b7a7 reduced rate that smash crystal spawns 2015-02-06 14:47:34 +11:00
Chiss 09b78fccd7 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-06 14:16:26 +11:00
Chiss 14fc6f2145 Chest Update 2015-02-06 14:16:10 +11:00
libraryaddict f549402712 Modify wizards to use | for bossbar displays 2015-02-05 23:42:26 +13:00
libraryaddict 6f8d39b630 Fixed spiders climbing liquids 2015-02-05 22:34:06 +13:00
Shaun Bennett 939c6189a7 Merge energy and war with master 2015-02-03 14:16:07 -05:00
Shaun Bennett 6cefeb1b74 More work on War 2015-02-03 14:02:45 -05:00
libraryaddict 9118aef60f Even if death is not the end, refuse players re-entry if they were in the lobby when they quit. 2015-02-01 16:03:29 +13:00
libraryaddict f9cbab6fd8 SuperSmash no longer restores hunger unless you damage a player, not a entity 2015-02-01 09:47:00 +13:00
libraryaddict 6f369cbcdb Sort players in spectator menu by name 2015-02-01 08:25:38 +13:00
Chiss f03c9d5bab Fixed damage rate on barrage 2015-01-30 20:48:46 +11:00
Chiss 115f9b58ab Spider nest :) 2015-01-30 17:02:28 +11: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
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
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 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 3525243f9d Numerous fixes to Wizards 2015-01-24 23:14:23 +13: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
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
libraryaddict c5b444ae6e Wizards push 2015-01-23 21:52:03 +13:00
Jonathan Williams 08078c1622 Removed Logger 2015-01-22 23:18:38 -08: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 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 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
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 611d184024 Cleanup code, add custom explosion, add lance and traprune spell 2015-01-18 21:23:47 +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 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
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
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
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
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 9daee9733f Fixed UHC height limit
fixed UHC rejoin health bug
2015-01-08 13:08:15 +11:00
Chiss 8ce097d837 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-01-04 13:21:35 +11:00
Chiss 5f36c8e424 minor scoreboard changes
legend loot bonus
2014-12-30 08:50:37 +11: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 81e423fa4f Fixed Server transfer stuff. Portal send works! 2014-12-24 14:35:34 -05:00
Shaun Bennett 043f67f78c Fix for max players not displaying properly (MPS) 2014-12-23 17:48:38 -06:00
Chiss 35bcf28c83 champions builds will now load in MPS, even if the current game isnt champs. 2014-12-23 23:44:59 +11:00
Chiss 78977788a1 fixed bug 2014-12-23 23:18:29 +11:00
Chiss f4c5922b05 added messages for when server is expired 2014-12-23 23:17:21 +11:00
Chiss 78d94320a8 fixed reciptient of message 2014-12-23 22:55:07 +11:00
Jonathan Williams 07cca7a1d4 Fixed NPE in GameHostManager
Fixed CD for creating server.
2014-12-23 06:46:05 -05:00
Shaun Bennett 21d255fcd1 Merge remote-tracking branch 'origin/master' 2014-12-23 04:15:55 -06:00
Shaun Bennett c41b5b0cfb private server gui, i think? 2014-12-23 04:15:33 -06:00
Chiss 6d2bd84b5b disabled always joinable motd for minestrike 2014-12-23 20:39:49 +11:00
Jonathan Williams 9a767af018 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-12-23 03:44:05 -05:00
Jonathan Williams f00854ee4c Removed bad code thats bad from the bad birdy.
Hooked in PersonalServer item click and command.
Re-enabled redis transport commands.
Added transfer command sending on personal server start.

Updated Enjin to handle more versatile inventory purchases.
2014-12-23 03:43:56 -05:00
Chiss 521b61c624 disabled free evolutions 2014-12-23 19:42:13 +11:00
Chiss a15256da88 update 2014-12-23 19:04:10 +11:00
Jonathan Williams 103ff0e6b0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-12-23 02:57:24 -05:00
Chiss 07d82b8206 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-12-23 18:39:22 +11:00
Chiss 39745913ac re-enabled roggue 2014-12-23 18:39:05 +11:00
Shaun Bennett eb0f23318f Fix my fix for scoreboard - mine broke when new players joined 2014-12-23 00:06:30 -06:00
Shaun Bennett 4b4ebd0e36 Change admin item to sparkling melon 2014-12-23 00:06:04 -06:00
Shaun Bennett 8f9794a5f7 Merge remote-tracking branch 'origin/master'
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
2014-12-22 23:56:18 -06:00
Shaun Bennett 706b3e25ef Fix broken player count when changing max players 2014-12-22 23:54:51 -06:00
Chiss 64d37d1886 minor snd changes 2014-12-23 16:50:31 +11:00
Jonathan Williams 4cac65a81f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-12-23 00:50:20 -05:00
Jonathan Williams 0e85b7e6cc Added HostName to server groups.
Added handling of private server groups in server monitor.
Optimized server group/server status load.
Added ability to add/remove server group.
2014-12-23 00:49:52 -05:00
Shaun Bennett 1957db25d9 Add player head button 2014-12-22 23:20:20 -06:00
Chiss e8953b0c96 fixed merge errors 2014-12-23 15:14:03 +11:00
Chiss f961fd0233 Merge remote-tracking branch 'remotes/origin/searchanddestroy'
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
2014-12-23 15:09:58 +11:00
Chiss 19a7e6d666 time update 2014-12-23 13:01:44 +11:00
Shaun Bennett 8ed7f34ab6 Sorted game pages 2014-12-22 19:20:08 -06:00
Chiss 4797b251b1 YAY Champions enable/disable works. 2014-12-23 11:39:03 +11:00
Chiss 71cf8e8fd2 undid champs stuff :( 2014-12-23 11:22:41 +11:00
Chiss ec9401506c Game servers can now run champions/normal on the fly. 2014-12-23 11:18:48 +11:00
Chiss a197724de8 fixed le bugs. 2014-12-23 10:48:15 +11:00
Shaun Bennett 1396c3395a Add kill button, rename ban to remove, add some messages for actions, add remove admin 2014-12-22 17:37:02 -06:00
Chiss fa0a9ac859 fixed exploit on skylands 2014-12-22 21:08:44 +11:00
Chiss ec8e1f0546 more MPS stuff
fixed bridges exploit
2014-12-22 16:31:13 +11:00
Chiss 2472ca95ec MPS updates 2014-12-22 13:19:45 +11:00
Chiss 98b614848d Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into HEAD
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleBlizzard.java
2014-12-22 10:54:31 +11:00
Chiss 0e7dec919d minor updates 2014-12-22 10:51:19 +11:00
Chiss 9321abdaf5 Merge branch 'searchanddestroy' of ssh://184.154.0.242:7999/min/mineplex into searchanddestroy 2014-12-19 13:59:31 +11:00
Chiss 184c6cb4ba added func to change attackreason for combatmanager 2014-12-19 13:59:18 +11:00
libraryaddict 93314711e7 Modified snd 2014-12-18 17:56:21 +13:00
Chiss 437c1aeabe MPS rank todo 2014-12-18 13:06:57 +11:00
Chiss 60f567a3fb fixed some errors ;o 2014-12-18 12:47:00 +11:00
Chiss 679f7909b0 Merge branch 'feature/private-servers' of ssh://184.154.0.242:7999/min/mineplex into feature/private-servers 2014-12-18 12:45:56 +11:00
Chiss 56d14b7bc0 Particle stuff 2014-12-18 12:45:45 +11:00
Shaun Bennett 604243dfa3 UI improvements - icon changes, whitelist toggle, notify messages 2014-12-17 19:42:11 -06:00
Shaun Bennett 2677d2e557 Fancy icons for 1.8! 2014-12-17 19:15:31 -06:00
Shaun Bennett a63c48e338 Refactoring private server menu 2014-12-17 18:45:15 -06:00
Shaun Bennett d19431a47f Rename Clicked to onClick 2014-12-17 18:40:44 -06:00
Shaun Bennett 6e42894d5c Refactor button again 2014-12-17 18:33:24 -06:00
Chiss 12973aba7d Merge branch 'master' into feature/private-servers 2014-12-17 16:47:19 +11:00
libraryaddict 0e7adab3eb Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-12-17 18:32:50 +13:00
libraryaddict 17ac36d9ae Add wither pet, pets are no longer stackable. Enderdragon no longer has his health changed in the hub 2014-12-17 18:31:51 +13:00
Shaun Bennett 6eb3efa0b6 More changes 2014-12-16 20:37:14 -06:00
Shaun Bennett 62a621270e More work on private server gui. Still need to do a bunch of refactoring 2014-12-16 13:43:01 -06:00
Shaun Bennett 83218c9a73 Pushing unfinished code for laptop 2014-12-16 11:42:06 -06:00
libraryaddict 5b1f4f16fb Modify giveGems for new give gems 2014-12-16 21:58:17 +13:00
Chiss a433ad764d Wither Morph
Legend Particle
2014-12-16 16:18:09 +11:00
Jonathan Williams c43ee95c55 Added 1.8 hooks for disguise setName and getName
Refactored method names in some disguise classes.
2014-12-15 21:46:14 -05:00