Mineplex2018-withcommit

JarvisBigBalls/Mineplex2018-withcommit

Author	SHA1	Message	Date
Jonathan Williams	aca7fd6849	Removed all create calls	2014-12-31 09:38:41 -05:00
Jonathan Williams	4b937dfade	Refactored inventory repository to use 1 second queue Added 15 second timeout for server connection if db freezes.	2014-12-31 09:38:28 -05:00
Chiss	5f36c8e424	minor scoreboard changes legend loot bonus	2014-12-30 08:50:37 +11:00
Jonathan Williams	f0e3520343	Prevent inferior ranks to override actual ranks unless its Rank.ALL via Enjin	2014-12-29 08:02:14 -05:00
Jonathan Williams	01bc2ed2ba	Uno mas warning cleanup.	2014-12-29 07:11:21 -05:00
Jonathan Williams	8b5d6ecb6c	Cleanup of warnings.	2014-12-29 07:10:41 -05:00
Jonathan Williams	419f33fcc3	Refactored AntiHack a bit to try and remove CCM	2014-12-29 07:07:05 -05:00
Jonathan Williams	97f57b655b	Prevent horses from spawning in Clans Added Building supplies shop and pvp shop to clans.	2014-12-29 06:44:00 -05:00
Jonathan Williams	a7f77c09fe	Work towards another memory fix.	2014-12-29 06:42:43 -05:00
Jonathan Williams	5a57c5f372	Added Gold saving/retrieval from mysql. Converted DonationManager to MiniDbClientPlugin. Fixed bug in DonationRepository with gold.	2014-12-29 06:42:20 -05:00
Jonathan Williams	d83a63ef57	Changed FriendManager to start supporting expiry friend requests.	2014-12-26 07:36:07 -05:00
Jonathan Williams	8702bafbd0	Changed storage to player names instead of Player object for CustomTagFix	2014-12-26 00:29:57 -05:00
Jonathan Williams	81e423fa4f	Fixed Server transfer stuff. Portal send works!	2014-12-24 14:35:34 -05:00
Jonathan Williams	eb5a7b4276	Added Legend package for support. Refactored Key/Chest commands and added FrostLord package. Removed password, added whitelist.	2014-12-24 03:41:17 -05:00
libraryaddict	adc5769890	Fix wither not accessible for ranks, fix wither having weird naming in inventories	2014-12-24 04:07:28 +13:00
Jonathan Williams	5dcda626e7	Fixed port stuff for MPS	2014-12-23 08:08:41 -05:00
Jonathan Williams	07cca7a1d4	Fixed NPE in GameHostManager Fixed CD for creating server.	2014-12-23 06:46:05 -05:00
Chiss	4bfd34034b	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-12-23 22:19:50 +11:00
Chiss	8c2d879036	added ownership of legend particle for legends.	2014-12-23 22:17:39 +11:00
Jonathan Williams	d2e078f890	Fixed ranks for MPS	2014-12-23 06:04:42 -05:00
Jonathan Williams	fb841c3831	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex Conflicts: Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java	2014-12-23 05:57:45 -05:00
Jonathan Williams	bb8b1d60f9	30 seconds recharge on ability to host locally.	2014-12-23 05:56:17 -05:00
Shaun Bennett	5f509ca488	Rank fixes, visual fixes, lets hope things work!	2014-12-23 04:55:00 -06:00
Jonathan Williams	7ef2edd498	Removed extra enjin message. Added retrieval of servergroups to identify if server is a player server or not.	2014-12-23 04:19:24 -05:00
Jonathan Williams	9a767af018	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-12-23 03:44:05 -05:00
Jonathan Williams	f00854ee4c	Removed bad code thats bad from the bad birdy. Hooked in PersonalServer item click and command. Re-enabled redis transport commands. Added transfer command sending on personal server start. Updated Enjin to handle more versatile inventory purchases.	2014-12-23 03:43:56 -05:00
Chiss	6b5b072ae8	missing file	2014-12-23 19:36:23 +11:00
Chiss	7496f64d58	benefit	2014-12-23 19:36:10 +11:00
Jonathan Williams	103ff0e6b0	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-12-23 02:57:24 -05:00
Shaun Bennett	2a585936b7	Maybe I should test before I commit!	2014-12-23 00:37:29 -06:00
Shaun Bennett	2848ec2751	Use the correct data value this time!	2014-12-23 00:33:47 -06:00
Shaun Bennett	48fdfbb8f0	Hub changes for private servers	2014-12-23 00:30:15 -06:00
Jonathan Williams	4cac65a81f	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-12-23 00:50:20 -05:00
Jonathan Williams	0e85b7e6cc	Added HostName to server groups. Added handling of private server groups in server monitor. Optimized server group/server status load. Added ability to add/remove server group.	2014-12-23 00:49:52 -05:00
Chiss	0659f497c0	frost lord update	2014-12-23 15:00:32 +11:00
Chiss	4797b251b1	YAY Champions enable/disable works.	2014-12-23 11:39:03 +11:00
Chiss	825b25e8d1	fixed my bug in miniplugin	2014-12-23 11:29:48 +11:00
Chiss	ec9401506c	Game servers can now run champions/normal on the fly.	2014-12-23 11:18:48 +11:00
Chiss	a197724de8	fixed le bugs.	2014-12-23 10:48:15 +11:00
Chiss	224d1bbf63	blizzard particle redo hub text	2014-12-23 10:36:48 +11:00
Jonathan Williams	b83a81ec7e	Fixed little conflict issue.	2014-12-22 09:25:02 -05:00
Jonathan Williams	9b3350c8c7	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-12-22 09:22:50 -05:00
Jonathan Williams	d920439ec5	Clans update. Laying groundwork for energy	2014-12-22 09:22:10 -05:00
Chiss	4a50e3ae62	Merge branch 'chissbrokethis' Conflicts: Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleBlizzard.java	2014-12-22 10:57:39 +11:00
Chiss	98b614848d	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into HEAD Conflicts: Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleBlizzard.java	2014-12-22 10:54:31 +11:00
Chiss	1a56f074b3	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-12-22 10:22:13 +11:00
Chiss	eba54c6b8a	Removed hub snake parkour	2014-12-22 10:21:58 +11:00
Jonathan Williams	52cc0862d7	Memory leak fix for CUSTOM TAG	2014-12-18 18:29:33 -05:00
Shaun Bennett	4c4ba34d39	Merge pull request #5 from feature/chatslow to master * commit '9ef0ea629c57b148d815b93a455f9817ce512960': Added changes from master to Chat Chat Slow Command	2014-12-17 20:08:32 -06:00
Shaun Bennett	9ef0ea629c	Added changes from master to Chat	2014-12-17 20:07:39 -06:00
Shaun Bennett	899add5fcd	Merging changes from master Conflicts: Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java	2014-12-17 20:07:11 -06:00
Chiss	60f567a3fb	fixed some errors ;o	2014-12-18 12:47:00 +11:00
Chiss	679f7909b0	Merge branch 'feature/private-servers' of ssh://184.154.0.242:7999/min/mineplex into feature/private-servers	2014-12-18 12:45:56 +11:00
Chiss	56d14b7bc0	Particle stuff	2014-12-18 12:45:45 +11:00
Shaun Bennett	2677d2e557	Fancy icons for 1.8!	2014-12-17 19:15:31 -06:00
Shaun Bennett	d19431a47f	Rename Clicked to onClick	2014-12-17 18:40:44 -06:00
Shaun Bennett	6e42894d5c	Refactor button again	2014-12-17 18:33:24 -06:00
Chiss	12973aba7d	Merge branch 'master' into feature/private-servers	2014-12-17 16:47:19 +11:00
libraryaddict	e1db8d6a5d	Why was I missing a entitytype import..	2014-12-17 18:37:58 +13:00
libraryaddict	26d92f0381	Add missing class	2014-12-17 18:33:43 +13:00
libraryaddict	0e7adab3eb	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-12-17 18:32:50 +13:00
libraryaddict	17ac36d9ae	Add wither pet, pets are no longer stackable. Enderdragon no longer has his health changed in the hub	2014-12-17 18:31:51 +13:00
Shaun Bennett	83218c9a73	Pushing unfinished code for laptop	2014-12-16 11:42:06 -06:00
Chiss	a433ad764d	Wither Morph Legend Particle	2014-12-16 16:18:09 +11:00
Jonathan Williams	c43ee95c55	Added 1.8 hooks for disguise setName and getName Refactored method names in some disguise classes.	2014-12-15 21:46:14 -05:00
Chiss	1907014db4	disguise wither update	2014-12-16 13:28:59 +11:00
Chiss	2e7d101850	added material/data for gametypes	2014-12-16 12:26:37 +11:00
libraryaddict	75cf80652c	Remove customnametrue from horse mount	2014-12-16 01:36:42 +13:00
Chiss	d7eb01e8f0	fixed CC Bug :D	2014-12-15 15:49:52 +11:00
Jonathan Williams	e02bcd8b84	Revert the revert of the revert.	2014-12-14 22:58:49 -05:00
Chiss	d1be64d7e7	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex Conflicts: Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java	2014-12-15 14:56:09 +11:00
Chiss	95081a8ab7	Gems cannot be given multiple times for certain things (prevents bugs giving mass gems)	2014-12-15 14:33:38 +11:00
Jonathan Williams	4482e46250	Changed int to atomic for concurrency	2014-12-14 21:53:55 -05:00
Jonathan Williams	eefa4de838	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-12-14 20:50:35 -05:00
Jonathan Williams	2a58b822a0	Safeguard on connecting vlaues.	2014-12-14 20:50:19 -05:00
Chiss	d0f8a6a063	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-12-15 12:26:25 +11:00
Chiss	9136165d4f	fixed christmas elf name pet names now have limited range	2014-12-15 12:24:40 +11:00
Jonathan Williams	9fb2231d76	Added connecting clients as a factor for status snapshot. Added online check for DonationManager rewarding local info.	2014-12-14 02:32:52 -05:00
Jonathan Williams	5b67e2182a	Added disguise to Pet Manager for eventual wither disguised pet.	2014-12-14 02:30:39 -05:00
Chiss	78a34b1517	hopefully fixed a bug where pumpking king despawned. removed 11 disc from loot	2014-12-13 11:55:12 +11:00
libraryaddict	9a16616e6c	Add fix for wither bossbar and add a checkpoint hologram for snake bit in xmas	2014-12-12 12:40:23 +13:00
Chiss	6b1fa91565	Xmas Updates	2014-12-11 12:42:06 +11:00
Chiss	86b9d8342f	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/Christmas.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/Sleigh.java	2014-12-11 11:27:47 +11:00
Chiss	358d5fde44	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-12-10 22:38:19 +11:00
Chiss	450d3eb923	merge	2014-12-10 22:38:08 +11:00
Jonathan Williams	c4fee8e681	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex Conflicts: Plugins/Mineplex.Hub/.classpath	2014-12-10 03:34:53 -08:00
Jonathan Williams	ea034812b9	Fixed path finder crap in UtilEnt Cleaned up unused code in OutfitRaveSuit Fixed eclipse bug for NotificationManager Removed christmas/Sleigh columns.	2014-12-10 03:32:35 -08:00
Chiss	db8e0484ab	missing files + new pet	2014-12-10 18:23:22 +11:00
Chiss	0aba82eee6	fixed some eclipse java6 stuff with mail Christmas game update	2014-12-10 15:38:57 +11:00
Chiss	bee81ff455	lowered coin rewards	2014-12-09 20:23:56 +11:00
Chiss	828fabb80a	Initial Christmas Chaos update	2014-12-09 20:04:59 +11:00
Chiss	ef8e5104f1	SnD Kits minor bug fixes	2014-12-08 17:28:18 +11:00
Chiss	64c8edc292	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-12-08 17:25:03 +11:00
Shaun Bennett	0759a373da	Fix treasure chest hologram	2014-12-07 01:25:36 -06:00
Shaun Bennett	7402eb2f91	Merge remote-tracking branch 'origin/master'	2014-12-06 01:00:40 -06:00
Shaun Bennett	1276e0c0d5	Chat Slow Command	2014-12-05 21:33:31 -06: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	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	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
Jonathan Williams	1fd1e5cc34	Removed unused gem booster code.	2014-12-02 12:50:53 -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
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	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
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
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	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	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	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
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
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	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	c76ad50136	Allow removal of packet handler	2014-11-27 01:08:42 +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
libraryaddict	03075fecae	You have your HologramManager presented in a light most fair. Should be worth noting I didn't test it thoroughly	2014-11-26 10:28:37 +13:00
Jonathan Williams	484dfaaea9	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-25 13:25:41 -08:00
Jonathan Williams	3b54789767	Optimized logins dealing with mysql with multiqueries. Added lazy loading of Pool data and Loaded check before performing anything. Refactored MiniClientPlugin and created MiniDbClientPlugin Renamed RankBenefitManager9000 to BenefitManager Removed /send ability for now.	2014-11-25 13:25:13 -08:00
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
Chiss	2871446f74	reduced max amount of blocks from explosions	2014-11-23 15:01:04 +11: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
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	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	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
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	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
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
Jonathan Williams	857ff29461	Removed buggy player disguises. Removed datavalues from wither disguise.	2014-11-15 03:21:48 -08: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
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	62fbeeda20	Added Wither disguise.	2014-11-13 19:14:14 -08: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
Chiss	9eaacd20ab	fixed slime healing fixed sheep quest brute not dropping sheep updated punish page	2014-11-13 18:09:54 +11: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
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
Shaun Bennett	c0f2f8a88c	Remove useless comment/import	2014-11-11 01:47:03 -06: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	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
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	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	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
Jonathan Williams	2781bb3000	Removed stacking buffers.	2014-11-08 14:32:37 -08: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
CoderTim	4c98d833e0	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-11-07 18:33:46 -05:00
CoderTim	96f54c2949	Made DBPool class uninstantiatable	2014-11-07 18:27:20 -05: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
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	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	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	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	1a09c14642	Reverted database connection pooling because it caused severe login delays.	2014-11-05 14:39:22 -08: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	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
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	0095a03df7	returned bridges to normal	2014-11-01 11:11:35 +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	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	cc8912b27e	Added NPC info messages to NpcManager	2014-10-30 18:20:21 -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
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	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
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	bd2e7faf3e	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-10-25 13:40:53 +11:00
Chiss	4002528c51	Updated GUI text. - recharges/etc now use bottom text - uses appropriate bottom/top for 1.7 or 1.8 - fixed 1.7 dragon bar so it works as it did pre-1.8 - dragon bar in 1.8 will now send dragon+wither, for more reliability - renamed utils to be more clear	2014-10-25 13:40:34 +11:00
Shaun Bennett	5cf3e6c3a1	Fix for arcade custom tags	2014-10-24 19:36:22 -05: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
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
Jonathan Williams	8630a1ba4c	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-10-17 23:39:21 -05:00
Jonathan Williams	e3cd6f0e69	Fixed Mem leak in CustomTagFix Changed to ServerGameMenu Fix for overfilling HH servers Added staff ability to join all servers.	2014-10-17 23:29:24 -05:00
Chiss	075bc0af1d	Added gem rewards for MS achievements	2014-10-17 21:20: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
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
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
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	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
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
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	ed9dd6e894	Minor patches	2014-10-14 12:42:53 +11: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	9cc28d1ad8	MAC Update	2014-10-12 14:19:35 +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
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	a54b78fefa	Added Mine-Strike to Quick Game menu. Fixed up CoreClientManager's rank update.	2014-10-11 02:32:02 -07: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
CoderTim	3422f48325	New acheivements	2014-10-10 21:49:03 -04: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	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	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
Shaun Bennett	4253c08682	Fix time	2014-10-02 20:25:50 -05:00
Shaun Bennett	a6fea938b9	Fix some duplicate code	2014-10-02 20:01:33 -05: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
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
Shaun Bennett	7892c442d0	Add show mac reports user pref for mod+	2014-09-29 11:14:20 -05: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
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
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
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	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	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
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
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
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	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
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	c1bc9fca2e	Small treasure tweaks	2014-09-14 00:29:30 -05: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	a8eeef02dd	Adjustments to how treasure rewards are selected	2014-09-12 22:33:22 -05: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	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
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
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
Shaun Bennett	6441b110b4	Treasure stuff from laptop	2014-09-07 13:35:49 -05: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
Shaun Bennett	eb27c1dfbe	Add Util class for sending titles to players	2014-09-05 19:46:11 -05: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
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
CoderTim	91a2266a04	Set up jOOQ, fixed some IntelliJ issues, and added leaderboard stat tracking	2014-09-05 04:00:51 -04: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
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
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	05623b7522	Initial MineStrike push fixed frames being breakable in games	2014-09-01 21:37:39 +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
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
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	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	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
Jonathan Williams	526ca42add	Fixed Gem booster problem. FIxed stat problem.	2014-08-27 12:48:24 -07: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	9439daa852	Fixed bug where spectators could trigger anti-cheat in bridges	2014-08-27 15:16:20 +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
Shaun Bennett	8439838328	After years of research and experimenting, we settled on an achievement icon	2014-08-26 19:01:59 -05:00
Shaun Bennett	78eee68592	Change achievement icons, fix another typo	2014-08-26 18:39:01 -05: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
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
Shaun Bennett	99951bc573	Fix achievement typos	2014-08-26 04:20:33 -05: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	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
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	07ee44508e	Missing Gadgets	2014-08-26 08:17:41 +10: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
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	642f8b46b9	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-08-23 18:01:35 +10:00
Chiss	af9bf0727a	Fixed damage taken stat NPE Added tournament team auto-rejoin	2014-08-23 17:55:28 +10: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	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	9fad775f73	More cosmetics	2014-08-23 07:50:07 +10: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
Jonathan Williams	99d15d3ece	Work on Customer support server.	2014-08-21 15:55:09 -05:00
Jonathan Williams	830eeca835	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-20 20:14:32 -05: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	a7bb84be0b	Revert chris' revert	2014-08-19 21:24:49 -05: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
Chiss	94e5eb03da	Fixed errors for new getPlayers method.	2014-08-20 10:43:56 +10:00
Shaun Bennett	e1a57a673e	Update getOnlinePlayers() to recent bukkit changes, fixes IntelliJ errors	2014-08-19 16:58:55 -05: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	43fd604695	Queue up polls for players instead of constantly checking for next poll	2014-08-17 17:47:38 -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
Chiss	a888d4f14b	Fixed leaks	2014-08-16 15:39:02 +10:00
Ty	3c4c537998	Fix issue where broken Jedis instances were returned as functional instances.	2014-08-15 14:49:01 -04: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	74435bac12	fixed bug where players kept inventory open, to be able to enable morphs ingame.	2014-08-14 17:31:14 +10:00
Chiss	c72f4b6057	Dragon target cancel fix	2014-08-14 12:35:49 +10: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	4b4f43ac16	Convert PortalRepository's redis host fetch to ServerManager constant, and remove debug code section.	2014-08-13 16:37:05 -04: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	e4871c4988	Disabling cosmetics 5s before game starts, was having some carryover due to lag.	2014-08-11 11:55:00 +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
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
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
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
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	3f54881a3e	Fixed multiple purchase of Gem Booster.	2014-08-08 23:06:16 -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	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	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	fa3695be4e	Gem Booster In Lobby Achievement Stuff	2014-08-08 17:05:11 +10:00
Chiss	8f72ba4ab7	Hooked in statchangeevent	2014-08-08 13:53:58 +10:00
Chiss	1a33dbb5ee	Achievement Module Gem Booster/Achivement	2014-08-08 13:46:35 +10:00
Jonathan Williams	e051c1d62c	Work on inventoryManager and Enjin translator.	2014-08-07 21:22:18 -05:00
Jonathan Williams	5d89d1f728	Fixed gadget adding/removing from hotbar Fixed stats manager _stats not initializing Optimized saving call.	2014-08-07 01:46:10 -07:00
Jonathan Williams	2a31bbee95	Added new gadget stuff to core. Hooked up particle page.	2014-08-07 01:20:19 -07:00
Jonathan Williams	c01fbd279d	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex Conflicts: Plugins/Mineplex.Hub/src/mineplex/hub/gadget/GadgetManager.java	2014-08-07 00:48:32 -07:00
Jonathan Williams	055e4c5895	Converted PreferencesManager to RepositoryBase	2014-08-07 00:43:54 -07:00
Jonathan Williams	6d86f403ac	Added coins Currency to web api Added coins purchase for all cosmetic items Added Stats manager Added Inventory Manager Redesigned gadgets/morph/particle/pets/mounts page and inventory.	2014-08-07 00:33:24 -07:00
Chiss	c8dfb2f02e	Parser Fixes Sneaky Stuff	2014-08-06 11:07:49 +10:00
Ty	1b7c762942	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex Conflicts: Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/lobbyBalancer/LobbyBalancer.java Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/lobbyBalancer/LobbyBalancerRepository.java Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/GroupStatusData.java Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/Repository.java Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerGroupData.java Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java	2014-08-04 18:47:49 -04:00
CoderTim	39e23c16f0	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-08-04 00:00:12 -04:00
CoderTim	ec48a59301	Added option DISGUISE_TYPE:<ENTITY_TYPE> in WorldConfig.dat for Sneaky Assassins to configure which entity players are disguised as.	2014-08-03 23:59:10 -04:00
Shaun Bennett	6d7e8072d5	Remove premium server restriction in ServerCommand	2014-08-03 13:41:14 -05:00
Ty	6a9255e97b	Add new Mineplex.ServerData library for interfacing with the ServerRepository, and modify Mineplex.ServerMonitor, Mineplex.Bungee.Mineplexer and Mineplex.Core to integrate changes.	2014-08-01 17:56:29 -04:00
Jonathan Williams	53ce70488f	Merge pull request #1 from premium-server-menu to master * commit '95a45409a98c141a115e463e56e440b204ae2029': Use UtilPlayer and F.main for messaging Fix flashing clock (oops!) Sound effects and knockbacks! Flashing wool instead of clock for the timer Change duration of timer. Don't punish a party if the leader has ultra Lighten load on our servers, not free servers! Lore edit on clock item Place players on correct server corresponding to their rank via portals Visual clock update Fix lore messages not displaying correctly under certain circumstances Use constants for lore messages on server page Prevent free players from joining servers before time limit Deny joining Premium servers through server command without premium Fix "Click to Spectate" formatting Identify free servers from server name Add Server Menu for Premium Servers. Item lore still needs some work	2014-08-01 02:05:39 -05:00
Shaun Bennett	c2b1f2a52f	Deny joining Premium servers through server command without premium	2014-07-31 13:47:51 -05:00
Peter Miller	fb0469adfa	Chat filter API changes from TwoHat/PottyMouth to Inversoft/CleanSpeak.	2014-07-30 20:09:58 -04:00
Shaun Bennett	dcc8eaaa21	Add Server Menu for Premium Servers. Item lore still needs some work	2014-07-30 17:19:51 -05:00
Jonathan Williams	1362deca59	More work on FriendManager	2014-07-19 13:56:21 -07:00
Jonathan Williams	2ae3d89496	Fixed issue with RepositoryBase and Friend/MysqlRepo Each db call on login gets its own async after the first two account calls are finished.	2014-07-19 13:56:03 -07:00
Jonathan Williams	8b747a81e1	Fixed filter bypass	2014-07-19 13:53:14 -07:00
Jonathan Williams	3636255e8a	Fixed bug with DisguiseManager undisguising players. Temp fix for emeralds not triggering in Perk Revealer.	2014-07-14 23:48:34 -07:00
Jonathan Williams	1207ed8199	Added DDOSProtectionSwitcher email functionality mineplex.core.Server cleanup. Refactored RepositoryBase. Implemented core functionality of Friends	2014-07-14 22:58:36 -07:00
Peter Miller	58092c914a	Initial database access and method stubbing for "news" command.	2014-07-08 22:55:51 -04:00
Jonathan Williams	963c71f128	Fixed internet status stuff for bungees. Fixed new portal arg req.	2014-07-08 12:44:17 -07:00
Jonathan Williams	e6e86c2042	Updated DnsMadeEasy api. Cleaned up some bungee code. Added InternetStatus to Bungees. Fixed some portal stuff.	2014-07-08 12:20:19 -07:00
Peter Miller	ddf1a8ff74	Pointed "send" command to "AddTransferRecord" method in Portal module. Corrected "serverTarget" to "playerTarget" in "Player...does not exist!" message. Cleaned up unnecessary references.	2014-07-07 17:30:03 -04:00
Jonathan Williams	a66e877028	Cleaned up Bungee mineplexer a bit. Refactored send/server commands for Portal.	2014-07-05 10:56:20 -07:00
Jonathan Williams	c882ab1b34	Fixed portal command stuff. Removed temp code from PlayerTracker Added temp project for future ddos prot switching.	2014-07-04 23:23:19 -07:00
Jonathan Williams	e6666932aa	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-07-04 14:32:41 -07:00
Jonathan Williams	c265c7ce5c	Fixed sync db Logger.java Added temp test code in player tracker...ignore. fixed bug in dynamic server sorter.	2014-07-04 14:23:11 -07:00
CoderTim	2fb2aadf66	Merge remote-tracking branch 'origin/master'	2014-07-04 11:12:52 -04:00
Peter Miller	b56855c33c	Squished remaining concurrency/checking bugs! Happy 4th o'July!	2014-07-04 02:19:20 -04:00
Jonathan Williams	d2caf23ed7	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-07-03 11:19:23 -07:00
Jonathan Williams	b058665e93	Fixed sync db calls for PlayerTracker Fixed name update with new UUID Skeleton work for Friends	2014-07-03 11:18:11 -07:00
Peter Miller	2531dd7a8f	Implementing user/serverName checks	2014-07-03 00:17:49 -04:00
Jonathan Williams	d0fafce585	Reverted change to helper only joining full, now ultras can. Added check so BETA servers cannot be joined by less than Helper. Fixed message in AccountAdministrator for rankUpdate	2014-07-02 16:59:31 -07:00
Mini-Chiss	558f79fe34	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-07-02 10:58:34 -07:00
Mini-Chiss	17c36026f6	fixed bug where player who comes first was not being added to ranks. (get nothing)	2014-07-02 10:57:30 -07:00
Peter Miller	e7832fd06c	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex Conflicts: Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java	2014-07-02 03:47:14 -04:00
Peter Miller	1f515565ff	Moving improved server/send command code to separate command files	2014-07-02 03:24:48 -04:00
CoderTim	44a57a485f	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-07-01 21:39:03 -04:00
Jonathan Williams	41c4d5a0a8	Changed joining full servers to helper+	2014-07-01 18:33:33 -07:00
Jonathan Williams	6fd889d8fc	Added Player mapping. Removed joining full servers for ultra.	2014-07-01 18:31:17 -07:00
Jonathan Williams	b627e8fdf5	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-07-01 10:25:12 -07:00
Jonathan Williams	9fd3f14248	Added RankUpdate command. Fixed Lobby joinable issue with server monitor. Changed server monitor to be fully dynamic for us.	2014-07-01 10:23:22 -07:00
CoderTim	7ea818c0c8	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-07-01 02:20:45 -04:00
Mini-Chiss	7bc3966feb	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2014-06-30 16:13:15 -07:00
Mini-Chiss	8c461b3e1b	Cooldown on Spec Compass Hub Forcefield Update Scoreboard MINEPLEX refactor	2014-06-30 16:12:42 -07:00
Jonathan Williams	8e8e66f8c1	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-06-27 20:25:09 -07:00
Jonathan Williams	0287cfb2f6	Refactored Punish a bit so punishments don't expire early or jack up based on server's time.	2014-06-27 20:24:44 -07:00
CoderTim	ccb17d5ac3	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-06-27 19:33:34 -04:00
Peter Miller	60a6f22194	Added functionality for retrieving serverName from Bungee	2014-06-27 17:01:54 -04:00
Jonathan Williams	210264f25b	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-06-25 20:53:39 -07:00
Peter Miller	e25101cd59	Continued enhancements...	2014-06-25 20:28:27 -04:00
Jonathan Williams	f6ad5c5549	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-06-25 12:07:49 -07:00
Jonathan Williams	4f3ffde892	Added timing/debugging code.	2014-06-25 12:06:24 -07:00
Peter Miller	bb5aa8e0f3	Work on /server and /send commands with permissions (more permissions need to be implemented).	2014-06-24 22:34:17 -04:00
Jonathan Williams	93fbe70e9c	Added more loggingggggg.	2014-06-15 17:21:40 -07:00
Jonathan Williams	0f7885d911	Added safety checks in ClientManager Added logging and teampreference swap fix in arcade.	2014-06-15 16:25:32 -07:00
Jonathan Williams	336c307732	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-06-12 08:03:02 -07:00
Jonathan Williams	be8fea8ca9	Changed Chat API key. Fixed PreferenceManager not saving asynchronously.	2014-06-12 08:02:47 -07:00
Peter Miller	01fbda81ba	More suggested improvements; commented out getEntries method for now.	2014-06-11 02:35:44 -04:00
Peter Miller	63f082b424	Implementing suggested code style/locking changes and recommitting (JIRA-76)	2014-06-10 16:09:33 -04:00
Jonathan Williams	0bf702902e	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2014-06-08 11:28:25 -05:00
Jonathan Williams	3ae119d88a	Fixed hub package unlock bug. Fixed Champions build page open bug. MOved some code around because i'm a boss.	2014-06-08 11:27:14 -05:00
Peter Miller	77dad4b475	JIRA-76: SimpleStats Manager/Repository creation	2014-06-06 09:52:26 -04:00
Chiss	a8dda4ef8b	Hub Gem Queueing	2014-06-04 13:02:16 +10:00
Chiss	f2d1709adb	Hub update	2014-06-01 18:18:58 +10:00
Jonathan Williams	461e1023e3	Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex	2014-06-01 00:39:28 -07:00
Jonathan Williams	f157715174	Merged Pet page into Gadget page. Reworked gadget page.	2014-06-01 00:39:10 -07:00
Chiss	37c5654e13	Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex Conflicts: Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java	2014-06-01 15:50:11 +10:00
Chiss	a3a3a87278	Hug update	2014-06-01 15:47:34 +10:00
Jonathan Williams	7f87043f7b	Removed unused buttons. Fixed pref inv placement. Refactored queue code so its not stupid. Fixed issue with queuer.	2014-05-31 22:46:43 -07:00
Jonathan Williams	6505819a4b	Removed chat filtering. Implemented user preferences in all required modules.	2014-05-30 13:34:55 -07:00
Jonathan Williams	57c3845df9	Finished up preferences. Each preference saves, loads on login. GUI working great.	2014-05-30 01:42:43 -07:00
Jonathan Williams	77f6aac860	Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex	2014-05-30 00:26:34 -07:00
Jonathan Williams	b8908ada4b	Removed unused connection info in RetrieveClientInformationEvent Added required method for miniclientplugin Implemented Preferences module...repo/manager/gui	2014-05-30 00:25:48 -07:00
Chiss	937f5d8ef2	Hub stuff	2014-05-30 17:17:53 +10:00
Jonathan Williams	c38e60456b	OMG THIS THING IS SO COMPLICATED MY BRAIN FIZZZLED...fixed some queuer issues. Fixed bug with forcefield in hub. Fixed symbol for connecting to dbs in connection strings.	2014-05-29 19:47:57 -07:00
CoderTim	fbf59ace67	Fixed server status connection url	2014-05-28 19:13:10 -04:00
CoderTim	1b5b2d21b2	Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex	2014-05-28 17:51:38 -04:00
Jonathan Williams	0d350da6c0	Added more files and updated ignore list.	2014-05-28 11:23:32 -07:00
Jonathan Williams	d5ea6c5377	Removed dead project ServerStatus Tweaked connection strings so they autoreconnect. Added dragon sound to pre-queue prompt. Added rest of missing files.	2014-05-28 11:18:30 -07:00
Jonathan Williams	24ccf133af	Fixed bug with Portal where it continuously sent players until queue cleaned up records 15 seconds later.	2014-05-28 10:43:39 -07:00
CoderTim	94e31e36f8	Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex	2014-05-27 21:42:01 -04:00
CoderTim	e101c027ce	Created Sneaky Assassins and started work on the kits	2014-05-27 21:38:22 -04:00
CoderTim	091166f090	Refactored disguises to use EntityType	2014-05-27 17:49:45 -04:00
Jonathan Williams	449fa13cc3	Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex Conflicts: .gitignore	2014-05-27 02:23:22 -07:00
Jonathan Williams	0634ee5543	Removed unused global stuff in Mineplexer. Did some edits in GroupManager...need to pick that up. Changed TimeUtil to pop last entry when stopping. Fixed WorldUtil's dimension thing for UHC. Fixed Exception with AntihackRepository and no static lock object on _connection Work on Elo manager. Work on Queue. Added checking for player to server transfer records. Added option for rejoin time in TeamGame (UHC...yay)	2014-05-27 02:10:29 -07:00
CoderTim	c45e7d2a80	Converted file encoding from ISO-8859-1 to UTF-8	2014-05-25 19:42:39 -04:00
Peter Miller	e0dd0116a2	Beginning changes for stats from PlayerName to PlayerUUID	2014-05-06 17:06:19 -04:00
Jonathan Williams	a9d3d31339	Fixed memory problem with CraftingManager and arcade worlds that should be unloaded but are still referenced.	2014-05-06 09:14:31 -07:00
Jonathan Williams	56c0545659	Added elo files.	2014-05-06 09:08:22 -07:00
Jonathan Williams	8110506ac4	Fixed duplicate login issue with CoreClientManager Added EloRanking and EloStart for elo games in Game.java Refactored Elo code in Arcade to be based off of above values in Game Changed Lobby scoreboard in Arcade to just Players at top current/max.	2014-05-06 09:06:39 -07:00
Jonathan Williams	2f397e7d2a	Work on elo manager. implemented coreclient cleanup.	2014-05-04 22:40:44 -07:00
Jonathan Williams	97e083c1e7	Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex	2014-05-04 12:52:14 -07:00
Jonathan Williams	f623026dfc	Fixed projectile order issue..check for dead before collision. Fixed dead chunks in Aracde.	2014-05-04 12:52:04 -07:00
Chiss	3c2fc4c49b	Fixed MAC not being disabled	2014-05-03 17:29:55 +10:00
Jonathan Williams	0101531291	Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java	2014-05-02 23:15:08 -07:00
Jonathan Williams	484ba97b23	Updated file delete mechanism so there is no reflection. Removed list block on deleting players from coreclient quit.	2014-05-02 23:12:39 -07:00
Chiss	4304327bf9	Disallowed /spec during games.	2014-05-03 13:06:15 +10:00
Chiss	395a5d2c08	MAC disabled with Tournament Mode Bridges TM game desc fix	2014-05-03 11:47:15 +10:00
Chiss	1d4d98b910	Twitch Prep MAC changes	2014-05-02 14:35:41 +10:00
Chiss	c1360c63f0	More strikes for auto-kick Updated MAC kick message	2014-05-01 09:38:37 +10:00
Chiss	a17c1aca44	Allow more for lag in MAC	2014-05-01 09:36:30 +10:00
Chiss	8240101d60	Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex Conflicts: Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java	2014-05-01 09:33:59 +10:00
Chiss	423a355057	Helpers+ wont be kicked yb MAC	2014-05-01 09:31:47 +10:00
Jonathan Williams	f4a92ec07a	Implemented Logger Logger now catches all uncaught exceptions and logs them to DB. Put in some preventative checks in Hub/Party as they threw a lot of the same errors. Added autoreconnect to AntiHack as it was spamming errors in DB	2014-04-30 10:57:19 -07:00
Jonathan Williams	7637d94ae0	Added mysql logger. Hooked it up in a few places. Fixed Asynch crap with AntiHack.	2014-04-30 00:31:22 -07:00
Jonathan Williams	42e9fe879c	Fix for party filtered party messages going to everyone.	2014-04-29 13:45:38 -07:00
Jonathan Williams	e958a922fe	Fixed Hub chat so it goes through filter. Added back in server name so it tracks correctly. Fixed PlayerCount in Mineplexer AGAIN.	2014-04-29 12:53:22 -07:00
Jonathan Williams	cee2883786	Added some verbage around command center block. Fixed async chat connection stuff.	2014-04-29 12:13:32 -07:00
Jonathan Williams	3ec1653532	Added in chat filtering command and finished up filtration.	2014-04-29 11:54:20 -07:00
Jonathan Williams	1bcdc71c14	Added ping logging to Antihack reports.	2014-04-28 01:53:02 -07:00
Jonathan Williams	fd372b8418	Changed skills to 2k gems each. Changed power/booster to 2k gems each. Added AntiHack perm storage of kicks. Commented out SafeChat stuff for now.	2014-04-28 01:05:08 -07:00
Jonathan Williams	66aa7223cc	Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex	2014-04-27 21:59:35 -07:00
Jonathan Williams	47417dea6b	Implemented initial SafeChat.	2014-04-27 21:59:18 -07:00
Chiss	77809b409d	MAC Update	2014-04-28 12:28:48 +10:00
Jonathan Williams	7c9017f184	Fixed Bungee issue with ServerPing in MOTD. UPdated to latest spigot again. Removed useless 1.7 stat tracking. Fixed Party issue in hub	2014-04-26 02:47:04 -07:00
Jonathan Williams	9136fa0b15	Upgraded to latest spigot. Fixed npcs being so loud. Npcs are now ghosted automatically. Added UUID on login.	2014-04-25 00:44:14 -07:00
Jonathan Williams	458f5741d7	Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex	2014-04-19 20:54:04 -07:00
Jonathan Williams	e5e9cc7284	Custom Items in custom Builds for dom.	2014-04-19 20:53:55 -07:00
Chiss	de2b42e190	fixed tnt bug	2014-04-19 15:18:13 +10:00
Chiss	b720a6433c	Explosions crack carved stone brick	2014-04-19 15:10:30 +10:00
Chiss	081da93bbd	blocked /bukkit:me	2014-04-13 11:19:16 +10:00
Chiss	f25a6c26c9	Champs Update	2014-04-13 11:06:10 +10:00
Jonathan Williams	1cb35262ac	Fixed skill tokens not being returned.	2014-04-12 14:02:40 -07:00
Jonathan Williams	8f42d91d8a	Fixed ban kick bug. Fixed Hub right click mount crash bug. Fix for custom builds not saving. Fixed Bridges not starting/hanging. Updated to 1.7.8 spigot support. Removed logging on HS.	2014-04-12 01:28:33 -07:00
Chiss	80df2c2944	Bux fixes for 1.7 Champions TDM SSM Domination	2014-04-11 15:33:31 +10:00
Chiss	71b2931936	Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex	2014-04-11 10:34:51 +10:00
Chiss	2adf0395a1	Merge	2014-04-11 10:33:56 +10:00
Jonathan Williams	0375384fb5	Converted to Spigot's latest 1.7.5	2014-04-10 17:15:44 -07:00
Jonathan Williams	a26894fda6	Added missing file.	2014-04-09 21:38:12 -07:00
Chiss	85c57f2942	IButton now has Left/Right Added right-click skill removal.	2014-04-06 12:45:52 +10:00
Jonathan Williams	ddcc8a26b3	Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex	2014-04-04 15:02:42 -04:00
Jonathan Williams	edfe23fb01	Fixed collision with Projectiles.	2014-04-04 15:02:13 -04:00
Chiss	13b8f1e7ea	Champs Update	2014-04-04 13:26:00 +11:00
Chiss	26fe974b00	More CHamps	2014-04-03 15:48:58 +11:00
Chiss	80c153095b	Cooldown bar	2014-04-02 22:03:56 +11:00
Chiss	2f0167ea09	Champs Update	2014-04-02 21:22:21 +11:00
Chiss	2aaf749414	Champions Update	2014-04-02 15:19:58 +11:00
Jonathan Williams	afc26e21e3	Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex	2014-03-29 18:46:52 -04:00
Chiss	0f937b165c	skill shop stuff	2014-03-30 09:45:53 +11:00
Jonathan Williams	d227a6bd06	Changed full server message	2014-03-29 18:45:44 -04:00
Chiss	fce249d7d8	fixed some desc stuff castle seige removed OP kit	2014-03-28 18:50:38 +11:00
Chiss	f5ca6408f8	Merge?	2014-03-28 14:51:26 +11:00
Jonathan Williams	17e6658437	Fixed up AntiHack database reporting.	2014-03-24 01:16:02 -07:00
Jonathan Williams	8bf78fe14d	Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex	2014-03-21 15:30:06 -07:00
Jonathan Williams	33d342b049	updated 1.7 stuff.	2014-03-21 10:57:31 -07:00
Chiss	ab2a72ba16	CS Update	2014-03-21 11:59:56 +11:00
Jonathan Williams	f24f81b7c3	Finished conversion.	2014-03-19 04:09:40 -07:00
Jonathan Williams	7042159f46	Updated to 1.7 and changed namespaces to 1.7	2014-03-19 02:24:26 -07:00
Jonathan Williams	de1365b5cf	Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex	2014-03-13 17:56:16 -07:00
Jonathan Williams	efee9fdcbf	Fixed Hub class shop. Added chat logging. Added message with file updater.	2014-03-13 17:56:05 -07:00
Chiss	82644002c5	A little bit o dem ol bug fixles. yknow what im sayin?	2014-03-13 16:32:48 +11:00
Jonathan Williams	a565da45e4	Added classes to champions. Added ability to open direct classes page.	2014-03-09 19:32:27 -07:00
Jonathan Williams	f51a6747fd	Moved files into Mineplex.core Removed references to Core project.	2014-03-09 00:50:13 -08:00
Jonathan Williams	d99a3c9253	Optimized mysql queries with server status' address/updated fields. Removed double gems. Added BETA check for Hero only beta games.	2014-03-03 12:47:57 -08:00
Jonathan Williams	b3f10b9d62	Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex	2014-03-01 01:59:25 -08:00
Chiss	bfaa138526	Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex	2014-03-01 10:35:20 +11:00
Chiss	7cf6391ddd	Sheep Quest Double Gem Weekend	2014-03-01 10:35:06 +11:00
Jonathan Williams	8550307904	Removed unnecessary mysql call on client login.	2014-02-28 13:22:30 -08:00
Jonathan Williams	c2044f7e8a	Added horse disguise. Added Hub redirect on full. Fixed Repo for ServerMonitor. Fixed Bridge QuitOut/AutoBalance issue. Removed unnecessary region folder create in dominate.	2014-02-28 01:18:32 -08:00
Jonathan Williams	f2570caad5	Swapped default connections to new dns names. Fixed bug with LobbyBalancer and retrieving no lobbies.	2014-02-21 13:32:14 -08:00
Jonathan Williams	a75ced170c	Added whitelist check in CoreClientManager	2014-02-10 02:04:20 -08:00
Chiss	e124dde006	Finished Gravity INcluded map	2014-01-21 22:48:18 +11:00
Jonathan Williams	0fba94f8ae	Derp	2014-01-20 20:22:59 -06:00
Chiss	76b2baf626	Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex	2014-01-21 11:28:37 +11:00
Chiss	7bbfdd1a42	Gravity Update	2014-01-21 11:28:12 +11:00
Jonathan Williams	dea96a9e65	Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex	2014-01-18 09:08:12 -06:00
Jonathan Williams	177f4a878b	Removed bad eventhandler line Refactored StatsManager Removed Pvp Table add for StatsManager Added commented out hooks for HG stats	2014-01-18 09:02:56 -06:00
Chiss	75669e2333	Hub News Changes AntiHack Autokick for Severe Hackers	2014-01-18 20:33:38 +11:00
Chiss	1031846198	SSM Update Gravity game start	2014-01-18 12:34:24 +11:00
Jonathan Williams	ea320e7f5b	Removed Client cleanup. Modified server monitor process handling.	2014-01-08 15:18:52 -05:00
Jonathan Williams	6904f9cf3d	Minor verbage "Starting in 1 Second." Fixed NPE in client cleanup.	2014-01-03 05:50:05 -05:00
Jonathan Williams	93c0575fe2	Fixed naming in some hub modules. Fixed StatusManager ip and DynamicServer comparison. Tweaked Bungee Lobby selection so it doesn't select a Lobby with < 10 slots left Added client cleanup in CoreClientManager Added Paintball cleanup Added AntiHack ignore list cleanup. Added clearDisguises call in DisguiseManager Added ServerMonitor tracking based on Private Address.	2014-01-03 01:37:39 -05:00
Jonathan Williams	dd7b178a9f	Fixed Hero rank in EnjinTranslator	2013-12-26 19:44:36 -05:00
Chiss	d92515eef9	Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex	2013-12-24 19:14:54 +11:00
Chiss	74e49a3ff1	Hero Rank stuff New SSM Kit	2013-12-24 19:14:40 +11:00
Jonathan Williams	6595d33899	Tuned chunk load for disguise manager. Disabled dynamic text in hub.	2013-12-24 00:39:33 -05:00
Jonathan Williams	79de7f2bfc	Fixed portal breaking with Frost horse. Added memory clean up for disguises	2013-12-23 04:16:53 -05:00
Chiss	c969775df3	Hub gadgets for xmas	2013-12-21 19:00:30 +11:00
Chiss	c582b210b5	Hub + Stats + Tournament	2013-12-14 16:51:08 +11:00
Chiss	3ca67d60c0	Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex	2013-12-14 16:38:46 +11:00
Chiss	9af8676307	Hub/Stats	2013-12-14 16:38:16 +11:00
Jonathan Williams	ac049e0397	FINE JUST FINE>>>>>> STUPID CHICKENS	2013-12-13 21:36:57 -08:00
Jonathan Williams	69fa9eaba5	Added getters for stats/StatsManager.java	2013-12-13 21:35:04 -08:00
Jonathan Williams	e054b06cc2	Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex	2013-12-13 21:01:08 -08:00
Jonathan Williams	6b92b6c4a8	Added stats manager. Added lots of missing files.	2013-12-13 21:00:56 -08:00
Chiss	5f2e457362	Minor HG Stuffs ;o	2013-12-13 16:21:39 +11:00
Jonathan Williams	03627eb0c3	Changed all mysql connections to be persistent.	2013-12-06 01:57:09 -08:00
Chiss	0b7bf00ca7	Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex	2013-11-22 18:41:31 +11:00
Chiss	0a683416ff	SG Update	2013-11-22 18:40:38 +11:00
Jonathan Williams	be7ea65033	Website bin/obj cleanup Fixed Pet Rename problem. Fixed Extra Pet tag problem. Added ServerStatus for dedicated servers.	2013-11-21 12:08:58 -08:00
Chiss	85a3edc75e	Mute should now correctly block all command input too.	2013-11-17 11:04:54 +11:00
Jonathan Williams	39384470e7	Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex	2013-11-15 21:41:23 -08:00
Jonathan Williams	84acc952fa	Added DisguiseCat. Added CookieTown Block Hunt.	2013-11-15 21:41:14 -08:00
Chiss	29ce493f64	Hide and SEEEEEEK (block honts)	2013-11-15 18:52:46 +11:00
Jonathan Williams	115109e5b8	Added sound disguise for DisguiseBase Small desc tweak on server monitor.	2013-11-14 00:01:41 -05:00
Jonathan Williams	980ce0a5a3	Block disguise velocity tweak.	2013-11-08 16:06:17 -08:00
Chiss	255307088c	Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex Conflicts: Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java	2013-11-09 10:03:49 +11:00
Chiss	3c5b1fe74f	H&S Updates some punish fixes hub toggles no longer pulse on pressure plate	2013-11-09 09:48:40 +11:00
Jonathan Williams	cae10fe7b4	Fixes to DynamicServer Monitor Fixed SSM disguise clunky movement.	2013-11-08 10:52:56 -08:00
Jonathan Williams	7cc880afd1	ServerMonitor tweaks.	2013-11-07 00:22:04 -08:00
Chiss	8fa7b9f283	Helpers can use WARNINGS	2013-11-07 17:03:34 +11:00
Chiss	6b577af7b4	Punish Update H&S Additions	2013-11-07 15:25:46 +11:00
Jonathan Williams	e0d10f6550	Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex	2013-11-06 19:48:27 -08:00
Jonathan Williams	41e9ffb018	Removed BungeeSigns Updated Bungee plugin to pull US servers only. Added dynamic MOTD from mysql for BungeeCord.jar Fixed crash for disguise block arm animation.	2013-11-06 19:48:00 -08:00
Chiss	9f11352f10	Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex	2013-11-07 10:19:30 +11:00
Chiss	03731de7f8	Rank changes MAC no longer kicks lag/fly some H&S stuff :O	2013-11-07 10:18:36 +11:00
Jonathan Williams	9327e71519	MOre work on dynamic server baby!	2013-11-06 01:03:02 -08:00
Jonathan Williams	2064c58d1b	Fixed up ServerStatusRepository to insert into specific columns Fixed Dominate shop. Some work on Server Monitor	2013-11-05 10:19:04 -08:00
Chiss	c72f1337e8	fixed memory leak in antihack	2013-11-01 10:40:33 +11:00
Chiss	386e2e3067	Added Champs MAC update	2013-10-31 09:45:11 +11:00
Jonathan Williams	1781ed15c4	Fixed some drop item stuff.	2013-10-26 12:02:18 -05:00
Jonathan Williams	0b0fa383f6	Finished up Gadget shop.	2013-10-26 10:45:41 -05:00
Chiss	7eb1cc6519	Halloween game additions	2013-10-27 00:06:44 +11:00
Jonathan Williams	ca3979f4fa	Added witch disguise hurt sound	2013-10-25 20:12:01 -05:00
Jonathan Williams	8883855297	Added witch disguise Added missing files.	2013-10-25 19:05:26 -05:00
Chiss	e8ddfc266e	fsd6gty72 tjn6g wgh	2013-10-25 22:20:46 +11:00
Jonathan Williams	e5f99331dd	Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex	2013-10-25 05:16:15 -05:00
Chiss	5563d94111	Halloween event update hub News hub mounts hub gadgets	2013-10-25 19:20:14 +11:00
Jonathan Williams	21128eb153	Prepping filterChat and CoreClientManager for mysql Removed get all clients at server start.	2013-10-23 16:36:13 -05:00
Chiss	1977572ced	Added Halloween Minigame Updated gadgets and other minor things.	2013-10-22 15:46:31 +11:00
Jonathan Williams	985ce795d2	Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex	2013-10-18 00:50:49 -07:00
Jonathan Williams	90fbc397ff	Converted gem rewards to boolean return from website. Implemented gem transactions and source.	2013-10-18 00:46:06 -07:00
Chiss	02258b9fd3	Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex	2013-10-18 09:12:19 +11:00
Chiss	882ede9a21	tp ah exception	2013-10-18 09:09:29 +11:00
Jonathan Williams	7e77f78d2f	Removed all client list pull.	2013-10-17 00:54:14 -07:00
Jonathan Williams	43b42f771a	Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex Conflicts: Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java	2013-10-17 00:40:06 -07:00
Jonathan Williams	f88c202e07	Added AntiHack to Arcade/Hub Added AntiHack Offense uploading. Fixed memory leaks in PreparedStatments Added Ultra tag in hub chat.	2013-10-17 00:37:57 -07:00
Chiss	410e08b06a	Clearer MAC reporting to staff	2013-10-17 09:05:03 +11:00
Chiss	4d6a0e2133	Ah no kick	2013-10-17 09:02:52 +11:00
Chiss	d9ecbf4037	AH Update	2013-10-17 09:01:36 +11:00
Chiss	d23f72567a	fixed bug.	2013-10-16 17:22:28 +11:00
Chiss	9cdcbed086	Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex	2013-10-16 12:24:02 +11:00
Chiss	2a836f3464	Added anti-hack	2013-10-16 12:23:23 +11:00
Jonathan Williams	483f8ffde3	Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex	2013-10-15 14:20:45 -07:00
Jonathan Williams	1a5f6a9b74	Coreclient fix.	2013-10-15 14:18:13 -07:00
Chiss	40e49dd3d4	Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex	2013-10-16 08:11:04 +11:00
Chiss	ec80d8a568	added AntiHack added dragonrider coolness	2013-10-16 08:10:45 +11:00
Jonathan Williams	c68bfce21a	Fix for null pointer in core client cleanup	2013-10-14 12:20:49 -07:00
Jonathan Williams	922d269a52	Added core client cleanup in case of weird glitch from bungee	2013-10-13 22:40:06 -07:00
Jonathan Williams	6c568cb7a9	Added MemoryFix to Arcade Added Dipose override and task cancellation to Confirmationpage Cleaned up unused code in Updater	2013-10-13 21:51:25 -07:00
Chiss	230ad4aa7b	Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex	2013-10-14 10:29:48 +11:00
Chiss	9ffc793f61	added Dragon Rider anti-stack changes (dont anti-stack mined blocks)	2013-10-14 10:29:20 +11:00
Jonathan Williams	1c1fb056a6	Memory leak fix for explosion blocks.	2013-10-13 01:27:41 -07:00
Chiss	a34b6da238	even less blocks	2013-10-13 09:20:00 +11:00
Chiss	bb39f18573	Explosion creates less blocks.	2013-10-13 09:18:49 +11:00
Jonathan Williams	e723075298	Increased lobby menu size. Fixed memory leak in Explosion	2013-10-12 02:52:35 -07:00
Jonathan Williams	42b932e612	Added inventory move prevention for all inventories Prevent bone from being turned into bonemeal and being fed to pet wolf. Fixed Dominate shop in hub.	2013-10-12 01:55:32 -07:00
Jonathan Williams	f2c295c391	Fixed global ultra joining full games.	2013-10-11 22:03:17 -07:00
Jonathan Williams	fc18d0fbb1	Added null check logging to arcade custom kit name. Removed wolf kit in SSM for release Cleaned up PlayerAccountController Fixed connection leak for mysql connections. Added server shutdown if server is empty for dominate.	2013-10-10 09:01:48 -07:00
Jonathan Williams	3999f80a79	Fixed Lobby balancer issue and null bungee connect. Optimized lobby balancing based on connects per second. Added Pet deactivation. Possibly fixed asynchronous pet spawning as well. TODO : Realized we are doing a lot of async stuff....stupid jon jon.	2013-10-08 02:22:04 -07:00
Jonathan Williams	1431961b39	Fixed issues with Pet menu. Fixed typo in Welcome Tutorial	2013-10-05 00:59:45 -07:00
Jonathan Williams	f389378bd2	Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master	2013-10-04 23:57:58 -07:00
Jonathan Williams	4ed1d97a33	Added missing pet buttons.	2013-10-04 23:56:16 -07:00
Jonathan Williams	59d7a78086	Revamped pet purchase and added pet menu to player hotbar. Fixed ServerStatusManager still firing errors if IgnoreUpdates was in.	2013-10-04 23:55:05 -07:00
Chiss	ab45c717dd	Merge branch 'master' of ssh://198.245.50.91:7999/min/master	2013-10-05 07:49:21 +10:00
Chiss	3ba848567c	paintball added hg additions minor changes to other games	2013-10-05 07:49:05 +10:00
Jonathan Williams	57b0d06786	Added DisguiseWolf Added lobby menu (disabled autogive for testing) Removed unused commands.	2013-10-02 22:23:01 -07:00
Jonathan Williams	b6d33010ca	- Lava parkour fire ticks are no more - Lava gem rewards on npcs reflect actual value (1000 and 4000) - Can't carry people into parkour areas now Removed unused code with Portal Added portal functionality for server quick join Disabled SG text Updated quick game menu text.	2013-09-27 12:40:09 -07:00
Jonathan Williams	b71ff09fb5	Fixed double server status manager in MK Fixed tps of 0. Fixed couple bugs in Shop/Conf page.	2013-09-26 21:18:31 -07:00
Chiss	064dd97d00	HitBox support for disguises Squid hitbox added Changed squid swimming!	2013-09-24 08:56:09 +10:00
Jonathan Williams	68e068092f	Fix for ageable.	2013-09-23 15:09:52 -07:00
Jonathan Williams	6d5acd29db	Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master Conflicts: Plugins/Libraries/craftbukkit.jar	2013-09-23 13:53:28 -07:00
Jonathan Williams	10994924c2	Fixes for Bungee lobby balancer. Exception handling in PlayerJoinEvents for hub (tracking a bug) Fix in pages for shop. Support eth1 private address setting in server status. Fix for bug in ClientClass.	2013-09-23 13:30:40 -07:00
Chiss	eae38dfa22	Merge branch 'master' of ssh://198.245.50.91:7999/min/master Conflicts: Plugins/Libraries/craftbukkit.jar	2013-09-23 15:50:30 +10:00
Chiss	bf4dc35b5f	Added pig Game added squid game added recharged skill event	2013-09-23 15:48:35 +10:00
Jonathan Williams	8aad215475	Added sheep color/shear for disguise	2013-09-22 21:12:08 -07:00
Jonathan Williams	e098d93155	Added baby disguise ability. Added Stacker recharge. Fixed issue with ServerGameMenu Champions button. SuperSmash decreased hunger gain on attack. Code cleanup.	2013-09-22 20:53:24 -07:00
Jonathan Williams	cc63fdccfc	Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master	2013-09-21 15:02:14 -07:00
Jonathan Williams	558d9b4cc6	Added shop link to kits. REmoved client cache. Added random messages. Fixed problem with Confirmation Page.	2013-09-21 15:01:40 -07:00
Chiss	b3a78112be	Fixed gem display bug	2013-09-21 13:53:12 +10:00
Chiss	9da18ea43f	Merge branch 'master' of ssh://198.245.50.91:7999/min/master	2013-09-21 08:34:24 +10:00
Chiss	a92c74a28a	HG Updates Other minor fixes	2013-09-21 08:34:07 +10:00
Jonathan Williams	85cc6e5b2b	Updated to 1.6.4	2013-09-20 01:50:56 -07:00
Jonathan Williams	3622808e09	Fix for task cancelling.	2013-09-19 02:39:53 -07:00
Jonathan Williams	7329cc0aea	Implemented quick game menu. Fixed dom team size at 1. Removed old server update code from server manager.	2013-09-18 22:11:49 -07:00
Jonathan Williams	978254c16c	Fixed dominate start issues. Fixed issue with server status manager and config for server tracker. Changed minekart mob name. Updated Minekart with new server status stuff. Updated Dominate with new server status stuff.	2013-09-18 05:16:29 -07:00
Jonathan Williams	ae00d3df18	Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master	2013-09-17 15:52:16 -07:00
Jonathan Williams	f31a734a0d	Fixed server pages to show 5 servers. Added in creeper explode block list for UHC.java Added task assignment/reward message only on return confirm call. Hide players in hub when they have an inventory open. Added gem command into donation manager. Revamped bungee player count method. Revamped server status method.	2013-09-17 15:50:23 -07:00
Chiss	f280fb51f2	Mute now blocks commands too.	2013-09-17 14:54:50 +10:00
Chiss	34c333dac9	added announcement logging fixed creeper explosion disable for uhc fixed player logout thing for UHC?	2013-09-14 12:27:40 +10:00
Jonathan Williams	c976a46f1f	Optimized UtilText/MapUtil.java Added quick game menu. Still needs work.	2013-09-13 15:25:01 -07:00
Chiss	b1744e86d8	many UHC bug fixes dragon escape bug fixes barbarians bug fixes death tag fixes	2013-09-13 12:24:33 +10:00
Chiss	2a65086b70	Added Milk the Cow Maps now set Min/Max Y	2013-09-12 08:57:51 +10:00
Jonathan Williams	0d98868a1f	Fixed comparison issue in server page UI. Added DisguiseBlock for disguises.	2013-09-09 18:42:20 -07:00
Jonathan Williams	0f577c3f8c	Added ultra tag in hub.	2013-09-09 17:17:55 -07:00
Jonathan Williams	77a6c4c658	Fix for confirmation page NPE	2013-09-09 17:07:45 -07:00
Jonathan Williams	6b7b6c9fdf	Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master Conflicts: Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java	2013-09-09 01:30:28 -07:00
Jonathan Williams	d4b3c5d461	Fixed memory leaks. Added in party joining for servers in Hub Modified server status's in server UI.	2013-09-09 01:28:35 -07:00
Chiss	9fe33bab84	Added UHC Added pig disguise Added func to Game base to support UHC Moved map to Core	2013-09-09 18:06:44 +10:00
Chiss	213b1efb0c	Added Dragon Escape fixed kit availability for runner SSM: wither skel projectile continues after releasing block SSM: nerfed blizzard SSM: reduced gem price of a few kits	2013-09-06 15:58:58 +10:00
Chiss	768f57ae5e	SSM: Added Wither Skeleton and Creeper kits Compass: no longer teleports if not holding compass (on click) SSM: various balance changes.	2013-09-05 13:55:42 +10:00
Jonathan Williams	9121d429c2	Added armor show/hide for insentient disguises.	2013-09-04 19:56:43 -07:00
Jonathan Williams	97405f6cfa	Fixed NPE in SkillPage Added some timing debug text // for now Changed utiltext setting method.	2013-09-04 18:52:08 -07:00
Jonathan Williams	34dd5a1af3	Added broadcast command. Added Chat to hub. Disabled /me Fixed Pets not returning when pushed off into the void. Prevented eggs from spawning in hub.	2013-09-04 11:35:59 -07:00
Jonathan Williams	d5ef0208a1	Added lag meter to hub and arcade.	2013-09-03 23:31:29 -07:00
Jonathan Williams	b894aea72a	Fixed login speeds. Implemented Tasks for Tutorial Removed compiled files for website.	2013-09-03 11:34:28 -07:00
Jonathan Williams	cec476c72d	Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master	2013-09-03 08:52:20 -07:00
Jonathan Williams	d16b674f46	Memory cleanup (Recharge, ClassCombatShop) Implemented Tasks.	2013-09-03 08:51:44 -07:00
Chiss	83567fce50	SSM slime nerf disguise 0 velocity packet fix	2013-09-03 10:47:15 +10:00
Jonathan Williams	74dba53e32	Fixed ignore update.	2013-09-02 16:24:04 -07:00
Jonathan Williams	5aec6509ca	Fixed shop inventory loss bug. Added IgnoreUpdate.dat file check for testing with FileUPdater. Fixed bug in SkillPage Fixed bug in ClassCombatShop Disabled dragon spawning in hub.	2013-09-02 16:20:14 -07:00
Jonathan Williams	59f2b9ebc8	Memory cleanup with all MiniPlugins. Added Dragon. Cleanup memory with Class Restore	2013-09-02 05:37:33 -07:00
Jonathan Williams	8840f04977	Fixed FileUpdater. Added FileUpdater to DOM and Arcade.	2013-09-02 04:19:56 -07:00
Jonathan Williams	d0098b8a46	Removed double jump effect for surrounding players in hub. Disabled Dragon spawning in HubManager.java(pending fix) Fixed priority on MOTD for FileUPdater.	2013-09-02 01:16:29 -07:00
Jonathan Williams	af7a41ae71	Implemented ServerRestart event on FileUpdate check. Implemented cancels in arcade/dom/mk Implemented Restart updates in server manager page. Implemented lobby removal is restarting.	2013-09-02 01:09:28 -07:00
Jonathan Williams	63d2563f92	Added Disguise hurt sounds. Enabled disguised hurt sounds in DamageManager	2013-09-01 23:28:07 -07:00
Jonathan Williams	a49f67b33c	Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master	2013-09-01 22:06:35 -07:00
Jonathan Williams	f0b0c72ddb	Fixed arcade packethandler problem. Fixed skill page issue for class combat.	2013-09-01 22:06:20 -07:00
Chiss	c483d869a5	Added SSM Spider and Squid Kit prepared DamageManager.java for disguise sounds minor SSM balance changes fixed compass targetting self.	2013-09-02 14:40:06 +10:00
Jonathan Williams	3041cacb26	Renamed disguise methods to lowercase.	2013-09-01 16:38:32 -07:00
Jonathan Williams	07ad83fa41	Added getDisguise Renamed new methods to lowercase.	2013-09-01 16:35:17 -07:00
Jonathan Williams	181f3d4746	Added to DisguiseManager: -ReApplyDisguise -UpdateDisguise -IsDisguised	2013-09-01 16:30:17 -07:00
Jonathan Williams	148c288d4f	Fixed shop bug affecting server menu and class setup in hub.	2013-09-01 16:17:44 -07:00
Jonathan Williams	d14b21d29f	Removed VoteHub.java Added commons codec to all build paths for Ant Fixed pet shop new name. Added send all for Portal. Updated Hubmanager	2013-08-31 20:28:35 -07:00
Jonathan Williams	e3fa648fc9	HUb minekart rider disguise....	2013-08-31 02:01:41 -07:00
Jonathan Williams	c0198b1b1f	Fixed vegetate...derp.	2013-08-31 01:36:40 -07:00
Jonathan Williams	0f4facd407	whitespace gone.	2013-08-31 01:29:52 -07:00
Jonathan Williams	e530e3b5a8	Fix for npc vegetate.	2013-08-31 01:29:32 -07:00
Chiss	81f8503180	Merge commit '13110356aabbcc69d83ce29d8f9e5bec27812009' Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/deathtag/kits/KitArcher.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/kits/KitCoward.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/kits/KitMarksman.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/kits/KitPyrotechnic.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/horsecharge/kits/KitDefenceArcher.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/horsecharge/kits/KitHorseKnight.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitBrawler.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitElementalist.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitLeaper.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitInfiltrator.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitMarksman.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitShredder.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanElementalist.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanKnight.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanMarksman.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanPeasant.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitSurvivorArcher.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitSurvivorKnight.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitSurvivorRogue.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitUndeadAlpha.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java	2013-08-31 13:41:58 +10:00
Chiss	e17368a9ac	>.< Updates	2013-08-31 13:15:16 +10:00
Jonathan Williams	13110356aa	Added Enjin Translator poll ability. Fixed up kits for arcade. Fixed disguise for enderman to not teleport on fire ticks.	2013-08-30 16:37:21 -07:00
Jonathan Williams	90de0c3ed2	Added LobbyBalancer for BungeeCord Added EnjinTranslator for automatic shop. Removed enjin module from Hub Tweaked donation/punish/accountadministrator for shop automation.	2013-08-30 01:36:55 -07:00
Jonathan Williams	bb2af17856	Cleaned up files.	2013-08-30 01:26:12 -07:00
Chiss	8559e77a24	"UPDATES!"loooooooool	2013-08-29 16:13:05 +10:00
Jonathan Williams	a1d622c790	Tweaked disguise movement to cut out jitters.	2013-08-28 15:00:39 -07:00
Jonathan Williams	cb48c2a037	Test for git push.	2013-08-27 16:47:58 -07:00
Jonathan Williams	c9dd8d87eb	Fixed DOm crash issue on game start. Added Teleport to Hub Fixed DisguiseManager bleeding over. Fixed Teleport sub commands	2013-08-27 16:03:04 -07:00
Jonathan Williams	3fb52c5c71	Initial Commit	2013-08-27 08:14:08 -07:00

... 17 18 19 20 21 ...

1847 Commits