Commit Graph

1489 Commits

Author SHA1 Message Date
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
libraryaddict 7e6b6bd1b2 Add evolve effect 2014-12-16 15:23:31 +13:00
libraryaddict 6d3a1116b9 Changes to SnD 2014-12-16 15:14:10 +13:00
libraryaddict 913f827ced Changes to SnD 2014-12-16 15:14:09 +13:00
libraryaddict da6b4b6a79 Current work for SnD 2014-12-16 15:14:09 +13:00
libraryaddict 0026127647 More work done on SnD 2014-12-16 15:14:08 +13:00
libraryaddict f5d9d8dcf0 Modify scoreboard to use teams to support duplicate lines and up to 32 in length 2014-12-16 15:14:08 +13:00
libraryaddict 715862b365 Commit current changes 2014-12-16 15:14:07 +13:00
libraryaddict 6d7a71d043 Modifications for SnD test 2014-12-16 15:14:07 +13:00
Chiss 2e7d101850 added material/data for gametypes 2014-12-16 12:26:37 +11:00
Chiss ee363f55a6 re-enabled gems for CC 2014-12-15 15:50:25 +11:00
Chiss d7eb01e8f0 fixed CC Bug :D 2014-12-15 15:49:52 +11:00
Chiss d1be64d7e7 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
2014-12-15 14:56:09 +11:00
Chiss 95081a8ab7 Gems cannot be given multiple times for certain things (prevents bugs giving mass gems) 2014-12-15 14:33:38 +11:00
Jonathan Williams 230c6ede13 Disabled gem reward in ChristmasChaos 2014-12-14 22:14:41 -05:00
Chiss 19dfafe9ed disabled gems 2014-12-15 13:58:36 +11:00
Chiss 909c0d9be7 christmas no longer rewards gems 2014-12-15 13:56:48 +11:00
Chiss d0f8a6a063 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-12-15 12:26:25 +11:00
Chiss 9136165d4f fixed christmas elf name
pet names now have limited range
2014-12-15 12:24:40 +11:00
Jonathan Williams 5b67e2182a Added disguise to Pet Manager for eventual wither disguised pet. 2014-12-14 02:30:39 -05:00
Chiss 78a34b1517 hopefully fixed a bug where pumpking king despawned.
removed 11 disc from loot
2014-12-13 11:55:12 +11:00
Chiss 3f24325c3c removed +50% player limit for CC 2014-12-12 21:23:01 +11:00
Chiss 4fd6ed80c4 final xmas Updates
xmas hub
2014-12-12 19:44:04 +11:00
libraryaddict 9a16616e6c Add fix for wither bossbar and add a checkpoint hologram for snake bit in xmas 2014-12-12 12:40:23 +13:00
Chiss adafc95d3f boss weaker 2014-12-12 10:26:32 +11:00
Chiss 2be4d7d6d2 XMAS UPDATE 2014-12-12 10:03:25 +11:00
Chiss 3af8a90d3b near final xmas push :D 2014-12-11 15:23:01 +11:00
libraryaddict 3a8ab0afb0 Uncomment SleighHorse 2014-12-11 15:24:10 +13:00
Chiss 6b1fa91565 Xmas Updates 2014-12-11 12:42:06 +11:00
Chiss 86b9d8342f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/Christmas.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/Sleigh.java
2014-12-11 11:27:47 +11:00
libraryaddict ee8d699bd1 Minor text cleanup in the sleighhorse code because you guys seem to like that 2014-12-11 07:25:40 +13:00
libraryaddict 2a13255af3 Turn christmas chaos game horses into reindeer 2014-12-11 07:23:47 +13:00
Chiss 068a0901f9 xmas updatre 2014-12-11 00:16:15 +11:00
Chiss 358d5fde44 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-12-10 22:38:19 +11:00
Chiss 450d3eb923 merge 2014-12-10 22:38:08 +11:00
Jonathan Williams c4fee8e681 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Hub/.classpath
2014-12-10 03:34:53 -08:00
Jonathan Williams ea034812b9 Fixed path finder crap in UtilEnt
Cleaned up unused code in OutfitRaveSuit
Fixed eclipse bug for NotificationManager
Removed christmas/Sleigh columns.
2014-12-10 03:32:35 -08:00
Chiss db8e0484ab missing files + new pet 2014-12-10 18:23:22 +11:00
Chiss 0aba82eee6 fixed some eclipse java6 stuff with mail
Christmas game update
2014-12-10 15:38:57 +11:00
Chiss bee81ff455 lowered coin rewards 2014-12-09 20:23:56 +11:00
Chiss 828fabb80a Initial Christmas Chaos update 2014-12-09 20:04:59 +11:00
Chiss 50358c0c30 removed EULA breach in bridges private blocks 2014-12-08 18:23:47 +11:00
Chiss ef8e5104f1 SnD Kits
minor bug fixes
2014-12-08 17:28:18 +11:00
Chiss 64c8edc292 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-12-08 17:25:03 +11:00
libraryaddict 048aa40590 Remove comments and add comments 2014-12-06 03:25:53 +13:00
libraryaddict 307d280534 Read merge message 2014-12-06 02:22:52 +13:00
Chiss 4430efd7be minor updates 2014-12-05 16:25:34 +11:00
Chiss 38639fb58f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/Taunt.java
2014-12-04 13:34:08 +11:00
Chiss 6cc4ec034b Champs Updates
UHC Y Limit in middle
2014-12-04 13:33:31 +11:00
Jonathan Williams abaf9f4693 Refactored IRelation method names
Added support for negative amounts in Support server.

Clans in core testing state.
2014-12-03 13:06:50 -08:00
Chiss a8deee5292 fixed a spelling error 2014-12-02 18:04:48 +11:00
Chiss 6319bffd42 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-12-02 09:50:47 +11:00
Chiss 185b182061 fixed teleports removing you from the game 2014-12-02 09:50:30 +11:00
Jonathan Williams e7cf4eb51d Removed use of Gem Boosters
Cleaned up some unused imports.
2014-12-01 02:27:39 -08:00
Jonathan Williams 9d39cb922c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-12-01 01:22:51 -08:00
Jonathan Williams 433483dcca Fixed error in GameLootManager 2014-12-01 01:22:43 -08:00
Chiss cee48f1978 made it so you can use fireworks without aiming against block in blockhunt
removed fire from magma blast
private blocks are no longer private if owner is dead
2014-12-01 19:33:36 +11:00
libraryaddict 9ddd0bd9cc Player now sees theirselves disguised as the same block they are disguised as. 2014-11-30 16:39:27 +13:00
libraryaddict e654b23a50 We don't need that debug output 2014-11-30 15:06:50 +13:00
libraryaddict 5157c2bf37 Disable hiders from seeing their own block 2014-11-30 15:06:18 +13:00
libraryaddict 54fe312251 Untested fix I'm 99% sure will fix hide and seek players being blinded 2014-11-30 13:47:07 +13:00
libraryaddict f8869a84ba Don't send the player himself the block change.. 2014-11-30 13:22:01 +13:00
libraryaddict 751731a1ad Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-30 12:14:51 +13:00
libraryaddict 00d3e66ac4 Commit my current work on SnD kits 2014-11-30 12:12:02 +13:00
libraryaddict 8afb803d5d Modify the bow kits a little 2014-11-30 10:26:12 +13:00
Jonathan Williams f507db7664 Reworked spawn to save to database.
Work on Clans:
Fixed clan loading/updating/adding.
Refactored some code for Clans.
2014-11-29 03:16:37 -08:00
libraryaddict e57bd8b473 Finish making the bow kit tree 2014-11-29 16:39:09 +13:00
libraryaddict e3b0843b2c Modify Barrage perk to support setting levels to indicate arrows 2014-11-29 16:38:54 +13:00
Chiss b3beadf8b5 made recharge look nicer for 1.7
added missing files
2014-11-29 09:14:33 +11:00
Chiss ca34ac4e02 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-29 09:09:23 +11:00
libraryaddict b0e62bfedf Cleanup imports and rename fields to your _ and non _ 2014-11-29 10:51:34 +13:00
libraryaddict 24bc581f35 Add the kits I have 2014-11-29 10:36:34 +13:00
libraryaddict e587fca8f1 Move KitBow to its own package 2014-11-29 07:53:33 +13:00
libraryaddict 5544bbb440 Add KitEvolve inventory 2014-11-29 07:22:18 +13:00
libraryaddict e6fac6de39 Small typo in UpgradeKit stuff 2014-11-29 07:22:02 +13:00
Chiss 8f9f88987b mods can no longer use /tp Here
only disqualifies on tp in live games.
2014-11-28 10:09:18 +11:00
Chiss fdc67e021c Staff using /tp commands will take them out of the game (Mod to Admin only)
Changed spec /tp command to /spec
2014-11-28 10:00:31 +11:00
libraryaddict d5d9e2eb14 Don't bother with these checks in ItemLayout 2014-11-28 09:30:57 +13:00
libraryaddict d731b6ee69 Registering of KitManager 2014-11-27 09:47:43 +13:00
libraryaddict 1bb4d902c6 Start on a kit manager 2014-11-27 06:44:46 +13:00
libraryaddict 9350aeb89a Use holograms in game 2014-11-27 03:18:52 +13:00
libraryaddict f5533dbce2 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SearchAndDestroy 2014-11-27 01:13:14 +13:00
libraryaddict 52411a188f Fixed entityId not using UtilEnt 2014-11-27 01:08:43 +13:00
libraryaddict b68c95c6a2 Finish up adding bombs and turn this into a working game. Add demo kit Bow 2014-11-27 01:08:42 +13:00
libraryaddict 3ae27ccc55 Store PacketHandler so that games can use it 2014-11-27 01:08:41 +13:00
libraryaddict 5bf185e588 Register Search and Destroy in GameFactory 2014-11-27 01:08:40 +13:00
libraryaddict 60fd6b01cc Add Search and Destroy code 2014-11-27 01:08:40 +13:00
libraryaddict aa0659828a Register game SearchAndDestroy 2014-11-27 01:08:39 +13:00
libraryaddict 9928811a71 Merge pull request #2 from Better-Holograms to master
* commit 'ef59cb7a9db25b8688ee6e3254661d9cc65a5e89':
  Remove the 'Made by Shaun'
  Fix up mistakes in the previous modifications
  You have your HologramManager presented in a light most fair. Should be worth noting I didn't test it thoroughly
  Ignore wither skulls for CustomTagFix
  Remove old holograms and add new holograms
2014-11-26 06:07:57 -06:00
libraryaddict ef59cb7a9d Merging changes from master to Better-Holograms
* master:
  Antistack replacement

Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2014-11-27 01:01:19 +13:00
Chiss 95e428eb4f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/inventory/data/InventoryRepository.java
2014-11-26 12:34:47 +11:00
Chiss 731b0d89dd Merge 2014-11-26 12:33:39 +11:00
libraryaddict 03075fecae You have your HologramManager presented in a light most fair.
Should be worth noting I didn't test it thoroughly
2014-11-26 10:28:37 +13:00
Jonathan Williams 484dfaaea9 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-25 13:25:41 -08:00
Jonathan Williams 3b54789767 Optimized logins dealing with mysql with multiqueries.
Added lazy loading of Pool data and Loaded check before performing anything.

Refactored MiniClientPlugin and created MiniDbClientPlugin

Renamed RankBenefitManager9000 to BenefitManager

Removed /send ability for now.
2014-11-25 13:25:13 -08:00
Shaun Bennett f1fbc21570 Merge remote-tracking branch 'origin/master'
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
2014-11-23 20:02:09 -06:00
Shaun Bennett c7f2a8072e Antistack replacement 2014-11-23 19:51:23 -06:00
Jonathan Williams cb43bc04d3 Added /lobby 2014-11-23 03:35:16 -08:00
Chiss 0c5ec503be reduced fireworks in dragons 2014-11-23 15:00:05 +11:00
Chiss 089fdf8a64 sparklers no longer attract once they're in water or below 0 2014-11-23 14:55:06 +11:00
Chiss d4a127b8ad reduced fps lag in runner 2014-11-23 14:47:28 +11:00
Chiss f0c87e439a fixed nametag color in paintball 2014-11-23 11:16:01 +11:00
Chiss 19d3bba461 fixed fence glitch in dom 2014-11-22 13:20:34 +11:00
Chiss 6dfcdce027 increased illusion cooldown
cleaned axethrow
2014-11-22 10:29:00 +11:00
Chiss f1ba5947a4 Some more wither updates 2014-11-21 16:32:12 +11:00
Chiss 0d78433bd2 updated mapparser
buffed withers a little
2014-11-21 10:36:41 +11:00
Chiss 7a8759dfba updated disguisemanager so it uses player arg
fixed invisibility bug on disguises for specific players
updated champs skills
made some hard achievements a bit easier
2014-11-21 09:42:05 +11:00
Chiss 972911fe05 set achievement skills 2014-11-20 18:01:46 +11:00
Jonathan Williams d1a4080cbd Added GUI support for achievement skills. 2014-11-19 22:47:10 -08:00
Chiss 450cc9ada2 Champions achievement update
Wither update
2014-11-20 17:21:22 +11:00
Chiss 4961b55986 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-18 16:43:53 +11:00
Chiss f5022ecf16 Fixed dupe glitch (all games)
Some champions skill fixes
created GameSpectatorManager to handle spec stuffz
2014-11-18 16:43:39 +11:00
Shaun Bennett e99a3f6544 Merge remote-tracking branch 'origin/master' 2014-11-17 18:19:06 -06:00
Shaun Bennett f071d2e727 Fix for TNT explosion in Bridges 2014-11-17 18:09:58 -06:00
Chiss cd890e6c6c disabled spec menu in minestrike - fixes shop bug. 2014-11-16 14:40:50 +11:00
Chiss 4c3610c3ac fixed DMT silence 2014-11-16 10:46:26 +11:00
Chiss 454deb03db fixed SG crash bug 2014-11-16 09:31:03 +11:00
Chiss 057594205e Only closing CREATIVE Inv for non-ops. 2014-11-15 22:40:56 +11:00
Chiss ca58f11174 specs should be able to view stats now 2014-11-15 22:32:00 +11:00
Chiss fb70b76d29 FINGERS CROSSED 2014-11-15 22:29:53 +11:00
Shaun Bennett d16896e493 Merge remote-tracking branch 'origin/master' 2014-11-15 05:04:57 -06:00
Shaun Bennett 1ca23390cc Fix my derp 2014-11-15 05:04:48 -06:00
Chiss 41b6296788 Wither no longer shoots in pregame lobby 2014-11-15 20:16:18 +11:00
Chiss 51bc53262d Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-15 19:32:08 +11:00
Chiss ca4eec20ed Wither Assault update 2014-11-15 19:31:56 +11:00
Shaun Bennett 521b1e5f3b Merge remote-tracking branch 'origin/master' 2014-11-13 21:54:15 -06:00
Chiss 8ab0116a27 initial push of Wither Assault 2014-11-14 14:14:31 +11:00
Shaun Bennett 223bc2d0c0 Remove some debug messages that we no longer need 2014-11-13 19:34:55 -06:00
Shaun Bennett 6038c72e86 Add cleaner page for when there is only 1 team 2014-11-13 19:33:39 -06:00
Shaun Bennett ea8b8dca15 Disable spectator menu for castle siege and uhc until I work out a better way to show that many players 2014-11-13 19:18:28 -06:00
Shaun Bennett af31f4cd42 Add Tab handling for MultiCommandBase and "game set" command 2014-11-13 18:22:00 -06:00
Shaun Bennett 48c09aa311 Making spectator gui look better 2014-11-13 18:05:28 -06:00
Shaun Bennett eb4b451e12 Fixing some spectator gui bugs 2014-11-13 16:41:42 -06:00
Shaun Bennett 8b73b89a17 Merging spectator gui with main branch 2014-11-13 16:03:14 -06:00
Chiss 112f76a29a Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-13 18:10:10 +11:00
Chiss 9eaacd20ab fixed slime healing
fixed sheep quest brute not dropping sheep
updated punish page
2014-11-13 18:09:54 +11:00
CoderTim 09ca2234c4 Fixed survival games death match bug: https://trello.com/c/jNGSUUGI 2014-11-13 01:49:14 -05:00
CoderTim 7667aa25a8 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-13 00:26:53 -05:00
Jonathan Williams 7cad40044a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java
	Plugins/Mineplex.Core/src/mineplex/core/report/ReportPlugin.java
2014-11-12 19:36:00 -08:00
Jonathan Williams 1372f74921 Refactored some names in MiniPlugin
Work on clans.
2014-11-12 19:21:12 -08:00
CoderTim d363637015 Achievement bug fixes 2014-11-12 20:56:57 -05:00
Chiss 71a93bead5 Updated punish to be even less confuse. 2014-11-12 09:49:03 +11:00
Chiss debf8ebcba fixed chat not being unsilenced when someone picks word 2014-11-11 18:52:00 +11:00
Chiss c37026e4df SSM Dom changes 2014-11-11 18:36:32 +11:00
Chiss a1eff92bbb fixed achievement kit for sneaky not being accessible 2014-11-11 12:25:36 +11:00
Chiss d2301337d2 fixed non-charged block toss not having any velocity. 2014-11-10 19:28:36 +11:00
Chiss d362fb3b1c fixed punish error 2014-11-10 19:15:56 +11:00
Chiss 0252db5a05 Punish simplification update 2014-11-10 18:40:39 +11:00
Chiss d6ade5a15b ensured that exp cannot be given multiple times for a game 2014-11-09 14:43:06 +11:00
Chiss b65d2f491e exp gives less for losing 2014-11-09 10:33:50 +11:00
Chiss 2a04ed6eda losing games no longer gives exp 2014-11-09 10:30:26 +11:00
Chiss ad933400b9 Sheep Quest update
lowered exp on loss
removed Participation exp
2014-11-09 10:06:04 +11:00
Chiss 7e26def6a1 centralised SneakyAssassins module cleanup 2014-11-08 18:40:23 +11:00
Chiss 5ce38c3030 removed final from npcManager 2014-11-08 18:37:18 +11:00
Chiss c0ec9f92fc nulled reference too, just to be safe :D 2014-11-08 18:36:05 +11:00
Chiss 2b0befdc13 fixed listener leak in SneakyAssassins 2014-11-08 18:35:34 +11:00
Chiss fc2bba7eeb reverted idlemanager stuff for dmt(had already made talking in chat count as action) 2014-11-08 11:08:13 +11:00
Chiss 8c74022996 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-08 11:04:06 +11:00
Chiss 601c1912f5 may have fixed sheep teams not working. 2014-11-08 11:03:53 +11:00
CoderTim 80226a20fa Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-07 18:55:20 -05:00
CoderTim 4c98d833e0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-07 18:33:46 -05:00
Chiss e286bec777 added a little msg for people in UHC, informing that it will start soon 2014-11-08 10:30:32 +11:00
CoderTim 5b1a185a5f Fixed Bad Hider achievement 2014-11-07 18:28:28 -05:00
CoderTim ae35e82e22 Disabled AFK kick in Draw My Thing 2014-11-07 18:28:06 -05:00
Chiss 75c07588a5 UHC wont start for 2 minutes after creation 2014-11-08 10:22:23 +11:00
Chiss c61ad8907a set minimum MP level for staff 2014-11-08 09:15:27 +11:00
Chiss 5da0c53997 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-08 08:56:52 +11:00
Chiss e773d44564 limited max exp so UHC doesnt give you a billion exp. 2014-11-08 08:56:30 +11:00
Jonathan Williams 4ac70281d4 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-07 13:54:22 -08:00
Jonathan Williams 3309c0406b Added ∞ for admin/owners as player level.
Fixed customer support issue where it wasn't totaling coins correctly.
Fixed Recharge memory leak.
2014-11-07 13:54:11 -08:00
Chiss bd730b1e5a Fixed OITQ not giving wins.
Added silence during word selection in DMT
2014-11-08 08:46:26 +11:00
Chiss c64e4e3b5f fixed winners/losers for death tag. 2014-11-07 23:35:43 +11:00
Chiss 908a8506a7 fixed broken OITQ kit 2014-11-07 23:21:30 +11:00
Chiss 519e63a1c1 re-unlocked kits for single game ultra chaps. 2014-11-07 23:10:33 +11:00
Chiss c93862f299 updated player level
added /givestat command for owners (must use full string; Global.ExpEarned)
2014-11-07 22:10:41 +11:00
Chiss 9c80103d6e completely disabled gamehost manager (double safe) 2014-11-07 21:32:44 +11:00
Jonathan Williams 2c098e531a Added error catching for arcade configuration. 2014-11-07 02:14:34 -08:00
Chiss fadaa59526 added mineplex level
removed ability to go into negative gems as villager morph
2014-11-07 19:20:15 +11:00
Chiss 6ded835ba4 MAC will no longer false positive on people standing blocks from block morph. 2014-11-07 14:14:43 +11:00
Chiss a67842b504 returned hub to normal
removed flaming pumpkins from arcade
2014-11-07 12:54:38 +11:00
Chiss b7ce12165e game host stuff 2014-11-07 12:14:33 +11:00
Chiss 4c675cca9c Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2014-11-07 11:54:14 +11:00
Chiss 91e0b42de8 Added start of MPS stuff
Some new gadgets
2014-11-07 11:52:58 +11:00
Jonathan Williams f931bd26e6 Updated ServerConfiguration to support resourcepack and Arcade settings. 2014-11-06 00:25:49 -08:00
Jonathan Williams 6f2a6a6ebd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-05 14:45:54 -08:00
Jonathan Williams 1a09c14642 Reverted database connection pooling because it caused severe login delays. 2014-11-05 14:39:22 -08:00
Chiss f3b9ad8adf Chatting will reset Idle Timer in games (for DMT)
Minor kit changes
2014-11-05 14:46:49 +11:00
Chiss b00fb0952a Updated Sheep Quest to be 1.8 comptible.
Fixed fissure not working on slabs
Fixed a bug in recharge
Added ability for admins to give other people creative (they lose it when the admin quits)
2014-11-05 11:26:39 +11:00
Chiss f6df7705b1 - Added 3 kits for DMT
- Added achievement kit for OITQ/Sneaky Assassins/DMT
- Fixed stats/achievements not working (Keen Eye, I See You, Incompetence, DMT Wins)
- Various improvements/fixes for Champions
- Nerfed trollability of Digger kit in DE
2014-11-04 19:17:06 +11:00
Chiss ab62708883 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-03 16:34:20 +11:00
Chiss 20fe69b596 added skills to lore of custom builds
fixed skeleton not having enough arrows
2014-11-02 11:09:20 +11:00
CoderTim f3770933b6 Merge branch 'feature/database-pool' 2014-11-01 01:59:07 -04:00
Chiss da88d68513 UHC does not record team stats 2014-11-01 15:42:52 +11:00
Chiss 7f642673bc fixed deathbomber achievement 2014-11-01 11:25:08 +11:00
Chiss 0095a03df7 returned bridges to normal 2014-11-01 11:11:35 +11:00
Chiss de28906aa5 restored 10 min timer for bridges 2014-11-01 09:18:44 +11:00
Chiss d0a8a86698 disabled tnt water damage before bridges drop 2014-11-01 09:18:25 +11:00
Chiss 58d6cf199b fixed foodformassesstat kind of? doesnt update db still 2014-11-01 08:59:57 +11:00
Chiss 83d182db2e Fixed Villager exploit! oops
Some balance stuff in champs
2014-11-01 08:38:36 +11:00
Chiss bf6e788f36 1 more fix for sheepy 2014-10-31 16:47:20 +11:00
Chiss c4264dcea1 fixed sheep skill trigger names 2014-10-31 15:58:11 +11:00
Chiss aca18bb2e7 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-31 10:36:06 +11:00
Chiss aa45f031ac 3 new achievement Kits
SSM Balance patch
Champs balance
tons of bug fixes
2014-10-31 10:35:47 +11:00
CoderTim 5244f65d8f All connections to db.mineplex.com/Account use database pool 2014-10-29 17:54:40 -04:00
CoderTim 08f0eb9252 Achievement bug fixes 2014-10-29 01:40:34 -04:00
CoderTim cd5e4234b7 Fixed a couple more achievement bugs
Track damage mods in combat log
2014-10-27 19:00:34 -04:00
CoderTim f0ba562265 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-27 18:11:29 -04:00
CoderTim 9f8b119fb7 Bug fixes 2014-10-27 18:09:23 -04:00
Chiss 66b446f1e6 Added some start-game invis to players. 2014-10-25 15:48:49 +11:00
Chiss cfcfad610f Improved recruit/prepare countdown timers 2014-10-25 13:56:23 +11:00
Chiss bd2e7faf3e Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-25 13:40:53 +11:00
Chiss 4002528c51 Updated GUI text.
- recharges/etc now use bottom text
- uses appropriate bottom/top for 1.7 or 1.8
- fixed 1.7 dragon bar so it works as it did pre-1.8
- dragon bar in 1.8 will now send dragon+wither, for more reliability
- renamed utils to be more clear
2014-10-25 13:40:34 +11:00
Shaun Bennett 6138da5f93 Merge remote-tracking branch 'origin/master' 2014-10-24 19:43:06 -05:00
Shaun Bennett 5cf3e6c3a1 Fix for arcade custom tags 2014-10-24 19:36:22 -05:00
Chiss 7dbba0a1f9 Added teleport for map parser
Fixed new method in UtilFirework always being BALL_LARGE
Updated lazer
2014-10-25 11:17:32 +11:00
Chiss 92d9fc4ca0 Deleted deprecated firework module and converted to Util 2014-10-25 11:03:45 +11:00
Chiss 01f311a3d6 Added missing requirements for SG Achievement Kit
fixed a parkour exploit
2014-10-25 10:38:47 +11:00
Chiss 95937db83a changed firework color 2014-10-24 19:10:10 +11:00
Chiss 25fc3c0645 Achievement Kits (3 games)
Halloween Pumpkins
Youtube command (allows kits)
2014-10-24 19:05:57 +11:00
Chiss d4512e464a Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-23 14:05:54 +11:00
Chiss c2bb53c887 Halloween pumpkins
Minestrike balance
bug fixes
2014-10-23 14:05:35 +11:00
CoderTim 0472870e78 Fixed bug that prevented the Necromancer purchase menu from displaying 2014-10-21 20:06:13 -04:00
Shaun Bennett a47be7a2f6 Merge remote-tracking branch 'origin/master' 2014-10-19 00:08:13 -05:00
Shaun Bennett 1394e33056 Fix for Arcade Kit NPC Names in 1.8 2014-10-18 21:15:53 -05:00
Jonathan Williams 8630a1ba4c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-17 23:39:21 -05:00
Jonathan Williams e3cd6f0e69 Fixed Mem leak in CustomTagFix
Changed to ServerGameMenu
Fix for overfilling HH servers
Added staff ability to join all servers.
2014-10-17 23:29:24 -05:00
Chiss 68009d3013 A little more time to handle wave 5 2014-10-18 13:51:25 +11:00
Chiss 02ea14bcd1 Damaging Boss restores all hunger 2014-10-18 10:50:17 +11:00
Chiss 651791ad83 HH FOod update 2014-10-18 10:40:08 +11:00
Chiss af0daf4a3d HH Hunger Update 2014-10-18 10:29:00 +11:00
Chiss 727e137cc4 Final HH Update 2014-10-17 12:12:22 +11:00
Chiss 5db2c072a0 Halloween update 2014-10-16 16:27:09 +11:00
Chiss eb5af41323 Added halloween reward pet
minor bug fixes
2014-10-15 15:44:26 +11:00
Chiss 15b6a80613 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-14 13:02:17 +11:00
Chiss bf1f28318b fix for UHC not ending 2014-10-14 13:02:04 +11:00
Chiss ed9dd6e894 Minor patches 2014-10-14 12:42:53 +11:00
CoderTim 127e12b7c7 Added missing dependency in intellij 2014-10-13 20:49:35 -04:00
CoderTim 8f90c96019 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-13 20:45:55 -04:00
CoderTim 2016ea09cb Added achievements to games and Achievement enum 2014-10-13 20:38:58 -04:00
Chiss e41b10ccb8 minor UHC fix 2014-10-13 14:09:58 +11:00