3063 Commits

Author	SHA1	Message	Date
Chiss	64c8edc292	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-12-08 17:25:03 +11:00
Shaun Bennett	0759a373da	Fix treasure chest hologram	2014-12-07 01:25:36 -06:00
Jonathan Williams	60a46d5adf	Replaced Dwarf Toss with Block Toss in Clans.	2014-12-06 04:23:26 -08:00
Shaun Bennett	4a7b6bd33f	Blame chips	2014-12-06 01:10:08 -06:00
Shaun Bennett	7402eb2f91	Merge remote-tracking branch 'origin/master'	2014-12-06 01:00:40 -06:00
Shaun Bennett	b99da44873	Disable mail and notifications	2014-12-06 01:00:02 -06:00
Shaun Bennett	1276e0c0d5	Chat Slow Command	2014-12-05 21:33:31 -06: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
Jonathan Williams	21e80af6cb	Fixed Cosmetic menu buttons ... Removed map in wrong location Removed message for removing armor.	2014-12-05 01:15:25 -08:00
Jonathan Williams	828e8d4115	Fixed bug with ok buttons still active after clicking ok in confirmation page.	2014-12-04 23:48:22 -08:00
Jonathan Williams	3d3f9012ff	Added some base Clans shops. ... Added support for Gold Refactored failed db call code a bit.	2014-12-04 23:41:49 -08:00
Chiss	80971c2fe7	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-12-05 16:27:30 +11:00
Chiss	4430efd7be	minor updates	2014-12-05 16:25:34 +11:00
Shaun Bennett	54d8fe21fb	Notifications and stuffs?	2014-12-04 22:48:54 -06:00
Shaun Bennett	03bd2ed2c1	Make JsonMessage a little easier to use, might be worth it to increase functionality later as more complicated things are added to json text	2014-12-04 17:48:06 -06:00
Shaun Bennett	f48085d5ca	Merge remote-tracking branch 'origin/master'	2014-12-04 17:41:40 -06:00
Shaun Bennett	0bb2d1db5b	Some changes *_*	2014-12-04 17:29:47 -06:00
Jonathan Williams	fbcc774383	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-12-04 05:05:43 -08:00
Jonathan Williams	59f93d46ec	Refactored IButton ... Added ComplexButton Added Clans farming. Added Clans Recipes. Added Clans gameplay. Added shop files structure.	2014-12-04 05:05:27 -08: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
Jonathan Williams	1fd1e5cc34	Removed unused gem booster code.	2014-12-02 12:50:53 -08:00
Jonathan Williams	b0f13cc7f0	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-12-01 23:53:42 -08:00
Jonathan Williams	63506c9ebc	Changed message in CUST-1 ... Fixed how QueuedCommands are handled, don't rerun website api call if it succeeded.	2014-12-01 23:53:35 -08:00
Chiss	a8deee5292	fixed a spelling error	2014-12-02 18:04:48 +11:00
Chiss	340f5d87a4	removed debug	2014-12-02 12:30:59 +11:00
Chiss	e63ef8a607	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-12-02 11:50:03 +11:00
Chiss	5695e845ef	resistence no longer effects hold position.	2014-12-02 11:49:39 +11:00
Jonathan Williams	7a3b4771ee	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-12-01 16:14:15 -08:00
Jonathan Williams	384f296d60	checkPlayerName returns actual name (casing correct) ... Refactored chests/keys in support server. Fixed bug with enjin chest/key giver.	2014-12-01 16:14:02 -08: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	78a0aa7c96	Added checks to restart UHC servers stuck in restarting mode.	2014-12-01 03:34:37 -08:00
Jonathan Williams	0540168af7	Fixed CCM in AntiHack	2014-12-01 03:01:26 -08:00
Jonathan Williams	e7cf4eb51d	Removed use of Gem Boosters ... Cleaned up some unused imports.	2014-12-01 02:27:39 -08:00
Jonathan Williams	172f4d20b7	Removed gem transaction logging.	2014-12-01 02:22:51 -08:00
Jonathan Williams	3584c0d8af	Added Key/Chest support for EnjinListener	2014-12-01 02:03:46 -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	39faf35409	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-12-01 19:33:55 +11: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
Jonathan Williams	5038edc46b	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-12-01 00:07:33 -08:00
Jonathan Williams	171eec5a37	Removed reward logging.	2014-12-01 00:05:57 -08:00
libraryaddict	89892097d0	No one cares about ComplexItemLayout	2014-11-30 16:48:57 +13: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	effc026913	Lets just pretend this was the original commit..	2014-11-30 15:56:50 +13:00
libraryaddict	ec26b8b642	Max item amount is 10 for non-bow classes. So sayth Chiss	2014-11-30 15:55:57 +13:00
libraryaddict	0813f0a914	Instead of having a internal entityId. Use mojang's entityid's but add one everytime you want it. Also allow fetching of the next entityid to be used	2014-11-30 15:41:57 +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	5a281a56e9	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-29 03:17:53 -08:00
Jonathan Williams	9d32048b9e	Fixed merge conflict problem. ... Added spawn repository.	2014-11-29 03:17:33 -08: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
libraryaddict	6439fc93c2	Use metadata instead of storing the entity and location	2014-11-29 14:50:38 +13:00
Chiss	350a5cfcea	disabled brute skill	2014-11-29 11:21:44 +11:00
Jonathan Williams	4b2998793c	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-28 14:16:07 -08:00
Chiss	b3beadf8b5	made recharge look nicer for 1.7 ... added missing files	2014-11-29 09:14:33 +11:00
Jonathan Williams	54aefbf40d	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-28 14:10:28 -08:00
Chiss	ca34ac4e02	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-11-29 09:09:23 +11:00
Jonathan Williams	92ea94c3be	Fixed creating clan delay in clans/ClientClan.java ... Added logging for Mineplexer startup. Fixed return generated keys in RepoBase	2014-11-28 14:06:41 -08: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
libraryaddict	e56970a212	Let ShopItem no longer extend CraftItemStack and instead extend ItemStack to remain useful to other plugins and use ItemMeta	2014-11-29 07:21:37 +13:00
Jonathan Williams	515176b63f	Clans to buildable state.	2014-11-27 22:34:20 -08:00
Jonathan Williams	62a172e01b	Removed all the UUIDFetcher calls.	2014-11-27 22:34:05 -08: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	8d12b8e565	Check item has Lore before trying to use it	2014-11-28 09:30:27 +13:00
libraryaddict	d1b6aee802	Change ItemLayout to allow repeats of item arrays	2014-11-27 14:34:34 +13:00
libraryaddict	d731b6ee69	Registering of KitManager	2014-11-27 09:47:43 +13:00
libraryaddict	bd8ca593e8	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SearchAndDestroy	2014-11-27 08:06:13 +13:00
libraryaddict	ac0c024b1b	Use nmsPlayer.m() instead. This sets both the container to default and tells the open inventory to close. Which fixes any normal blocks like DoubleChest from remaining visually open to others.	2014-11-27 07:16:59 +13:00
Shaun Bennett	cded2c7d8f	Update Polls to use new MiniDbClientPlugin	2014-11-26 12:07:06 -06:00
libraryaddict	86fe7344c7	When another inventory is opened with a previous inventory already open, this fixes the cursor position from being reset to the center of the screen. For those interested. Its basically denying the inventory close packet from being sent.	2014-11-27 06:56:19 +13:00
Shaun Bennett	7c9226d6de	Fix mail to work with recent changes	2014-11-26 11:55:28 -06:00
libraryaddict	1bb4d902c6	Start on a kit manager	2014-11-27 06:44:46 +13:00
Shaun Bennett	c73a9f3bd5	Merge remote-tracking branch 'origin/master'	2014-11-26 11:39:13 -06:00
libraryaddict	34e320dfee	Create untested ItemLayouts for your customized layouts of your items. ... If you look to your right (ComplexItemLayout) you can define layouts such as "XX(de)XX(fg)XX" then call to replace all occurances of the letter d with this item. The (de) will then be set to that item.	2014-11-27 06:03:28 +13:00
libraryaddict	9350aeb89a	Use holograms in game	2014-11-27 03:18:52 +13:00
libraryaddict	b160822260	Add follow entity to holograms	2014-11-27 03:17:59 +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	c76ad50136	Allow removal of packet handler	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	84b56708f9	Added new class ItemBuilder for chain building ItemStacks	2014-11-27 01:08:38 +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
libraryaddict	30e2de6f22	Remove the 'Made by Shaun'	2014-11-27 00:50:02 +13:00
Jonathan Williams	00e372820b	Fixed UI update when purchasing items.	2014-11-26 02:13:19 -08:00
Jonathan Williams	2afe84d7c7	Fixed stupid query thing....defek7. ... Removed extra logging.	2014-11-26 00:59:10 -08:00
libraryaddict	3ad3fb21ff	Fix up mistakes in the previous modifications	2014-11-26 21:35:45 +13:00
Jonathan Williams	f39e3dcec7	Fixed traversing resultSets.	2014-11-26 00:08:51 -08:00
Jonathan Williams	06526d1e96	Fixed sql bug in FriendRepository ... move/cleanup in RepoBase	2014-11-25 21:45:34 -08:00
Jonathan Williams	15d129d184	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex ... Conflicts: Plugins/Mineplex.Core/src/mineplex/core/benefit/BenefitData.java	2014-11-25 21:18:12 -08:00
Jonathan Williams	909877c869	Wiggle left, wiggle right, hope this works.	2014-11-25 21:17:30 -08:00
Chiss	4ccb242066	i added a space!	2014-11-26 16:02:11 +11: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	d9c06e0fd3	Shauny!	2014-11-25 13:26:30 -08: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
libraryaddict	3c76fde190	Ignore wither skulls for CustomTagFix	2014-11-26 09:51:08 +13:00
libraryaddict	141c08ceb8	Remove old holograms and add new holograms	2014-11-26 09:18:36 +13: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	1198426d8d	Little more work on Clans.	2014-11-23 05:08:33 -08:00
Jonathan Williams	cb43bc04d3	Added /lobby	2014-11-23 03:35:16 -08:00
Chiss	2871446f74	reduced max amount of blocks from explosions	2014-11-23 15:01:04 +11: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	50b2870705	changed locked ability icon to diamond	2014-11-23 14:13:00 +11:00
Jonathan Williams	dc5584d51b	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-22 17:52:30 -08:00
Jonathan Williams	37b5e495b8	Update local cache of inventory and if fail, revert change. ... Removed full lock on login. Removed Thanskgiving benefit.	2014-11-22 17:52:22 -08:00
Chiss	0e4b21e6b1	disabled charge skills being usable in hub	2014-11-23 11:46:47 +11:00
Chiss	f0c87e439a	fixed nametag color in paintball	2014-11-23 11:16:01 +11:00
Chiss	b3a9410e54	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-11-23 10:36:11 +11:00
Chiss	01f0e5fab4	fixed static laser not doing less dmg when not charged	2014-11-23 10:35:56 +11:00
Jonathan Williams	695ed95b5d	Fixed StaffServer commands for inventory.	2014-11-21 18:34:28 -08:00
Jonathan Williams	390c0dfff3	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-21 18:30:38 -08:00
Jonathan Williams	6efa416d81	Fixed glitching dom items in Hub due to portal throw.	2014-11-21 18:30:26 -08:00
Chiss	19d3bba461	fixed fence glitch in dom	2014-11-22 13:20:34 +11:00
Chiss	8a4de9bbdc	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-11-22 10:29:12 +11:00
Chiss	6dfcdce027	increased illusion cooldown ... cleaned axethrow	2014-11-22 10:29:00 +11:00
Jonathan Williams	d1578b12d4	Removed extra console logging.	2014-11-21 14:45:55 -08:00
Jonathan Williams	7bd12ab850	Re-did benefits and inventory to only update locally if db succeeeds......DOH	2014-11-21 14:41:25 -08:00
Jonathan Williams	3dfd7e6036	Fixed Champions bug with losing builds.	2014-11-21 14:39:51 -08:00
Jonathan Williams	64a1426463	Added custom build load check on login.	2014-11-20 23:52:56 -08:00
Jonathan Williams	29204de987	Removed old benefits. ... Added youtube rank application from Owner Fixed Dom bug : https://trello.com/c/OtwrpFXg/90-champions-24-skill-tokens-2-item-tokens-in-champions-so-broken	2014-11-20 21:58:39 -08:00
Jonathan Williams	2446e6d64d	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-20 21:42:40 -08:00
Jonathan Williams	1f5be77880	Fixed text in Dom shop. ... Cleaned up some code in benefit stuff.	2014-11-20 21:42:33 -08:00
Chiss	f1ba5947a4	Some more wither updates	2014-11-21 16:32:12 +11:00
Jonathan Williams	6c63552480	Refactored RankBenefitsGiver9000 ... Added Thanksgiving benefits (1 treasure key). ServerMonitor now ignores Testing group.	2014-11-20 21:24:23 -08: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
Shaun Bennett	a73ee4e306	Structure for Mail system, not finished yet.	2014-11-20 14:41:25 -06:00
Jonathan Williams	77b47c9e13	Fixed UI achievement skill stuff.	2014-11-20 08:50:25 -08: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
Jonathan Williams	ab78b4b89d	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-19 22:25:17 -08:00
Jonathan Williams	1a6b80b08e	More work on clans.. ... Finished ClansDataAccessLayer Finished ClansAdmin Finished ClansDisplay	2014-11-19 22:24:36 -08:00
Jonathan Williams	828b866fc1	Added functionality to RepositoryBase to return generated keys. ... Prevent invalid UUID from jacking up web call in Enjin listener.	2014-11-19 22:23:42 -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
Jonathan Williams	13ba32f2f4	Added command queueing for failed commands in EnjinTranslator. ... Added verification of coin/gem application in Web api. Added code to support polling last 100 purchases with EnjinTranslator Added UUId lookup to CoreClientManager and fixed Async to Async calls with DatabaseRunnable.	2014-11-17 14:06:38 -08:00
Chiss	2384b91b06	game timer > advertisement	2014-11-16 14:45:18 +11:00
Chiss	900c31f479	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-11-16 14:41:11 +11:00
Chiss	cd890e6c6c	disabled spec menu in minestrike - fixes shop bug.	2014-11-16 14:40:50 +11:00
Jonathan Williams	2e58342032	Removed MS from beta.	2014-11-15 19:27:37 -08:00
Jonathan Williams	24b59e5a9d	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-15 16:26:39 -08:00
Chiss	4c3610c3ac	fixed DMT silence	2014-11-16 10:46:26 +11:00
Jonathan Williams	99ff386ac1	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-15 14:32:40 -08:00
Chiss	454deb03db	fixed SG crash bug	2014-11-16 09:31:03 +11:00
Jonathan Williams	ad6f41e1c6	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-15 03:42:57 -08: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
Jonathan Williams	81b5317376	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-15 03:31:01 -08:00
Chiss	fb70b76d29	FINGERS CROSSED	2014-11-15 22:29:53 +11:00
Jonathan Williams	857ff29461	Removed buggy player disguises. ... Removed datavalues from wither disguise.	2014-11-15 03:21:48 -08:00
Jonathan Williams	531b242cce	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-15 03:08:35 -08: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
Jonathan Williams	48c522a86b	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-15 03:03:52 -08:00
Chiss	8d6793060c	made early levels a little easier to progress through	2014-11-15 21:33:28 +11:00
Jonathan Williams	2af66c99e7	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-15 01:17:21 -08:00
Chiss	41b6296788	Wither no longer shoots in pregame lobby	2014-11-15 20:16:18 +11:00
Jonathan Williams	df76f6be10	More work on Clans.	2014-11-15 01:13:14 -08:00
Jonathan Williams	685a2899ca	Added custom name to wither disguise.	2014-11-15 01:12:58 -08: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
Jonathan Williams	2cf76ae5b4	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-13 19:15:05 -08:00
Jonathan Williams	4812da2cd9	More work on Clans - Clan repository.	2014-11-13 19:14:56 -08:00
Jonathan Williams	1ee16d284d	Updated StaffServer packages to reflect enjin shop.	2014-11-13 19:14:43 -08:00
Chiss	8ab0116a27	initial push of Wither Assault	2014-11-14 14:14:31 +11:00
Jonathan Williams	62fbeeda20	Added Wither disguise.	2014-11-13 19:14:14 -08: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
Chiss	c5a873ffab	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-11-13 14:40:26 +11:00
Chiss	f9f7a834c2	geno morf	2014-11-13 14:38:33 +11: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
Jonathan Williams	0193c397fb	Added Kit unlocks to staff server ... Added password persistence in db.	2014-11-12 19:20:41 -08:00
CoderTim	d363637015	Achievement bug fixes	2014-11-12 20:56:57 -05:00
Jonathan Williams	2e848c2ac2	Fixed some of twiggy conflicts.	2014-11-12 05:13:58 -08:00
Jonathan Williams	8d62966abc	Created Clans project. ... Converted Fields code complete (not tested).	2014-11-12 05:13:16 -08:00
Chiss	71a93bead5	Updated punish to be even less confuse.	2014-11-12 09:49:03 +11:00
Chiss	d7141e4943	Added warning note to punish	2014-11-11 20:02:35 +11:00
Chiss	f7ad986503	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-11-11 19:05:58 +11:00
Chiss	debf8ebcba	fixed chat not being unsilenced when someone picks word	2014-11-11 18:52:00 +11:00
Shaun Bennett	c0f2f8a88c	Remove useless comment/import	2014-11-11 01:47:03 -06:00
Chiss	c37026e4df	SSM Dom changes	2014-11-11 18:36:32 +11:00
Shaun Bennett	23ab9756dc	Merge remote-tracking branch 'origin/master'	2014-11-11 01:32:55 -06:00
Jonathan Williams	b08cd54666	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-10 23:31:38 -08:00
Jonathan Williams	827fef535f	Some commented out testing code in DisguiseManager	2014-11-10 23:30:41 -08:00
Jonathan Williams	108421164c	Added support for stats with spaces in them for GiveStat.	2014-11-10 23:30:16 -08:00
Shaun Bennett	cf25d17c66	Update craftbukkit.jar with command event	2014-11-10 23:53:08 -06:00
Shaun Bennett	5b9b7347c6	Add tab complete processing for commands	2014-11-10 23:49:35 -06:00
Chiss	6c6c51e950	fixed compilation problems	2014-11-11 14:28:35 +11:00
Chiss	91f92dc7e1	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-11-11 12:25:52 +11:00
Chiss	a1eff92bbb	fixed achievement kit for sneaky not being accessible	2014-11-11 12:25:36 +11:00
MrTwiggy	e3c50bfb39	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex ... Conflicts: Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java Plugins/Mineplex.ServerData/src/mineplex/serverdata/ServerCommandManager.java	2014-11-10 18:55:57 -05:00
MrTwiggy	920bdad64c	Player report system commit, including functionality for long-form MySQL storage of report logs as well as real-time redis based report sessions.	2014-11-10 18:44:46 -05: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	d5515d11b2	fixed kick reason for bans	2014-11-09 14:27:01 +11:00
Chiss	6405253b1c	added word wrap on punish text in GUI ... only staff+punishee will now see punishments	2014-11-09 14:09:30 +11:00
Chiss	3c39e3d93a	changed sev2/3 hack punishements ... updated ban kick/login messages	2014-11-09 13:47:25 +11:00
Chiss	a1f7fc5187	warnings are now friendly :) ... reach hack detection base	2014-11-09 12:22:55 +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
Jonathan Williams	403165edf4	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-08 14:32:48 -08:00
Jonathan Williams	2781bb3000	Removed stacking buffers.	2014-11-08 14:32:37 -08:00
Jonathan Williams	7fb679e7f5	Changed lobbyBalancer to send one player to each lobby that wasn't full.	2014-11-08 14:32:24 -08: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	b6904f2ae1	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-11-08 18:36: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
Jonathan Williams	f03fe663f6	Simplified Lobby balancer code to randomize server selection on best 10 servers. ... Increased rate at which bungee retrieves server information. Increased rate at with servers sends server information.	2014-11-07 22:04:51 -08:00
Jonathan Williams	c310ba734b	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-07 16:09:05 -08: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
Jonathan Williams	0a874d0ee3	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-07 16:04:14 -08:00
Chiss	8c74022996	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-11-08 11:04:06 +11:00
Jonathan Williams	48c627db74	UHC tweaks and message changes.	2014-11-07 16:04:06 -08: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
CoderTim	96f54c2949	Made DBPool class uninstantiatable	2014-11-07 18:27:20 -05:00
Chiss	75c07588a5	UHC wont start for 2 minutes after creation	2014-11-08 10:22:23 +11:00
Chiss	24725eb22e	play a sound when you get punished	2014-11-08 10:15:46 +11:00
Chiss	44fbd9fdd2	updated punishment output. ... punishee is now informed of the reason in chat.	2014-11-08 10:11:12 +11:00
Chiss	3a3c2002f5	fixed level exp requirements	2014-11-08 09:17:59 +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
Jonathan Williams	5c6f12db20	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-07 02:35:48 -08:00
Jonathan Williams	33696d1e28	Fixed null resourcePack problem.	2014-11-07 02:35:38 -08: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
Jonathan Williams	f0099368d0	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-07 01:27:16 -08:00
Jonathan Williams	264df5af79	Fixed load time issue with ServerConfiguration.	2014-11-07 01:27:07 -08:00
Chiss	c245f84593	increased exp per level in mineplex level achievemnet	2014-11-07 20:10:15 +11: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	cd4d2c16a8	Fixed fortitude healing too much	2014-11-07 14:07:22 +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	44ccd452a3	Added ServerConfiguration. ... Added support to enable whitelist, alter max players and pvp value.	2014-11-05 14:44:56 -08:00
Jonathan Williams	4722062a36	Friend: ... Prevent display of staff servers to non-staff. Prevent display of CUST servers from everyone.	2014-11-05 14:44:25 -08:00
Jonathan Williams	4254225462	CoinBombs and GemBombs now queue their amounts to prevent excessive database calls. ... Removed excess account row information retrieval on web api when awarding gems/coins. Added account specific transactional locks in webapi.	2014-11-05 14:42:11 -08:00
Jonathan Williams	ecad60eee3	Added PlayerTracker to Mineplexer ... Changed how max players is displayed in Mineplexer Added a cut-off of 900 players for each bungee in BungeeRotator, minimum of two records.	2014-11-05 14:40:40 -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	a66c3486d3	fixed bug in foot particle.	2014-11-05 11:35:52 +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	3a6968a60b	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-11-04 19:17:21 +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
Shaun Bennett	a2f7a84120	Fix Hub Rule Book	2014-11-03 18:46:49 -06:00
Shaun Bennett	174b1f43c4	GiveItem Fixes	2014-11-03 18:24:56 -06:00
Shaun Bennett	50ea13910a	Change GiveItem command to Dev+	2014-11-03 10:26:08 -06: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
Jonathan Williams	30a1df1473	Fix for null pointer in particle foot.	2014-11-01 02:38:59 -07:00
Jonathan Williams	d64e8c5162	Added max of 10 connections for db pool.	2014-11-01 02:35:36 -07:00
Jonathan Williams	86fb78e34c	minor Unused code cleanup	2014-10-31 23:32:59 -07:00
Jonathan Williams	fa0049d22a	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-31 23:01:15 -07:00
Jonathan Williams	f206441999	Fix partial commit.	2014-10-31 23:00:53 -07:00
Jonathan Williams	c85ba72730	Added null check for dragooon. ... Added two treasure keys for halloween give away.	2014-10-31 23:00:13 -07: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
Jonathan Williams	f1966be6a2	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-31 17:29:57 -07:00
Chiss	7f642673bc	fixed deathbomber achievement	2014-11-01 11:25:08 +11:00
Jonathan Williams	1f26aee006	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-31 17:12:27 -07:00
Chiss	0095a03df7	returned bridges to normal	2014-11-01 11:11:35 +11:00
Jonathan Williams	2aced64191	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-31 17:03:15 -07:00
Jonathan Williams	45da22b0bf	Fixed bug with parkour enchantment checks.	2014-10-31 17:03:06 -07: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	b5ef46007f	updated npc info	2014-10-31 18:17:12 +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	50a2bcda66	BACK FROM THE DEAD	2014-10-31 15:40:40 +11:00
Chiss	de08456093	fixed error in block restore	2014-10-31 10:47:18 +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	22daf54f35	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-30 18:20:29 -04:00
CoderTim	cc8912b27e	Added NPC info messages to NpcManager	2014-10-30 18:20:21 -04:00
Jonathan Williams	bd19369ddb	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-29 17:16:00 -07:00
Jonathan Williams	2f563f8277	BungeeRotator project.	2014-10-29 17:15:32 -07:00
CoderTim	ee0aa1375d	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-29 19:14:57 -04:00
CoderTim	50a457ba51	Database pool tweaks	2014-10-29 19:13:28 -04:00
CoderTim	4fc291ea80	Everything but Mineplexer using database pool	2014-10-29 18:43:21 -04: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
Shaun Bennett	9819b6c10a	Merge remote-tracking branch 'origin/master'	2014-10-27 20:25:47 -05:00
Shaun Bennett	054c26dfbc	New Coin/Gem Command	2014-10-27 19:59:30 -05:00
Shaun Bennett	01d44cd250	Give Item Command	2014-10-27 19:25:59 -05: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
Jonathan Williams	006e20bb13	Prevent more than 5 players from being processed at a time on server connect.	2014-10-27 04:35:05 -07:00
Jonathan Williams	e926fc1f10	Fixed TransferCommand	2014-10-27 04:34:35 -07:00
Jonathan Williams	0ee9619d3e	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-25 14:35:12 -07:00
Jonathan Williams	ead014f65e	Increased server startup time to 30 seconds.	2014-10-25 14:34:38 -07:00
CoderTim	a1c4b8840f	NpcManager no longer uses database connection pool	2014-10-25 16:51:58 -04:00
Chiss	849d5f1471	lowered gem rewards for MS a little	2014-10-25 18:37:18 +11: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
Jonathan Williams	6f541a8d30	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-24 18:00:18 -07:00
Jonathan Williams	04ba68293e	Removed debug.	2014-10-24 18:00:10 -07: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
Jonathan Williams	27dc9f7693	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-23 23:58:24 -07:00
Jonathan Williams	d4900c38b1	Halloween server max. ... CustomTagFix fix for invis armor stand on your own head.	2014-10-23 23:58:13 -07:00
Chiss	b47dcf12af	remvoed debug rank	2014-10-23 14:06:06 +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
CoderTim	f52a89d2ca	NpcManager teleports slimes correctly	2014-10-20 18:19:19 -04:00
CoderTim	db3354176c	NpcManager stores test server NPCs under a different server name	2014-10-20 18:08:28 -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	daf2dc3903	Purhcased ranks will no longer override staff ranks.	2014-10-17 23:39:14 -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	075bc0af1d	Added gem rewards for MS achievements	2014-10-17 21:20:04 +11:00
Jonathan Williams	98ffa53128	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-17 03:34:47 -05:00
Chiss	752537b0f6	missing hubtype	2014-10-17 18:59:04 +11:00
Jonathan Williams	2bbb29c8bb	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-17 02:57:30 -05:00
Chiss	f5efea1e9a	Missing files	2014-10-17 18:34:23 +11:00
Jonathan Williams	6d38f4e238	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-17 00:42:01 -05:00
Jonathan Williams	8466b8e2dd	Fixed building issues with EnjinTranslator ... MAde mysql repo always record rank change even if windows return rank is different. Added rough single player replay functionality.	2014-10-17 00:41:23 -05:00
Chiss	fea3793fca	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-10-17 13:31:25 +11:00
CoderTim	248438535b	Preserve pitch and yaw in NpcManager teleportations	2014-10-16 22:31:09 -04:00
CoderTim	930cdf6c07	Hide NpcManager blank custom names	2014-10-16 22:24:24 -04:00
Chiss	5fb4f3324d	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-10-17 13:20:09 +11:00
CoderTim	edb2c4f26a	Merge remote-tracking branch 'origin/master'	2014-10-16 22:15:20 -04:00
CoderTim	1fb21d6143	Fixed some NpcManager bugs	2014-10-16 22:13:41 -04:00
Chiss	727e137cc4	Final HH Update	2014-10-17 12:12:22 +11:00
Shaun Bennett	ec81e9f511	Merge remote-tracking branch 'origin/master' ... Conflicts: Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java	2014-10-16 17:51:32 -05:00
Shaun Bennett	c855c46940	Add coin command for online players, better way to handle this soon	2014-10-16 17:46:00 -05:00
Chiss	5db2c072a0	Halloween update	2014-10-16 16:27:09 +11:00
Chiss	c30171d24f	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-10-16 12:03:09 +11:00
CoderTim	233e6d0b46	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-15 20:44:50 -04:00
CoderTim	535506393f	Added ability to customize NPC zombie adulthood, slime size, and villager profession	2014-10-15 20:44:42 -04:00
Shaun Bennett	76dc735b6b	Fix bug I was getting with ShopItem	2014-10-15 15:05:31 -05:00
Shaun Bennett	5cdd502d11	Auto backups for MapParser. (Only tested on mac)	2014-10-15 15:04:44 -05:00
Shaun Bennett	58f69b49d7	Add new chat features to JsonMessage	2014-10-15 11:11:32 -05:00
Shaun Bennett	62d4804aa6	Update Craftbukkit.jar for new chat features	2014-10-15 11:10:28 -05:00
Shaun Bennett	e732523dcd	Merge remote-tracking branch 'origin/master'	2014-10-15 10:31:45 -05:00
Chiss	82e95f714a	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-10-15 16:57:38 +11:00
Chiss	b83b0e61e6	fixed long lines in achievements ... added night to halloween maps in parser	2014-10-15 16:57:25 +11:00
Jonathan Williams	a6a4808222	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-15 00:27:01 -05:00
Jonathan Williams	a81bdb4e32	Fixed bug with armor stands showing up for customNameVisible = false;	2014-10-15 00:26:36 -05:00
Chiss	c3fdae135e	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-10-15 16:11:08 +11:00
CoderTim	25b10f0925	Added /npc refresh command to NpcManager	2014-10-15 01:04:52 -04:00
CoderTim	ed64c1972d	Update accountStats rows before inserting to prevent id column from skipping on failed inserts	2014-10-15 00:54:23 -04:00
Chiss	d8a8061746	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-10-15 15:44:41 +11:00
Chiss	eb5af41323	Added halloween reward pet ... minor bug fixes	2014-10-15 15:44:26 +11:00
CoderTim	2a18888922	Improved NpcManager to work with persistent maps	2014-10-14 22:22:17 -04:00
Shaun Bennett	130b932f40	Fix typo in Free Server Timer	2014-10-14 14:30:44 -05:00
CoderTim	256df99b7b	Added MineStrike to achievement gui	2014-10-13 23:48:38 -04:00
CoderTim	3ba748f2de	Merge branch 'feature/currency-log'	2014-10-13 23:13:44 -04:00
Jonathan Williams	1dd51bcac5	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-13 21:07:10 -05: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
Jonathan Williams	0194a041e2	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-12 20:57:32 -07:00
Jonathan Williams	3e7787a354	Fix for customer support GemHunterCommand ... Fix for UUIDFethcer pulling while player is online.	2014-10-12 20:57:17 -07:00
Chiss	a4b85053d9	fixed bug where blockmorph was crashing hubs.	2014-10-13 14:56:19 +11:00
Chiss	25fbe24d20	improved sound output of coin bomb	2014-10-13 14:13:57 +11:00
Chiss	e41b10ccb8	minor UHC fix	2014-10-13 14:09:58 +11:00
Chiss	9b1c4783ce	lowered UHC win to 8k	2014-10-13 09:57:38 +11:00
Chiss	6e6e0e2ae0	added flags to disable gem multipliers per-game. UHC was giving too much :O	2014-10-13 09:44:30 +11:00
Chiss	a8d1cef933	Minestrike, ensure bomb does not get overridden.	2014-10-12 18:31:05 +11:00
Chiss	623cdb0f2c	Allowed players to rejoin if disconnect within first 10 minutes of UHC.	2014-10-12 18:27:49 +11:00
Chiss	603c0cb66e	Staggered UHC game teleports to help reduce lag.	2014-10-12 18:26:18 +11:00
Chiss	28285ab999	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-10-12 14:19:52 +11:00
Chiss	9cc28d1ad8	MAC Update	2014-10-12 14:19:35 +11:00
MrTwiggy	a3e6613a94	a	2014-10-11 15:53:43 -04:00
Jonathan Williams	3e92b02bab	Fixed max slot bug with ultra/hero	2014-10-11 05:56:47 -07:00
Chiss	42d22ac38f	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-10-11 23:10:09 +11:00
Chiss	1d3b792ed8	UHC head apple fixes	2014-10-11 23:09:56 +11:00
Jonathan Williams	d3788e8ddc	Fixed redis server time functions. ... Added kill option for servers with motd Finished in servermonitor	2014-10-11 04:40:53 -07:00
Chiss	9c8ed5360d	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-10-11 21:01:52 +11:00
Chiss	8e071f59d6	missing file	2014-10-11 20:59:36 +11:00
Jonathan Williams	d407cc7c4c	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-11 02:57:01 -07:00
Chiss	95a4a34b47	UHC announcement Title	2014-10-11 20:55:48 +11:00
Jonathan Williams	8ace0ce07c	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-11 02:55:45 -07:00
Chiss	316ce38056	Changed Utility time to ms	2014-10-11 20:53:39 +11:00
Jonathan Williams	797dd002ad	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-11 02:43:56 -07:00
Jonathan Williams	1a10ddb6a4	Fix for Open in	2014-10-11 02:43:02 -07:00
Jonathan Williams	a54b78fefa	Added Mine-Strike to Quick Game menu. ... Fixed up CoreClientManager's rank update.	2014-10-11 02:32:02 -07:00
Chiss	a2df64787f	remove players from closed game, on update	2014-10-11 20:30:40 +11:00
Chiss	961163c135	delaying return to hub	2014-10-11 20:26:08 +11:00
Chiss	a7ceb24b15	Hub UHC time log	2014-10-11 20:10:48 +11:00
Chiss	dc0709f17e	HH Update ... Added UHC to skytext for hub	2014-10-11 19:43:28 +11:00
Jonathan Williams	19afebe53d	Added in mysql hooks for coins/gems/ranks for database conversion preperation. ... Added in failover database calls in CoreClient/DonationManager	2014-10-11 01:32:22 -07:00
Chiss	e2c72a3ae2	HH update	2014-10-11 14:28:00 +11:00
CoderTim	3422f48325	New acheivements	2014-10-10 21:49:03 -04:00
Chiss	b61979a31f	UHC anti-xray; veins can now contain multiple ores. prevents veins occluded by other veins being removed.	2014-10-10 19:05:04 +11:00
Chiss	7d1a62e810	UHC anti-xray visibility update	2014-10-10 18:58:12 +11:00
Chiss	0acaf2e426	removed anti-xray on coal	2014-10-10 18:56:21 +11:00
Chiss	d0d2622ecc	added UHC on-the-fly anti-xray	2014-10-10 18:54:38 +11:00
Chiss	a739712dca	fixed game autostart flag bug. ... added UHC gem rewards	2014-10-10 15:26:04 +11:00
Chiss	e3747b5183	Minestrike fixes ... Hub UHC announcer	2014-10-10 13:07:59 +11:00
Chiss	232dd231d0	UHC joinability/MOTD ... Minestrike spec shop bug fix	2014-10-10 10:49:39 +11:00
Chiss	ffc2ff5058	Modifided output of friends list ... - buttons to left side for alignment - sorted by sent>offline>pending>online - improved 'no friends' message	2014-10-09 12:15:45 +11:00
Chiss	4bed45c48c	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-10-09 10:47:47 +11:00
Chiss	8701f9ddcc	Added TabTitle ... Converted MineStrike to use scoreboard name hiding	2014-10-09 10:35:54 +11:00
Shaun Bennett	4755965808	Merge remote-tracking branch 'origin/master'	2014-10-05 21:18:11 -05:00
Shaun Bennett	1bb3f23ba4	Update craftbukkit.jar with 1.8 scoreboard team nametag visibility	2014-10-05 21:17:32 -05:00
Shaun Bennett	2a2191f23b	Saving some changes to craftbukkit -> adds 1.8 nametag visibility option for teams	2014-10-05 21:16:40 -05:00
Chiss	7a345dce95	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-10-05 13:40:15 +11:00
Chiss	d3f87dff46	MineStrike update	2014-10-05 13:37:27 +11:00
Jonathan Williams	bf11635616	Fixed GemHunter in StaffServer and added offline stat increment :)	2014-10-04 15:43:33 -07:00
Shaun Bennett	39b03b7533	Change time command to mod+	2014-10-04 00:20:35 -05:00
Shaun Bennett	520ade8249	Merge remote-tracking branch 'origin/master'	2014-10-03 20:41:06 -05:00
Shaun Bennett	ef82aa08b1	Time command for mod+	2014-10-03 20:40:58 -05:00
Jonathan Williams	66457ded60	Fix initial friends date load for offline time.	2014-10-03 02:05:55 -07:00
Jonathan Williams	70122db510	Updated staff server gem hunter packages.	2014-10-03 01:56:02 -07:00
Jonathan Williams	9033843a31	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-03 01:50:35 -07:00
Jonathan Williams	c641eab3c7	Fixed up friends.	2014-10-03 01:50:23 -07:00
CoderTim	b78132ebfc	Renamed NpcManager methods	2014-10-02 22:18:25 -04:00
CoderTim	addc423c2d	Added /npc clear back	2014-10-02 22:15:12 -04:00
CoderTim	f6f484c134	Refactored /npc commands	2014-10-02 22:08:00 -04:00
Chiss	42e60d0856	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-10-03 11:27:37 +10:00
Shaun Bennett	4253c08682	Fix time	2014-10-02 20:25:50 -05:00
Chiss	8359c9a7b4	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-10-03 11:17:53 +10:00
Chiss	cda9234ad3	Fixed TimeInGame stat not recording sometimes	2014-10-03 11:17:36 +10:00
Shaun Bennett	825f08b6a7	Merge remote-tracking branch 'origin/master'	2014-10-02 20:01:45 -05:00
Shaun Bennett	a6fea938b9	Fix some duplicate code	2014-10-02 20:01:33 -05:00
Chiss	17e34e2060	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-10-03 10:49:42 +10:00
Chiss	31ceaad7fe	MineStrike audio update	2014-10-03 10:49:26 +10:00
Shaun Bennett	07576a2b12	Add gamesplayed and timeingame to gui	2014-10-02 19:48:25 -05:00
Jonathan Williams	9b2a2cbbd6	Fixed mounting blocks on yourself in 1.8 ... Added temp fix so 1.8 players can ride dragons again. Removed Block form in parkour and fly for block form.	2014-10-01 02:12:11 -07:00
Jonathan Williams	c2b84cc60f	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-09-30 12:20:14 -07:00
Jonathan Williams	0228ef5921	Staff server work to include treasure chests/keys and gem hunter level 8, 12.	2014-09-30 12:20:01 -07:00
CoderTim	a5a2c1a837	Partially done refactoring NpcManager	2014-09-30 11:03:23 -04:00
CoderTim	ce306e88ed	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-09-30 02:45:28 -04:00
CoderTim	70fd8835ac	Added GamesPlayed and TimeInGame stats	2014-09-30 02:45:20 -04:00
Shaun Bennett	c7d34e70ef	Merge remote-tracking branch 'origin/master'	2014-09-29 17:42:13 -05:00
Shaun Bennett	92f8dc7f61	Add velocity toggle for mod+	2014-09-29 17:17:02 -05:00
Jonathan Williams	552a861c8b	Fixed class path for PvP project.	2014-09-29 12:13:38 -07:00
Jonathan Williams	36cbe55a49	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-09-29 12:13:08 -07:00
Shaun Bennett	7892c442d0	Add show mac reports user pref for mod+	2014-09-29 11:14:20 -05:00
CoderTim	578b5702bc	Added commons-dbcp2.jar dependency to Mineplex.Core in eclipse	2014-09-27 04:18:19 -04:00
Peter Miller	1bf5debc06	Updating DDoSProtectionSwitcher switchServer() method to launch remote script for IP change instead of local.	2014-09-27 00:45:52 -04:00
Jonathan Williams	eaee6c2733	AWork on FRiends.	2014-09-26 12:38:51 -07:00
Jonathan Williams	34baa8eafb	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-09-25 23:27:19 -07:00
Jonathan Williams	8bca23f0ba	Fixed bug with custom tag fix :P ... Fixed bug with server group up time check in servermonitor.	2014-09-25 23:27:08 -07:00
Chiss	895878ee40	Removing old items, fix for a larger problemo	2014-09-26 09:33:12 +10:00
Shaun Bennett	7ee4f549f8	Merge remote-tracking branch 'origin/master'	2014-09-25 18:04:06 -05:00
MrTwiggy	fc98cf4f6c	Add callback feature set for cross-server command system to reduce dependencies, clean up old constant references and add in ability to initialize server name on ServerData. Clean up old 'this' references to '_' prefixed variables and standardize field naming.	2014-09-25 17:17:38 -04:00
CoderTim	ba2f0e37ef	Log changes in players' coins to database	2014-09-25 17:03:26 -04:00
Jonathan Williams	91ca7fa6c6	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-09-25 05:37:21 -07:00
Jonathan Williams	e29dd4ff71	Fixes for ServerMonitor.	2014-09-25 05:37:10 -07:00
Chiss	79e808814a	Minestrike cleans up incendiary at the end of rounds	2014-09-25 20:52:13 +10:00
Jonathan Williams	1f0bd462e3	Fix for CustomTagFix leak.	2014-09-24 22:14:26 -07:00
Shaun Bennett	f5c8b2b1ac	Fix renaming pets for 1.8 clients	2014-09-24 22:31:09 -05:00
Shaun Bennett	57487e78cf	Fix Gem Booster display bug	2014-09-24 21:59:25 -05:00
Jonathan Williams	a54a2aadc0	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-09-24 01:32:03 -07:00
Jonathan Williams	d32085f05b	Removed tab list stuff for friends. ... Implemented rudimentary friends chat list. removed unused code in server stuff. Added null check for retrieving server statuses.	2014-09-24 01:31:56 -07:00
Chiss	969c7c0fde	Music gadget fixes ... Tournament point tally Removed snow from frosty HorseMount Added Tournament hub invite messages	2014-09-24 15:46:55 +10:00
Shaun Bennett	efa03945cb	Delete the MapParser zip file from root directory after copied	2014-09-23 17:05:21 -05:00
CoderTim	efb3c26115	Switched back to the latest craftbukkit.jar	2014-09-22 03:59:28 -04:00
CoderTim	acc056d32d	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-09-22 03:56:16 -04:00
Chiss	5774de552d	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-09-22 17:53:39 +10:00
Chiss	a58335d906	Added GameStatManager.java	2014-09-22 17:46:36 +10:00
CoderTim	00c8bfbd61	Changed BungeeSign dependency to bukkit.jar to match dependencies in eclipse	2014-09-22 03:46:05 -04:00
CoderTim	77e21c0d99	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-09-22 02:53:55 -04:00
MrTwiggy	5c9ee3e79e	Add ServerCommand system for live cross-server commands,. Update Queuer to support Redis based database and functionality. Fix ServerStatus start up dates to synchronize properly with central Redis time. Add new DataRepository's for easier dynamic object storage in redis. Update Portal server-transfers to support new cross-server command system rather than database stored server transfers.	2014-09-21 20:42:47 -04:00
CoderTim	1949de4fd7	Database implementation of NpcManager partially complete	2014-09-21 15:45:15 -04:00
Chiss	7ca4b6830b	added in GameStatManager	2014-09-21 09:28:12 +10:00
Chiss	9fce0b1926	Added small cooldown to be able to click hub clock after your gamestate changes. (prevents accidental clicking) ... Moved stat stuff to gamemanager.	2014-09-21 09:26:34 +10:00
Chiss	767a0247a6	More change to end game title :)	2014-09-20 16:36:30 +10:00
Chiss	6e60c301cf	fixed Title for end game	2014-09-20 16:33:24 +10:00
Chiss	d9677ddda2	Disabled saving game player log for non-tournament	2014-09-20 16:28:45 +10:00
Chiss	a830c72d22	Jukebox will be removed.	2014-09-20 15:29:59 +10:00
Chiss	be3e10a412	Treasure now reverts BlockRestore changes before changing blocks. Prevents artifact blocks being left behind.	2014-09-20 09:31:06 +10:00
Chiss	0d090d7bdc	fixed issue with MASSSSSSSSSIVE PLANET SIZED gui scale ... added lore to coins in GUI, to help new players and sell more ranks slightly lowered hitbox for headshots in minestrike	2014-09-20 09:10:55 +10:00
Chiss	9bbac7578e	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex ... Conflicts: Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java Plugins/Mineplex.Hub/src/mineplex/hub/modules/ParkourManager.java	2014-09-20 08:29:06 +10:00
Jonathan Williams	960b0aa69e	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex ... Conflicts: Plugins/Mineplex.Hub/src/mineplex/hub/modules/ParkourManager.java	2014-09-19 09:23:52 -10:00
Shaun Bennett	ed85779876	Fix Treasure painball gun issue, fix parkour paintbull gun issue	2014-09-19 14:18:23 -05:00
Jonathan Williams	96498af626	Fixed parkour bug with gadget blocks. ... Removed a ton of debug messages with inventory close.	2014-09-19 09:06:42 -10:00
Jonathan Williams	d0edde9dbd	Added rank benefit giver 9000 ... Added MineStrike to beta timer. Updated official craftbukkit.jar	2014-09-19 02:57:35 -10:00
Jonathan Williams	c8e755fe5f	Reverted and merged twigs status update. (Needs fix on startDate.)	2014-09-18 22:22:01 -10:00
Jonathan Williams	239b021b0d	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-09-18 22:03:49 -10:00
Jonathan Williams	18f2ef7564	Re-enabled SNAKE PARKOUR for hub.	2014-09-18 22:03:23 -10:00
Chiss	21c131273e	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-09-19 18:01:52 +10:00
Chiss	91037384f9	Loot tweaks ... Music fixes some bug fixes	2014-09-19 18:01:38 +10:00
Jonathan Williams	7906f48262	Updated CoreClientManager to pull all account data via name request. ... Cleaned up some code with pet administrator. added logging if 0 rows were being saved in CommitChanges	2014-09-18 21:12:37 -10:00
CoderTim	edce1c9f90	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-09-19 02:46:12 -04:00
CoderTim	8cb836d5b3	Fixed some achievement bugs	2014-09-19 02:46:04 -04:00
Chiss	ed7eeab1a7	fixed exception	2014-09-19 16:13:11 +10:00
Shaun Bennett	5c791090fc	Open all treasures after 60 seconds	2014-09-19 00:48:11 -05:00
Shaun Bennett	3d04b27898	Prevent Gadget block changes from affecting treasure	2014-09-18 23:03:08 -05:00
Shaun Bennett	1a9f676a61	Merge remote-tracking branch 'origin/master'	2014-09-18 22:41:32 -05:00
Shaun Bennett	3eb61135c9	Fix treasure message	2014-09-18 22:39:42 -05:00
Chiss	01a6ff6069	costume reward fix ... hub builder including database	2014-09-19 13:01:49 +10:00
Shaun Bennett	1370a0eeac	Clean up RewardRarity	2014-09-18 21:24:14 -05:00
Shaun Bennett	aad3d59177	Merge remote-tracking branch 'origin/master'	2014-09-18 21:03:59 -05:00
Shaun Bennett	5d643c00d5	treasssssurreeeeees	2014-09-18 21:03:46 -05:00
Chiss	27587a2a11	fixed players being able to be pushed into portals by gadgets	2014-09-19 11:15:48 +10:00
Chiss	a0e9d6f6fd	fixed a portal break bug ... reduced lag from coin bomb	2014-09-19 10:59:26 +10:00
Chiss	4b602c1b83	Inventory Update ... added Jooq to Hub build	2014-09-19 10:36:41 +10:00
Shaun Bennett	c93fee2b53	Fix typos for pets	2014-09-18 18:10:33 -05:00
Shaun Bennett	ee64ff2bf6	Dispose of Shop if the InventoryOpenEvent gets cancelled	2014-09-18 17:48:35 -05:00
Shaun Bennett	2008dae57b	Adjust treasure message	2014-09-18 17:38:05 -05:00
Shaun Bennett	51ad6d8368	Open Treasure chests through cosmetic gui, purchase treasure keys, some bug fixes	2014-09-18 17:33:05 -05:00
Shaun Bennett	b8d157f99f	Add costumes to RewardManager	2014-09-18 14:47:22 -05:00
Shaun Bennett	76df00978a	Add music discs to RewardManager	2014-09-18 14:43:07 -05:00
Shaun Bennett	88a8e3a896	Hackyish way to log rewards given out in a database	2014-09-18 14:35:59 -05:00
Chiss	ed59e03795	Loot update	2014-09-18 17:05:56 +10:00
CoderTim	8b14c85572	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-09-18 01:57:04 -04:00
CoderTim	f8ee20c433	Record server name in basic game stats	2014-09-18 01:56:46 -04:00
Shaun Bennett	e5d5cda9fd	Merge remote-tracking branch 'origin/master'	2014-09-18 00:46:41 -05:00
Shaun Bennett	87bd5d8f7f	Add coin party bomb to rare rewards, fix reward values from last commit	2014-09-18 00:46:33 -05:00
Chiss	3fd312ff95	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-09-18 15:45:01 +10:00
Chiss	fed3d31374	MineStrike fixes	2014-09-18 15:44:48 +10:00
Shaun Bennett	6c4479298d	Fix RewardManager bug, fooling around with animations	2014-09-18 00:41:56 -05:00
Shaun Bennett	9d0b99b7fc	Merge remote-tracking branch 'origin/master' ... Conflicts: Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java	2014-09-17 23:56:42 -05:00
Chiss	09a3cc16b0	Reward stuffs	2014-09-18 14:36:22 +10:00
Chiss	bb8e481c7f	More Reward stuff	2014-09-18 14:25:39 +10:00
Chiss	c625fb4121	Restructured rewards for Post-Game rewards	2014-09-18 13:21:30 +10:00
Shaun Bennett	33d33f84b4	More treasure animation touches + fixes	2014-09-17 15:22:54 -05:00
Shaun Bennett	da680359d0	Change formatting of treasure announcements	2014-09-17 14:50:34 -05:00
Shaun Bennett	90e402bf69	Fix menu slots	2014-09-17 14:43:58 -05:00
Shaun Bennett	0139e40957	Re-enable Coin Party Bomb reward for rare treasures	2014-09-17 14:35:43 -05:00
Shaun Bennett	cc5db5939d	Add Music and Costume pages to cosmetic menu	2014-09-17 14:34:57 -05:00
Chiss	8780d5e4ee	MS fixes	2014-09-17 11:18:59 +10:00
Chiss	16214613fe	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-09-17 08:59:23 +10:00
Chiss	e6797582f9	Minor fixes	2014-09-17 08:59:09 +10:00
Shaun Bennett	50fa8b02f1	Use explosion particles instead of createExplosion	2014-09-16 17:57:34 -05:00
Shaun Bennett	918a817283	More treasure bug fixes and animation touches	2014-09-16 15:04:42 -05:00
CoderTim	6eed36f0ee	Accidentally committed with line of code commented out	2014-09-15 23:46:44 -04:00
CoderTim	d3b541dc27	Updated Arcade .classpath	2014-09-15 23:43:13 -04:00
CoderTim	d5313540d7	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-09-15 23:32:04 -04:00
CoderTim	c5ff9da552	Record basic game stats (game type, timestamp, duration, winners, losers)	2014-09-15 23:31:53 -04:00
CoderTim	c550e59d45	Renamed jooq database record classes	2014-09-15 23:30:24 -04:00
Shaun Bennett	5b77fa09a4	Merge remote-tracking branch 'origin/master'	2014-09-15 19:37:28 -05:00
CoderTim	1b416d3e6f	Added database tables to record basic game stats	2014-09-15 16:36:59 -04:00
Shaun Bennett	63b3621ae3	Fix treasure open chest bug, added some animation touches	2014-09-15 13:34:21 -05:00
MrTwiggy	abea4223ab	Recommit up-time checking to prevent brand new empty servers from being prematurely killed by ServerMonitor.	2014-09-15 13:22:11 -04:00
Shaun Bennett	7c18e89249	Send chest open packets for new players that join in the middle of a treasure	2014-09-15 10:37:40 -05:00
Jonathan Williams	c7e0ebefd1	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-09-13 20:52:13 -10:00
Jonathan Williams	a395cae764	Fixes for Custom tag ... Fix for Bridge time Fix for tournament auto whitelist. Added UI stuf for tourney Added build files for arcade.	2014-09-13 20:50:27 -10:00
Shaun Bennett	8659422877	Merge remote-tracking branch 'origin/master'	2014-09-14 00:29:37 -05:00
Shaun Bennett	c1bc9fca2e	Small treasure tweaks	2014-09-14 00:29:30 -05:00
Chiss	26a51f4ef2	Re-allowed opening of chests (for GUIs) during games.	2014-09-14 15:28:43 +10:00
Chiss	f3df86a5a9	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-09-14 14:10:51 +10:00
Chiss	7e3b9b4b3a	some 1.8 title stuff	2014-09-14 14:10:40 +10:00
Shaun Bennett	fc44592edf	Merge remote-tracking branch 'origin/master'	2014-09-13 23:07:21 -05:00
Shaun Bennett	228cca4805	fix bug with reward amounts	2014-09-13 23:07:15 -05:00
Jonathan Williams	7ad7dd939d	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-09-12 22:00:18 -10:00
Jonathan Williams	1c3326333d	Fix for crash.	2014-09-12 21:59:12 -10:00
Jonathan Williams	4f5430e390	Added tournament stuff.	2014-09-12 21:52:44 -10:00
Chiss	e31ab1b37a	disabled treasure again!	2014-09-13 16:44:51 +10:00
Chiss	054709a859	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex ... Conflicts: Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java	2014-09-13 16:44:11 +10:00
Chiss	31c4a95da5	Disabled Treasure Chests	2014-09-13 16:43:18 +10:00
Shaun Bennett	1e7ed8d491	Treasure rewards + some minor fixes	2014-09-13 01:25:14 -05:00
Jonathan Williams	a196e43fde	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex ... Conflicts: Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java	2014-09-12 19:46:19 -10:00
Shaun Bennett	0afb0f061c	Changes to fireworks animation	2014-09-12 23:43:38 -05:00
Shaun Bennett	aafdc555b1	Oops, accidentally removed some code!	2014-09-12 23:41:50 -05:00
Shaun Bennett	0f44850367	Treasure stuff	2014-09-12 23:30:00 -05:00
Shaun Bennett	5e9cbcef75	Merge remote-tracking branch 'origin/master'	2014-09-12 23:15:58 -05:00
Shaun Bennett	71f42c6e7b	Treasure updates	2014-09-12 23:15:53 -05:00
Chiss	a31e20d709	treasure styles	2014-09-13 14:09:50 +10:00
Chiss	4454627b32	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-09-13 13:41:48 +10:00
Chiss	e511df4605	Merge treasure	2014-09-13 13:41:37 +10:00
Shaun Bennett	fc6a2633c9	Remove debug message, make sure player is far enough from spawn to open treasure	2014-09-12 22:41:10 -05:00
Shaun Bennett	88ef0ce35b	Merge remote-tracking branch 'origin/master'	2014-09-12 22:33:28 -05:00
Shaun Bennett	a8eeef02dd	Adjustments to how treasure rewards are selected	2014-09-12 22:33:22 -05:00
Chiss	e36f843feb	Fixed bug in MineStrike	2014-09-13 12:29:35 +10:00
Chiss	f0fa3469df	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-09-13 09:17:50 +10:00
Chiss	58f784187b	UHC Manager for Hub	2014-09-13 09:13:46 +10:00
Jonathan Williams	14c4152248	Fixed CustomTagFix. ... Updated ServerData ServerGroup and SErverMonitor for new flags in Arcade.	2014-09-12 10:03:33 -10:00
Shaun Bennett	20680acea0	More treasure rewards + tweaks	2014-09-12 14:24:30 -05:00
Shaun Bennett	dea6c98fc9	Merge remote-tracking branch 'origin/master'	2014-09-12 14:08:22 -05:00
Shaun Bennett	4ea786a1a5	Fix fireworks for 1.8 client, a bunch more treasure stuff	2014-09-12 14:08:10 -05:00
Chiss	5de59b6e0e	Hub UHC countdown basics ... UHC MOTD timer stuff	2014-09-12 18:06:51 +10:00
Chiss	b5152bd621	removed some redundant repeated color stuff	2014-09-12 11:59:32 +10:00
Chiss	b507571403	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex ... Conflicts: Plugins/Mineplex.Database/.classpath	2014-09-12 11:49:18 +10:00
Chiss	fba1d0e430	Required for merge	2014-09-12 11:48:32 +10:00
Chiss	0dff0412d1	Fixed game flag for not allowing inventory opens ... Removed some redundant flags in game Lots of MineStrike updates Fixed NPE in WinWithoutLosingTeammateStatTracker	2014-09-12 11:47:39 +10:00
CoderTim	f5f9ba6bdf	Added .project and .classpath for Mineplex.Database	2014-09-11 17:10:24 -04:00
Chiss	092e9ba479	Modified UHC borders for release	2014-09-11 17:44:57 +10:00
Chiss	2791d54040	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-09-11 13:43:34 +10:00
Chiss	56263718d7	Fix for BossBar	2014-09-11 13:17:57 +10:00
Shaun Bennett	b910c5098c	Cross version Holograms (Alignment might be a tad off) ... A bunch of stuff for Treasure Chests	2014-09-10 12:16:31 -05:00
Shaun Bennett	32bbecd01a	Merge remote-tracking branch 'origin/master'	2014-09-09 19:27:16 -05:00
Shaun Bennett	c4ad00bef1	add armor stand hologram, just to send code to laptop	2014-09-09 19:27:05 -05:00
CoderTim	235cf8cae7	Fixed win stats on solo games	2014-09-09 02:18:20 -04:00
Chiss	7bbb7ca545	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-09-09 10:53:03 +10:00
Chiss	1943dbeaab	Removing PermissionsEx dependency for MapParser	2014-09-09 10:52:51 +10:00
CoderTim	b341089cfe	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-09-08 16:28:50 -04:00
CoderTim	90d88ebd0b	Fixed "The Longest Shot" achievement bug	2014-09-08 16:27:09 -04:00
Shaun Bennett	652075138e	More treasure rewards work	2014-09-08 13:26:18 -05:00
Chiss	347e2b1bf5	Changed FIRE items to Blaze Powder	2014-09-08 10:14:55 +10:00
CoderTim	3e5b827a7f	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-09-07 18:10:31 -04:00
CoderTim	201782a7cd	Added leaderboard.php	2014-09-07 18:09:46 -04:00
Shaun Bennett	6441b110b4	Treasure stuff from laptop	2014-09-07 13:35:49 -05:00
Chiss	aa77821c20	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-09-06 22:01:17 +10:00
Chiss	f138a4108b	Deregister stat trackers from listener	2014-09-06 22:01:05 +10:00
Jonathan Williams	558231457c	Fixed disguises leaving extra tags ... Fixed memory problem in Arcade.	2014-09-06 03:39:20 -07:00
Shaun Bennett	86d063dafb	Merge remote-tracking branch 'origin/master'	2014-09-06 01:07:49 -05:00
Shaun Bennett	15b46e8f96	Fix displaying on stats on achievement gui	2014-09-06 01:07:40 -05:00
Chiss	644d3da050	JOOQ for Eclipse	2014-09-06 11:31:55 +10:00
Chiss	a3545d074d	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-09-06 10:58:23 +10:00
Shaun Bennett	eb27c1dfbe	Add Util class for sending titles to players	2014-09-05 19:46:11 -05:00
Jonathan Williams	1ea660df3a	Update craftbukkit with new patch file	2014-09-05 16:59:29 -05:00
Jonathan Williams	c0e4539e53	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-09-05 14:38:28 -07:00
Jonathan Williams	2f8b53f771	Fix for customer support server. ... Fix for Boss bar junk. Fix for Disguises.	2014-09-05 14:36:10 -07:00
Shaun Bennett	0ad844d1b5	Merge remote-tracking branch 'origin/master'	2014-09-05 16:35:26 -05:00
Shaun Bennett	b96ba09857	Update CraftBukkit to latest spigot changes. Includes title and tab packets	2014-09-05 16:35:00 -05:00
Chiss	892b67beb2	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-09-05 21:43:33 +10:00
Jonathan Williams	d01529a344	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex ... Conflicts: Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java	2014-09-05 04:38:23 -07:00
Jonathan Williams	1c6790b611	Fixed for DisguiseManager ... Rewrote packet handling Fixed up CustomTagFix Removed swapping kits in Block Hunt Removed Stacked entities for 1.8 players.	2014-09-05 04:36:01 -07:00
Chiss	4064c5238c	bridges volcano fix ... minestrike npe fix	2014-09-05 21:35:26 +10:00
CoderTim	3830ab8e0f	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-09-05 06:06:13 -04:00
CoderTim	91a2266a04	Set up jOOQ, fixed some IntelliJ issues, and added leaderboard stat tracking	2014-09-05 04:00:51 -04:00
Chiss	4e94bcfd98	Block Hunt winners fix (team/solo)	2014-09-05 17:29:23 +10:00
Chiss	abc95853f7	sulhpur bomb fix	2014-09-05 15:47:35 +10:00
Chiss	8c1e0c3e9e	Fletcher data fix ... Minestrike stuff	2014-09-05 15:45:14 +10:00
Chiss	b691b1bad0	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-09-05 12:51:59 +10:00
Chiss	f6ce9abed8	Minestrike ... - added mixed slow/instant mode - added accurate hitboxes for slow bullets - added many new weapons - removed speed from knife - adjusted gun balance	2014-09-05 12:28:29 +10:00
Jonathan Williams	b28fc8ee6b	Added custom name tag fix for mobs for 1.8 players ... Worked on boss bar display. Bug with <=50% hp.	2014-09-04 11:33:51 -07:00
CoderTim	aae46bdeda	Removed unused intellij module	2014-09-03 16:58:53 -04:00
CoderTim	74e012a811	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-09-03 16:54:41 -04:00
CoderTim	39b46bc8f5	Fixed some NPEs	2014-09-03 16:53:29 -04:00
Shaun Bennett	e7f79aa5bf	Update IntelliJ files for latest changes	2014-09-03 11:42:50 -05:00
Jonathan Williams	92191dc19a	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex ... Conflicts: Plugins/Nautilus.Core.CraftBukkit/src/net/minecraft/server/v1_7_R4/PlayerConnection.java	2014-09-03 03:47:15 -07:00
Jonathan Williams	a4871b5509	Updated to latest spigot with 1.8 support. ... Tweaked disguise manager for 1.8 support. Work on CUstomer support server + admin stuff.	2014-09-03 03:46:24 -07:00
Chiss	21225d7b65	Minor Fixes	2014-09-03 15:09:14 +10:00
Chiss	50140ef92d	Minestrike update	2014-09-03 14:49:38 +10:00
Chiss	246f2e91d9	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-09-03 12:38:57 +10:00
Chiss	58f98881f2	Minestrike Update	2014-09-03 12:38:44 +10:00
Chiss	1dec79c0fa	Minestrike update	2014-09-03 12:28:45 +10:00
Shaun Bennett	4dbe7003b2	Update Arcade Icon in the game menu	2014-09-02 21:09:12 -05:00
Shaun Bennett	8d06cddfb2	Remove Chiss' debug message for shop	2014-09-02 20:36:25 -05:00
Shaun Bennett	9168de20da	Update PlayerConnection method to latest spigot (Fixes right click bug, caused from old spigot code)	2014-09-02 20:33:00 -05:00
Shaun Bennett	08e6b73b1f	Disable Treasure stuff for now	2014-09-02 19:04:43 -05:00
Shaun Bennett	2b3f6c9dbc	Prevent minecart mounts from being broken by others	2014-09-02 19:03:14 -05:00
Shaun Bennett	2d5c676e1b	Merge remote-tracking branch 'origin/master'	2014-09-02 18:57:35 -05:00
Shaun Bennett	4ad034b8d9	more treasure stuff, really basic holograms	2014-09-02 18:33:40 -05:00
Chiss	d5766d62ae	nerf p90	2014-09-02 16:49:45 +10:00
Chiss	449281501f	MineStrike Update	2014-09-02 16:49:15 +10:00
Jonathan Williams	006c7d1e65	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-09-01 20:04:02 -07:00
Jonathan Williams	a568631df8	Work on AccountAdministrator	2014-09-01 20:03:08 -07:00
Chiss	5d6834633f	MineStrike update	2014-09-02 11:16:17 +10:00
Shaun Bennett	df882012e5	When items are dropped in The Bridges, only the player that broke the block can pickup the item for 8 seconds. (Only applies to specific item types)	2014-09-01 15:38:07 -05:00
Chiss	05623b7522	Initial MineStrike push ... fixed frames being breakable in games	2014-09-01 21:37:39 +10:00
Chiss	492b3cc0a4	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-09-01 17:57:17 +10:00
Jonathan Williams	8198bb31c8	Added sneaking to player disguise. ... Did work on DDoSProtectionSwitcher Work on AccountAdministrator to fix rank issues.	2014-09-01 00:56:32 -07:00
Shaun Bennett	5905ef5ef7	Treasure Stuff	2014-08-30 14:27:11 -05:00
Chiss	116c54352b	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-30 20:49:46 +10:00
Chiss	207de0e67a	fixed MAC kicking players on lillypads	2014-08-30 20:49:32 +10:00
Jonathan Williams	c8bc697888	Fixed mounts and gadgets for rank messages...no Purchase.	2014-08-30 02:37:27 -07:00
Jonathan Williams	f6dcebc3dc	Fixed extra spacing in cosmetic menu.	2014-08-30 02:33:37 -07:00
Jonathan Williams	72aa05f73e	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-30 02:26:16 -07:00
Jonathan Williams	829736ed07	Fixed purchase info.	2014-08-30 02:26:07 -07:00
Shaun Bennett	e52f6deab4	Merge remote-tracking branch 'origin/master'	2014-08-30 04:24:34 -05:00
Shaun Bennett	6a58b86a19	Don't display wins and losses to other players on Achievement Gui	2014-08-30 04:24:25 -05:00
Chiss	2b333859d1	PUUSH	2014-08-30 19:24:04 +10:00
Chiss	f58aca7990	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-30 19:07:55 +10:00
Chiss	3767911718	updated game desc output	2014-08-30 19:07:43 +10:00
Jonathan Williams	b07670f6af	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-30 02:04:32 -07:00
Jonathan Williams	1bd0209b39	Added multi-server tags for npcs ... Fixed Customer support packages. Fixed Account rank expire for Hero Added SNR mod to update Rank Changed SNR mod color to gray.	2014-08-30 02:04:04 -07:00
Chiss	7696349187	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-30 16:34:10 +10:00
Chiss	2c30cc3ef4	Implemented new servers flags ... Removed OP from Admisn in HUB, gave them /gm command instead	2014-08-30 16:33:56 +10:00
CoderTim	b7baa1b2f4	Count disconnecting from the server as a loss	2014-08-30 02:30:07 -04:00
CoderTim	34f04ad4e3	Fixed Champions Assassination and Longshot achievements	2014-08-29 21:09:51 -04:00
Chiss	41daba98c4	Background work for Minestrike ... Admins no longer have OP in hubs. They have /gm command to gamemode.	2014-08-29 18:21:08 +10:00
Chiss	1f6b9374eb	disable le minestrike	2014-08-29 11:55:06 +10:00
Chiss	c3bb0ddbcb	Chest example gadget for shauny	2014-08-29 11:00:16 +10:00
Jonathan Williams	fa56aa0843	Fixed regular players not able to join Beta servers.	2014-08-28 14:02:55 -07:00
Jonathan Williams	5281558cdb	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-28 14:01:49 -07:00
Jonathan Williams	409e2c6141	Tweaked menus for quick game, Cosmetic menu. ... Removed debug for Hub Output a little debug info in LobbyBalancer Added duplicate check to ServerMonitor updated Customer SUpport server to have changeable password, added logging of command executors, added lifetime perks for hero/ultra	2014-08-28 14:01:37 -07:00
CoderTim	cc57ddf4bc	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-28 06:54:36 -04:00
CoderTim	bdef9acecd	Fixed DragonEscape win stat tracker	2014-08-28 00:53:54 -04:00
Chiss	ec4cb91a1c	Poll changes ... Achievement output double space fix	2014-08-28 11:50:09 +10:00
Jonathan Williams	7829188c32	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-27 12:48:35 -07:00
Jonathan Williams	526ca42add	Fixed Gem booster problem. ... FIxed stat problem.	2014-08-27 12:48:24 -07:00
Shaun Bennett	b67e127902	Merge remote-tracking branch 'origin/master'	2014-08-27 14:08:47 -05:00
Shaun Bennett	573f71164f	Add a way to view poll statistics in game, load polls that aren't enabled for stat tracking	2014-08-27 14:07:22 -05:00
Chiss	311711f2f0	Disabled fireworks for non-gadget enderpearls.	2014-08-27 15:24:10 +10:00
Chiss	9cde497a5c	Fixed ethereal pearl text	2014-08-27 15:20:55 +10:00
Chiss	4e43a2ca73	Extended range of snake parkour, ensuring people tp back to it when they fall.	2014-08-27 15:19:08 +10:00
Chiss	9439daa852	Fixed bug where spectators could trigger anti-cheat in bridges	2014-08-27 15:16:20 +10:00
Chiss	d9ef5f50be	disabled minestrike	2014-08-27 14:23:31 +10:00
Chiss	596bcbfae6	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-27 14:23:01 +10:00
Chiss	da5f953212	Fixed BlockMorph leaving blocks behind when player was teleported.	2014-08-27 14:22:35 +10:00
CoderTim	5ef2772abd	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-26 20:27:51 -04:00
CoderTim	7d6572ff4d	Fixed SheepGame Selfish achievement	2014-08-26 20:27:39 -04:00
Shaun Bennett	8e89dfa1ab	Merge remote-tracking branch 'origin/master'	2014-08-26 19:02:08 -05:00
Shaun Bennett	8439838328	After years of research and experimenting, we settled on an achievement icon	2014-08-26 19:01:59 -05:00
Chiss	f25f7d3aa2	Fixed 1v3 achievement not giving achievement if players quit (required 4 at END)	2014-08-27 09:52:33 +10:00
Shaun Bennett	48ed5e2cba	Merge remote-tracking branch 'origin/master'	2014-08-26 18:39:10 -05:00
Shaun Bennett	78eee68592	Change achievement icons, fix another typo	2014-08-26 18:39:01 -05:00
Shaun Bennett	b508cd036c	Lazy fix so that polls award gems instead of coins	2014-08-26 18:36:40 -05:00
Chiss	5540835052	removed micro debug ... fixed a bug in achievement output	2014-08-27 09:09:06 +10:00
Chiss	dbf441dd0d	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-27 08:57:24 +10:00
Chiss	f9ce0d353c	Achievements now need 75%+ players at START of game	2014-08-27 08:57:11 +10:00
Shaun Bennett	c04319345a	Merge remote-tracking branch 'origin/master'	2014-08-26 17:41:07 -05:00
Shaun Bennett	507d356346	Fix last achievement typo	2014-08-26 17:40:58 -05:00
CoderTim	d9e1f35985	Fixed BadHiderStatTracker and limited stat recording to when games are at least 75% full	2014-08-26 16:30:55 -04:00
Jonathan Williams	232785a7dd	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-26 04:56:34 -07:00
Jonathan Williams	417d398195	Swapped Morph and Pet active slot. ... Fixed a couple things on Staff server.	2014-08-26 04:56:23 -07:00
Chiss	17649ce36c	Fixed bug where desc for past-completed achievements was still showing	2014-08-26 21:51:59 +10:00
Shaun Bennett	99951bc573	Fix achievement typos	2014-08-26 04:20:33 -05:00
Jonathan Williams	5fdf466722	Fixed bug in server monitor. ... re-enabled animal spawn in hub.	2014-08-26 02:02:31 -07:00
Jonathan Williams	064b0e8b36	Removed sheep mount and fixed up server monitor.	2014-08-26 01:31:57 -07:00
Chiss	81e92c0e8e	changed wording in achi GUI	2014-08-26 18:24:20 +10:00
Chiss	6f1204c844	Set gem reward for all achievements	2014-08-26 18:20:33 +10:00
Chiss	ab29a5fa29	Fixed text output in Achi GUI for completed	2014-08-26 18:06:01 +10:00
Chiss	3eae26ef80	Updated Achievement Output	2014-08-26 18:03:29 +10:00
Chiss	d62b59776f	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-26 17:54:50 +10:00
Chiss	116fe496a8	Changed post game achievement output ... Added Reward to Achi GUI	2014-08-26 17:53:54 +10:00
Jonathan Williams	7a8ab5c96a	Comment for weirdness.	2014-08-26 00:53:41 -07:00
Jonathan Williams	a4cf9e2f4b	Fixed stat bugs.	2014-08-26 00:52:51 -07:00
Chiss	7e7906865f	Fixed some stats being added after send-off	2014-08-26 17:45:35 +10:00
Jonathan Williams	526b5c333a	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-26 00:34:00 -07:00
Jonathan Williams	137b8692e4	Added Gem booster use.	2014-08-26 00:33:48 -07:00
Chiss	0546c9e175	Fixed so only Supply drop chests trigger achievement	2014-08-26 17:33:23 +10:00
Chiss	1b15a57fc8	Added Gem Rewards for Achievements	2014-08-26 17:10:20 +10:00
Jonathan Williams	162a86d4b2	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex ... Conflicts: Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/CosmeticShop.java	2014-08-25 23:58:54 -07:00
Jonathan Williams	b8b6c031cd	Re-did and added a game to the quick game menu. ... Fixed npc triggers with non npcs named the same. Fixed naming pet longer than 16 chars. Added sugar cane to restricted block type for paintball gun Properly hooked in gadget block event for paitnball gun. Added auto purchase page on item gadget ammo empty. Added check on rank for customer support command. Fixed ConcurrentModificationException problem with spigot.	2014-08-25 23:56:58 -07:00
Chiss	95e7517a9e	disabled debug cmd for rave suit	2014-08-26 16:17:38 +10:00
Chiss	8fc6013ff3	Disabled Chest GUI	2014-08-26 16:12:01 +10:00
Chiss	dd61077850	Added missing Achievements	2014-08-26 14:46:10 +10:00
Chiss	1b3e32ca26	Added Arcade Achievements	2014-08-26 14:42:17 +10:00
Chiss	f0e01aa257	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-26 13:42:54 +10:00
Chiss	28d523d696	Added Achievements	2014-08-26 13:42:42 +10:00
Shaun Bennett	905d4db6f1	Use emerald instead of bed	2014-08-25 21:32:30 -05:00
Shaun Bennett	2e0b074053	More achievement gui changes	2014-08-25 20:56:21 -05:00
Chiss	86930de23e	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex ... Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/AssistsStatTracker.java	2014-08-26 08:19:50 +10:00
Chiss	07ee44508e	Missing Gadgets	2014-08-26 08:17:41 +10:00
CoderTim	933d32d8f8	Fixed team death/kills stats	2014-08-25 18:06:50 -04:00
CoderTim	9acc7d8496	Added team kill and death achievement trackers	2014-08-25 17:43:49 -04:00
CoderTim	4ce537a3a7	Fixed some NPEs and achievement bugs	2014-08-25 16:27:02 -04:00
Chiss	0e3cf67402	Some new cosmetics	2014-08-25 12:59:29 +10:00
Chiss	13eb3da0fa	Achievment gui changes	2014-08-25 09:26:01 +10:00
Chiss	7669998ad3	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-25 08:38:29 +10:00
Shaun Bennett	ff441f2262	Merge remote-tracking branch 'origin/master' ... Conflicts: Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementData.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java	2014-08-24 16:14:29 -05:00
Shaun Bennett	2cb87b23e6	Stat Gui, Start of Treasure Gui (disabled)	2014-08-24 16:08:19 -05:00
Chiss	23f6d0ae1a	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-24 16:46:00 +10:00
Chiss	3f5cff3e21	Killing cheaters for a few things in bridges	2014-08-24 16:45:47 +10:00
CoderTim	c89461628b	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-23 16:00:26 -04:00
CoderTim	fb90336d4e	Finished stats/achievements	2014-08-23 16:00:15 -04:00
Chiss	642f8b46b9	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-23 18:01:35 +10:00
Chiss	7348a26951	fixed damage dealt npe	2014-08-23 18:00:23 +10:00
Chiss	af9bf0727a	Fixed damage taken stat NPE ... Added tournament team auto-rejoin	2014-08-23 17:55:28 +10:00
Jonathan Williams	70beb58bd6	Enabled debugging in Hub/Arcade	2014-08-23 01:49:48 -05:00
Jonathan Williams	fd0c4745f8	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-23 00:40:17 -05:00
Jonathan Williams	931cb5ece8	Removed MineKart code. ... Fixed up DisguisePlayer Added ProfileLoader Fixed up Notch gadget.	2014-08-23 00:40:07 -05:00
Chiss	0700b9df12	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-23 15:04:55 +10:00
Chiss	3ec43f90e8	GameAchievementManager now utilises TaskManager to record whether or not people have previously completed Achievements	2014-08-23 15:04:43 +10:00
Jonathan Williams	3a47a161c5	Enabled snake parkour ... Updated servermanager/serverNpcPage to handle free and beta timers.	2014-08-22 22:53:15 -05:00
CoderTim	4afafe2d51	Some stats fixes	2014-08-22 21:54:08 -04:00
Jonathan Williams	a84468157c	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-22 18:21:38 -05:00
Jonathan Williams	ebb4c44bdc	Tweaked player disguise.	2014-08-22 18:21:23 -05:00
Chiss	e40cb17e47	Updated tutorial locations	2014-08-23 08:52:50 +10:00
Chiss	e5944ff872	Spawn location fix	2014-08-23 08:40:02 +10:00
Chiss	340be68ef8	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-23 08:39:39 +10:00
Chiss	9fad775f73	More cosmetics	2014-08-23 07:50:07 +10:00
CoderTim	b2b208bdba	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-22 17:30:08 -04:00
CoderTim	02bb53578a	Registered stat listeners with each game	2014-08-22 17:20:02 -04:00
Chiss	11597285b8	Changed so it music will never be 'active'.	2014-08-23 05:36:57 +10:00
Chiss	2e031f1e4a	Added Music Gadget	2014-08-23 05:35:07 +10:00
Jonathan Williams	b67b2f04b7	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-22 13:32:50 -05:00
Jonathan Williams	13b90e1142	Preliminary work on help desk integration with Customer Support server. ... Updated DisguiseSheep with values from craftbukkit.jar	2014-08-22 13:32:22 -05:00
Chiss	a159f04d50	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-23 04:30:52 +10:00
Chiss	231ef2bbe1	Cosmetic Update	2014-08-23 04:30:41 +10:00
Jonathan Williams	83b3e49151	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-22 10:48:27 -05:00
Jonathan Williams	70217fe957	Finished first release of Customer Support plugin.	2014-08-22 10:47:46 -05:00
Chiss	0022586e3e	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-22 17:08:29 +10:00
Chiss	97c087a28d	Allowed commands to specify specific ranks ... allowed youtube/build to start/set games	2014-08-22 17:05:14 +10:00
CoderTim	591b5c026c	Almost all achievements done	2014-08-21 18:55:40 -04:00
Jonathan Williams	5e47a12531	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-21 15:56:02 -05:00
Jonathan Williams	99d15d3ece	Work on Customer support server.	2014-08-21 15:55:09 -05:00
CoderTim	94f2aade08	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-21 15:01:22 -04:00
Jonathan Williams	1398543490	Fixed bug with Projectile ... Changed tp out of game to 1 per tick.	2014-08-21 02:07:54 -05:00
Chiss	ac088e85b2	Added some game flags ... Dragon escape changes	2014-08-21 13:35:31 +10:00
Jonathan Williams	830eeca835	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-20 20:14:32 -05:00
Jonathan Williams	315da32518	Removed unused code in Party ... Fixed path var in Core.Common	2014-08-20 20:14:23 -05:00
CoderTim	f266f4e016	More achievements	2014-08-20 19:20:11 -04:00
Chiss	60869d114e	Dragon Escape changes	2014-08-20 15:45:10 +10:00
Jonathan Williams	217ab51b40	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-19 22:24:16 -05:00
Shaun Bennett	1912d2c23e	Update EntityPlayer with recent craftbukkit changes	2014-08-19 21:43:12 -05:00
Shaun Bennett	a7bb84be0b	Revert chris' revert	2014-08-19 21:24:49 -05:00
Shaun Bennett	f60a818e6a	Update craftbukkit to remove the extra _INVALID mappings	2014-08-19 21:22:04 -05:00
Chiss	adf617000d	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-20 12:07:15 +10:00
Chiss	65c880b300	Parser changes	2014-08-20 12:06:24 +10:00
Jonathan Williams	24f984a365	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-19 21:37:11 -04:00
Jonathan Williams	9ee25c6292	Did some cleanup in Pvp project. ... Did work in Coreclient manager and added StaffServer (still in progress)	2014-08-19 21:36:23 -04:00
CoderTim	18ca7d5656	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-19 21:16:44 -04:00
CoderTim	599277b88e	More work on achievements	2014-08-19 21:16:28 -04:00
Chiss	2ffcfb7737	Parser changes	2014-08-20 11:02:12 +10:00
Chiss	94e5eb03da	Fixed errors for new getPlayers method.	2014-08-20 10:43:56 +10:00
Chiss	7535f39d18	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-20 10:39:58 +10:00
Chiss	afea0ba87f	Parser Merge	2014-08-20 10:39:41 +10:00
CoderTim	09c01d90ad	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-19 19:07:37 -04:00
Shaun Bennett	e1a57a673e	Update getOnlinePlayers() to recent bukkit changes, fixes IntelliJ errors	2014-08-19 16:58:55 -05:00
Jonathan Williams	33a1699fce	Minor enjin tweak. ... Reverted to nullable gem column because sql db wants to take forever converting.	2014-08-18 17:35:03 -04:00
CoderTim	05686cb584	Work on achievements	2014-08-18 16:41:16 -04:00
Jonathan Williams	d73ffcccfd	Added performance logging in ServerMonitor ... Added date tracking for gem/coin/account transactions in preparation for Customer Support server.	2014-08-18 15:46:23 -04:00
Shaun Bennett	b99e9d3f70	Simplified poll system, derp	2014-08-18 14:15:32 -05:00
Shaun Bennett	36d5c2c3af	Don't add player's current poll to the queue	2014-08-17 18:11:55 -05:00
Shaun Bennett	34ffc06166	Add functionality to skip polls	2014-08-17 18:07:16 -05:00
Shaun Bennett	6e9d2b3244	Allow setting a time when it should poll again	2014-08-17 17:53:38 -05:00
Shaun Bennett	43fd604695	Queue up polls for players instead of constantly checking for next poll	2014-08-17 17:47:38 -05:00
Shaun Bennett	4ba7da9a54	Polls! Still needs tweaks ... Hub artifact stuff for IntelliJ	2014-08-17 17:30:35 -05:00
Shaun Bennett	e5340238b6	IntelliJ Hub Configurations	2014-08-17 13:57:20 -05:00
Shaun Bennett	6793deffd0	Copy Command ... Small Fixes Single Imports IntellIJ config	2014-08-16 20:17:21 -05:00
Shaun Bennett	b6c31294c7	Parse map properly, bug fixes	2014-08-16 16:19:33 -05:00
Shaun Bennett	e286a45de8	Code cleanup for spawn location, remove JoinCommand	2014-08-16 16:01:00 -05:00
Shaun Bennett	18e1265afd	Remove join list, adjust intellij import style to be more like eclipse	2014-08-16 15:55:29 -05:00
Shaun Bennett	eac0f9fd6a	MapParser refactoring/changes	2014-08-16 15:50:33 -05:00
Shaun Bennett	4193ee53ea	Merge remote-tracking branch 'origin/master'	2014-08-16 12:13:11 -05:00
Shaun Bennett	ef6871491d	Add MapParser IntellIj configurations	2014-08-16 12:12:59 -05:00
Jonathan Williams	8aec9e345e	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-16 01:37:17 -05:00
Jonathan Williams	df97873d32	Fixed index issue with lobby balancer ... Added performance output for server monitor. Removed logging of debug stuff.	2014-08-16 01:37:06 -05:00
Chiss	d8123795aa	changed the way disguises show rank.	2014-08-16 16:33:18 +10:00
Jonathan Williams	686203ed8a	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-16 00:39:36 -05:00
Chiss	a888d4f14b	Fixed leaks	2014-08-16 15:39:02 +10:00
Jonathan Williams	249a56360e	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-15 23:19:13 -05:00
Chiss	508ef65fcf	Added missing file	2014-08-16 14:17:15 +10:00
Jonathan Williams	f98dc0c66d	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-15 23:03:34 -05:00
CoderTim	ae6cb4aa22	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-15 15:56:44 -04:00
CoderTim	19222c6815	Updated IntelliJ environment to be compatible with latest changes	2014-08-15 15:51:29 -04:00
Ty	5c0e1ad484	Fix issue where null MinecraftServer entries were being returned in getServerStatuses() method in RedisServerRepository.	2014-08-15 15:32:01 -04:00
Ty	3c4c537998	Fix issue where broken Jedis instances were returned as functional instances.	2014-08-15 14:49:01 -04:00
Jonathan Williams	3f827a310a	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-15 11:54:19 -05:00
Jonathan Williams	efdaa21ae7	Proper cleanup on lobby menu update.	2014-08-15 11:52:57 -05:00
Ty	0d38ac4e96	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex ... Conflicts: Plugins/Mineplex.ServerData/src/mineplex/serverdata/RedisServerRepository.java	2014-08-15 11:40:15 -04:00
Ty	da8aa3f1e3	Fix issue where broken Jedis resources were not being properly handled.	2014-08-15 11:33:34 -04:00
Chiss	29db90837d	Spleef Update ... Map parser block stuff	2014-08-15 15:28:50 +10:00
Chiss	697897b967	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-15 09:49:12 +10:00
Chiss	85522cddca	Debug (will clean once fixed) ... Game stats	2014-08-15 09:49:00 +10:00
Jonathan Williams	846c75453c	Revamping Redis Server status so it uses a consistent time value from redis database.	2014-08-14 07:41:04 -05:00
Jonathan Williams	cacf736f4f	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-14 04:10:21 -05:00
Jonathan Williams	682735e994	Added build fixes for ServerMonitor.java ... Added redis fixes for ServerMonitor Added ServerStatusManager fixes.	2014-08-14 04:10:11 -05:00
Chiss	282219fb4c	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-14 17:31:27 +10:00
Chiss	74435bac12	fixed bug where players kept inventory open, to be able to enable morphs ingame.	2014-08-14 17:31:14 +10:00
Jonathan Williams	f524ffb093	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-13 21:53:15 -05:00
Jonathan Williams	d1e69a34f1	Fix chiss path errorrrrrrrrrrrrrrrrrrrrs.	2014-08-13 21:53:03 -05:00
Chiss	c72f4b6057	Dragon target cancel fix	2014-08-14 12:35:49 +10:00
Chiss	5f80d9c57a	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex ... Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java	2014-08-14 11:24:51 +10:00
Chiss	b6ba142c5a	Mineplex in scoreboard is fancier.	2014-08-14 11:23:48 +10:00
Shaun Bennett	b9534bd245	Merge remote-tracking branch 'origin/master'	2014-08-13 20:07:01 -05:00
Shaun Bennett	cfe45139b6	Adjust lobby text for the removal of premium kits	2014-08-13 19:56:47 -05:00
Shaun Bennett	83f04273fa	Sort kits properly when a game uses NullKit	2014-08-13 19:45:38 -05:00
Chiss	b21ae8ef72	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-14 10:32:52 +10:00
Chiss	7a3bba45a7	Mergey!	2014-08-14 10:32:41 +10:00
Jonathan Williams	27032ac2ed	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/portal/PortalRepository.java	2014-08-13 18:59:59 -05:00
Jonathan Williams	6039168601	Updated code base to build #1604 spigot	2014-08-13 18:57:37 -05:00
Ty	5c5a57b048	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-13 16:37:20 -04:00
Ty	4b4f43ac16	Convert PortalRepository's redis host fetch to ServerManager constant, and remove debug code section.	2014-08-13 16:37:05 -04:00
Jonathan Williams	93811b200d	Small adjustment to lobby balancer code.	2014-08-12 17:01:54 -05:00
Jonathan Williams	5363f686e5	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-12 13:00:24 -05:00
Jonathan Williams	5618a3edad	Removed extra free version generator in server monitor.	2014-08-12 13:00:17 -05:00
Ty	1bbb42214d	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-12 11:14:53 -04:00
Ty	5b059e96ca	Commit missing PortalRepository.java file and finish clean() method.	2014-08-12 11:14:31 -04:00
Chiss	95394c51cc	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-12 11:24:12 +10:00
Chiss	2d67d4ce36	Achievement fix + active	2014-08-12 11:23:53 +10:00
Ty	36d6a58e0a	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex ... Conflicts: Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/GroupStatusData.java Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java	2014-08-11 15:39:56 -04:00
Shaun Bennett	d63137ead2	Merge remote-tracking branch 'origin/master'	2014-08-11 12:44:28 -05:00
Shaun Bennett	4006c454c3	Change order of events when enabling a gadget (Fixes bug where switching gadgets while a gadget is enabled doesn't show up on gadget page)	2014-08-11 12:39:26 -05:00
Shaun Bennett	482b964580	Display particles when shouldDisplay() is true instead of false	2014-08-11 12:30:03 -05:00
Shaun Bennett	7e93ed657f	Display boss bar properly while a dragon mount is spawned in arcade	2014-08-11 12:26:56 -05:00
Chiss	02270a9d25	TNT effect only triggers off self tnt.	2014-08-11 15:33:45 +10:00
Chiss	7191d48bd0	fixed paintball pre-game bug	2014-08-11 14:25:11 +10:00
Chiss	e4871c4988	Disabling cosmetics 5s before game starts, was having some carryover due to lag.	2014-08-11 11:55:00 +10:00
Chiss	d81b32bd3a	Sneaky Assassins balance+polish	2014-08-10 21:05:41 +10:00
Chiss	06bcf5079b	Disabled Gem hunter (bugged?) ... Disabled chicken morph letting people fly	2014-08-10 18:36:18 +10:00
Chiss	25b525837f	Fixed TNT blowing up lobby when it changed to prepare.	2014-08-10 11:07:05 +10:00
Chiss	9057246ab8	Arcade Inventory fixes	2014-08-10 10:50:31 +10:00
Chiss	3533ce1b7e	Particles dont play in stealth games.	2014-08-10 01:04:53 +10:00
Chiss	53221e267e	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-10 00:57:17 +10:00
Chiss	7aa017772f	Spectators will not play particle effects ... ALL rank no longer displays on morphs.	2014-08-10 00:55:51 +10:00
Jonathan Williams	e50c179e8d	Fixed pet tag price.	2014-08-09 09:49:00 -05:00
Jonathan Williams	43862ea6bf	Moved Particles to Admin and up only.	2014-08-09 09:44:00 -05:00
Jonathan Williams	cfd1d868b5	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-09 09:41:07 -05:00
Jonathan Williams	f15e539841	Added showing of only 3 full servers in server menu.	2014-08-09 09:40:59 -05:00
Chiss	616a0ecf11	Staff get all kits unlocked.	2014-08-10 00:32:50 +10:00
Chiss	38fd85335f	Fixes disguises being disabled.	2014-08-10 00:21:45 +10:00
Chiss	62cc422f42	FINAL FIX	2014-08-10 00:13:04 +10:00
Chiss	c95cf79aa6	fxied more	2014-08-10 00:10:08 +10:00
Chiss	a43a5b2c0e	bacon brawl fix ... signel game ultra shows in hub scoreboard	2014-08-10 00:09:39 +10:00
Chiss	21b89d2771	removed particle debug	2014-08-09 23:36:36 +10:00
Chiss	59859b168f	Fixed multi-morphs	2014-08-09 23:34:12 +10:00
Chiss	1a6540b4d0	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-09 23:25:26 +10:00
Chiss	3d1ddecffb	Smash Kit fix ... Gem Booster (dragons) fix	2014-08-09 23:25:13 +10:00
Jonathan Williams	dffc56e3e0	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-09 08:11:01 -05:00
Chiss	cac7f85410	Single game ultra kit unlock	2014-08-09 23:10:40 +10:00
Jonathan Williams	dbf59a032b	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-09 08:08:41 -05:00
Jonathan Williams	0cdfda7765	Fixed message on free timer.	2014-08-09 08:08:24 -05:00
Chiss	175d9f9886	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-09 23:00:07 +10:00
Chiss	23f93e55cf	fixed dragons destroying pregame lobby	2014-08-09 22:59:54 +10:00
Jonathan Williams	3ea2567079	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-09 07:41:09 -05:00
Jonathan Williams	9b75ef4f96	Fixed purchasing -2 cost gadgets.	2014-08-09 07:41:00 -05:00
Chiss	066dfbc9a9	Morph helmet fix	2014-08-09 22:38:58 +10:00
Jonathan Williams	800658ff48	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-09 07:26:05 -05:00
Jonathan Williams	2c75bcbdfe	Added ability to store gem boosters in enjin.	2014-08-09 07:25:58 -05:00
Chiss	e558796268	fixed TNT not being able to hit anyone	2014-08-09 22:16:49 +10:00
Chiss	a34ce75252	price fix	2014-08-09 22:02:40 +10:00
Chiss	6c847e78b7	Gem Hunter exp change	2014-08-09 20:16:21 +10:00
Chiss	06a444bae6	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-09 19:55:35 +10:00
Chiss	ff6ea3c798	Added Cosmetics to Arcade ... Set prices on cosmetics	2014-08-09 19:55:05 +10:00
Jonathan Williams	b0f6435661	Fixed items not updating immediately.	2014-08-09 04:29:34 -05:00
Chiss	951e1df3d5	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-09 19:05:34 +10:00
Jonathan Williams	8fe4e39207	Split up Cosmetic shop and Inventory ... Added Ammo purchase for item gadgets.	2014-08-09 03:57:56 -05:00
Jonathan Williams	4e93707f0d	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-09 00:06:53 -05:00
Jonathan Williams	0de8d22e62	Changed invis in hub to only be on server npc shops ... Fixed /a for senior mods and developers.	2014-08-09 00:06:44 -05:00
Chiss	62eccbcc1e	Snr Mod ... Creeper knockbak changes	2014-08-09 15:06:00 +10:00
Chiss	91a79f0345	Pig Morph ... Morphs have tags/	2014-08-09 14:57:01 +10:00
Jonathan Williams	3d909b7cbe	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-08 23:06:26 -05:00
Jonathan Williams	3f54881a3e	Fixed multiple purchase of Gem Booster.	2014-08-08 23:06:16 -05:00
Chiss	fb19e93992	Gem text	2014-08-09 13:46:41 +10:00
Chiss	c93a49add2	More gem boosty!	2014-08-09 13:42:29 +10:00
Chiss	2e95548b6e	Gem Boosters!	2014-08-09 13:39:57 +10:00
Chiss	3a220b6f1c	Micro Update ... SGTeams inv click fix.	2014-08-09 13:11:32 +10:00
Jonathan Williams	7fd40b38dd	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-08 22:10:09 -05:00
Jonathan Williams	6bd9273edf	Refactored getting item count for ClientInventory ... Fixed up Arcade gem boosters so they are hooked into inventory. Cleaned up unused code.	2014-08-08 22:10:02 -05:00
Chiss	97cf02eb37	Hub changes	2014-08-09 12:35:36 +10:00
Chiss	db90bcc958	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-09 12:16:53 +10:00
Chiss	313f675ae4	Hub Parkour update ... Smash kit prices	2014-08-09 12:16:37 +10:00
Jonathan Williams	e7847cc495	Tweaked Gem booster description.	2014-08-08 20:50:07 -05:00
Jonathan Williams	26c4045bc3	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex ... Conflicts: Plugins/Mineplex.Core/src/mineplex/core/inventory/ui/page/Menu.java	2014-08-08 20:49:27 -05:00
Jonathan Williams	bed2545b04	Added back buttons for sub menus. ... Added Gem booster pack and booster count display. Added reason and admin to mute message Fixed inventory tracking.	2014-08-08 20:48:15 -05:00
Ty	ecb0b2d3bb	Fix LobbyBalancer merge issue and convert PortalRepository to a redis-based system instead of MySQL.	2014-08-08 17:35:37 -04:00
Chiss	02dd579844	Text change for Inventory Menu	2014-08-08 17:16:20 +10:00
Jonathan Williams	e1be732202	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex ... Conflicts: Plugins/Mineplex.Core/src/mineplex/core/stats/StatsRepository.java	2014-08-08 02:07:20 -05:00
Jonathan Williams	9f2a83c956	Added Coins to donation. ... Fixed order of gadgets, mounts, pets, morphs, particles. Fixed display of active pet in Menu Fixed coins purchase for most items. Added Coins reward for ENjinTranslator. Added Coin transactions.	2014-08-08 02:05:58 -05:00
Chiss	b36b1cb007	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-08 17:05:23 +10:00
Chiss	fa3695be4e	Gem Booster In Lobby ... Achievement Stuff	2014-08-08 17:05:11 +10:00