Mineplex2018-withcommit

JarvisBigBalls/Mineplex2018-withcommit

Author	SHA1	Message	Date
Sam	c3c61b8189	Merge fix	2016-09-03 18:29:18 +01:00
cnr	c9358d8c5a	Add power play to support server	2016-09-02 19:10:30 -05:00
Keir Nellyer	a5efacc12f	PC-955 Fix closing gui showing incorrect suspect name	2016-09-02 14:31:38 +01:00
cnr	ae0d30558c	Merge branch 'update/the-smoothest-release-we-will-never-have' into develop	2016-09-02 00:12:12 -05:00
cnr	f6db5393a3	Merge branch 'project-cosmetics' into develop	2016-09-02 00:08:23 -05:00
cnr	71b880793f	Implement power play logging and initial rewards	2016-09-02 00:01:49 -05:00
TadahTech	9e0bb6ff96	Tweak invite starting index. Disable NextBestGame in an MPS	2016-09-01 20:59:28 -05:00
Keir Nellyer	78048ac279	PC-947 Add bypass for handling reports created or made against for developer	2016-09-01 18:21:50 +01:00
Keir Nellyer	d39dae748c	PC-947 Don't allow staff members to handle reports created by or made against them	2016-09-01 17:55:36 +01:00
TadahTech	9fcee07427	Fix people getting stuck in chests.	2016-09-01 05:34:37 -05:00
cnr	9cd5b73432	Merge branch 'update/basketball-game' into develop	2016-08-31 23:19:51 -05:00
cnr	55086efd91	Merge branch 'feature/shadowmute' into develop	2016-08-31 23:16:57 -05:00
LCastr0	8e8719070c	Changes Omega Chest to not be craftable Changes LockCosmetic and PowerPlay commands to be JNR_DEV+	2016-08-31 23:26:41 -03:00
Keir Nellyer	725892e93b	PC-957 Show warning message when a user's report is marked as abusive	2016-08-31 16:38:35 +01:00
Keir Nellyer	8f28ab3f0d	PC-949 /reportclose argument "<conclusion>" should be "<reason>"	2016-08-31 16:30:55 +01:00
Keir Nellyer	97e06053d1	PC-948 Don't send handler to server if they are already connected to it	2016-08-31 16:25:14 +01:00
Keir Nellyer	04432d44d7	This can be an in-line return	2016-08-31 15:04:15 +01:00
Keir Nellyer	a7d224b7e4	Fix reports duplicating themselves and causing massive issues	2016-08-30 23:18:12 +01:00
Keir Nellyer	96b74444e5	Fix duplicate message entries	2016-08-30 22:54:58 +01:00
AlexTheCoder	ba02dea404	Fix me being dumb	2016-08-30 03:22:55 -04:00
TadahTech	90ce21db3d	Update preferences	2016-08-30 00:51:51 -05:00
AlexTheCoder	8ca214a4d8	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game	2016-08-30 01:37:14 -04:00
TadahTech	a68f7395e4	Use proper server group / remove testing.	2016-08-30 00:10:38 -05:00
TadahTech	dfced7186f	Finish tweaks for the hub	2016-08-29 22:32:07 -05:00
AlexTheCoder	463c03e9d1	Add pitch and yaw to npcs	2016-08-29 22:11:53 -04:00
Shaun Bennett	f72647e1d4	Merge with develop	2016-08-29 21:56:03 -04:00
Shaun Bennett	e7d876e865	Fix string.format param order	2016-08-29 21:33:00 -04:00
TadahTech	39ea280098	NextBestGame code and new hub releases	2016-08-29 20:21:36 -05:00
LCastr0	3687c7ad98	PowerPlayClub update	2016-08-29 21:32:11 -03:00
Shaun Bennett	f3e38031ab	Add shadowmuting	2016-08-29 18:57:07 -04:00
Sam	9454e1f409	Skywars and Kit Progression	2016-08-29 23:07:48 +01:00
Keir Nellyer	022e9f6bd4	Players can have more than 1 active report open against them	2016-08-27 22:38:54 +01:00
Keir Nellyer	3f18c0cc6b	Fix join/leave report handling	2016-08-27 22:35:12 +01:00
Keir Nellyer	cd9423a8e4	De-couple chatsnap from report system	2016-08-27 22:21:56 +01:00
Sam	a35c162dc4	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-08-26 21:26:16 +01:00
Sam	efc14ee13f	Another merge fix	2016-08-26 21:26:14 +01:00
LCastr0	3e38eb5990	Fixes to the merging conflicts	2016-08-25 20:13:59 -03:00
LCastr0	25d64c6dee	Changes to lock command	2016-08-25 20:12:00 -03:00
TadahTech	b3b8f44b3a	Fix perks not being registered.	2016-08-25 05:11:52 -05:00
TadahTech	ebfd00ebc3	Fix centering of the Preference Menu	2016-08-25 04:04:53 -05:00
TadahTech	41b40fa12c	Fix painting breaking.	2016-08-25 03:54:10 -05:00
TadahTech	77e0090531	Tweak preferences	2016-08-25 00:17:31 -05:00
TadahTech	1654850e8c	Final Changes	2016-08-24 22:26:38 -05:00
TadahTech	ba2bee4f25	Merge branches 'develop' and 'feature/lobby-update' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/lobby-update # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/progression/ProgressiveKit.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeDetailsButton.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeMenuButton.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitDisplayMenu.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitInformationTrackerMenu.java # Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java	2016-08-24 21:29:01 -05:00
TadahTech	bca19788db	Merge branches 'develop' and 'feature/lobby-update' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/lobby-update # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/progression/ProgressiveKit.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeDetailsButton.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeMenuButton.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitDisplayMenu.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitInformationTrackerMenu.java # Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java	2016-08-24 21:28:36 -05:00
cnr	df1fc60d3d	Merge branch 'update/skywars-finalised' into develop	2016-08-24 17:12:58 -05:00
Keir Nellyer	469a72afc0	JavaDocs	2016-08-23 16:40:25 +01:00
TadahTech	c9d14dc522	Update clans to new preferences. Remove debug messages.	2016-08-23 03:12:36 -05:00
TadahTech	bbe44e7d75	Remove debug.	2016-08-23 02:04:07 -05:00
TadahTech	02f703e68e	Remove debug.	2016-08-23 01:57:39 -05:00
TadahTech	3b9d6adfbc	Lobby Update	2016-08-23 01:37:07 -05:00
Sam	2c37d17db3	Slight code change	2016-08-22 19:42:30 +01:00
Keir Nellyer	dcfeaab5e1	Show invalid usage with alias used	2016-08-22 16:48:59 +01:00
Keir Nellyer	fb369d3df9	Add command to unban player from report system	2016-08-22 16:36:42 +01:00
Keir Nellyer	f805ceccdc	Don't include aborted reports in report statistics	2016-08-22 16:07:14 +01:00
xGamingDudex	7fb6ff58d0	Moved gadgets to use a whitelist system instead of blacklist for collisions	2016-08-22 01:00:29 +02:00
xGamingDudex	e64324b36c	Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698	2016-08-20 11:40:15 +02:00
Keir Nellyer	bde51e6a54	The server of the handler now handles sending periodic message, instead of it being done through Redis This also fixes server restarts breaking handler messages.	2016-08-19 18:08:36 +01:00
Sam	dc5c2430cd	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-08-19 17:58:27 +01:00
Keir Nellyer	d05a69ac69	Fix handler message disappearing when changing server	2016-08-19 17:27:05 +01:00
Keir Nellyer	6367321315	Fix weird colouring	2016-08-19 17:26:08 +01:00
Keir Nellyer	eabaa1e68a	Move limit statistic limit to query and sort returned results	2016-08-19 17:01:26 +01:00
Keir Nellyer	834e6b5fdf	Switch to using UtilPlayer.message	2016-08-19 16:48:05 +01:00
Keir Nellyer	26aff936a0	Rename /reportstat command to /reportstats	2016-08-19 16:46:49 +01:00
Keir Nellyer	779efe3f47	Improve display of /reportstat	2016-08-19 16:46:25 +01:00
Keir Nellyer	bbb40a7b6e	A report is considered expired once it's priority is < 1	2016-08-19 16:23:19 +01:00
Keir Nellyer	b6f0e84a02	Fix sql error when attempting to reinsert same report mapping	2016-08-19 16:21:44 +01:00
Keir Nellyer	2a62abfd33	Push chat snapshots at save time instead of handle time	2016-08-19 16:07:06 +01:00
Keir Nellyer	a1a604757b	Remove old todo	2016-08-19 15:48:02 +01:00
Keir Nellyer	5b685a3a86	Fixed query for getting unhandled reports to behave well with abused reports	2016-08-19 15:46:59 +01:00
Keir Nellyer	2211e6c4ef	Fix query for getting reports a user is handling to ignore aborted reports	2016-08-19 15:03:54 +01:00
Keir Nellyer	514757924d	More descriptive message when aborting a report	2016-08-19 14:31:15 +01:00
Keir Nellyer	373c82c11b	Fix query for getting unhandled reports	2016-08-19 14:30:59 +01:00
Keir Nellyer	ee78cf2bb9	Cancel messaging task if handler is no longer present	2016-08-19 14:30:24 +01:00
Keir Nellyer	10a6cbfe3b	Remove handler from report object when aborting a report	2016-08-19 14:29:15 +01:00
Keir Nellyer	24d4da6aa2	Fix query to fetch report not fetching reports with no handler	2016-08-19 14:19:52 +01:00
Keir Nellyer	e6609d59c9	Fix incorrect MySQL operator	2016-08-19 14:01:17 +01:00
Sam	c4cb5d8db4	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-08-19 12:56:24 +01:00
LCastr0	84c6720d1c	Fix merging errors	2016-08-18 18:30:32 -03:00
LCastr0	f4175ed724	Added PowerPlay managers, commands, button inside Carl to claim PowerPlay bonus... Includes a new SQL table, will be sent to Connor and Jaws so they can release it correctly! :D	2016-08-18 18:07:32 -03:00
Keir Nellyer	b4ae149d89	Handlers can now abort a report allowing it to be handled by another member of staff	2016-08-18 14:42:53 +01:00
cnr	a79fa9cd46	Update GWEN preference name to reflect its purpose	2016-08-18 01:59:31 -05:00
cnr	08e1b765f7	Send local Anticheat messages regardless of preference	2016-08-18 01:59:31 -05:00
cnr	78fe41a8af	Update Anticheat ban message and duration	2016-08-18 01:59:30 -05:00
cnr	999237fe69	Accurately report game TPS	2016-08-18 01:59:05 -05:00
cnr	405f67f8b2	Implement/activate Anticheat phase two - Remove anticheat guardians from Arcade - Uncomment/implement Anticheat phase two actions - Specifically: immediate ban on Kill Aura type A, VL 200. - Give moderators less-specific messages, and limit messages by severity	2016-08-17 23:23:20 -04:00
xGamingDudex	69275cb79c	Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698	2016-08-17 20:57:18 +02:00
Keir Nellyer	3126d540e7	/reportstat command progress	2016-08-16 21:30:37 +01:00
Sam	0176f31f1e	Complete implementation of kit progression	2016-08-16 18:55:26 +01:00
Keir Nellyer	3760166599	Remove remnants of old user report preference	2016-08-16 14:13:01 +01:00
Sam	29a07c60ab	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-08-16 11:02:15 +01:00
Sam	6839006bd1	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-08-15 20:25:01 +01:00
cnr	08e65cb17e	Implement MineplexLink spectator check	2016-08-14 17:40:28 -04:00
xGamingDudex	6e32906805	More Gadget Collision patches	2016-08-14 22:50:48 +02:00
xGamingDudex	045445791a	Fixed gadget collision checks	2016-08-14 21:06:28 +02:00
xGamingDudex	e71cec874e	Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698	2016-08-14 20:09:01 +02:00
Sam	8f4303cf39	Progress on Upgrade Details	2016-08-13 22:40:33 +01:00
Shaun Bennett	0f4f1a3582	Remove pointless try/catch	2016-08-13 01:39:56 -05:00
Shaun Bennett	c99a23d670	Add region and server to chat payload	2016-08-13 00:57:39 -05:00
Shaun Bennett	a744566cd3	Add AntiSpam front end	2016-08-11 11:34:17 -05:00
Keir Nellyer	a8e891f247	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java	2016-08-11 14:53:57 +01:00
cnr	4562b00dcb	Repurpose MAC reports pref for GWEN reports	2016-08-11 04:01:14 -04:00
cnr	7b1ac5ded2	Merge branch 'update/clans' into develop	2016-08-10 21:27:43 -04:00
samczsun	7de9da3d1c	Complete rework of disguising and antihack hook This commit completely rewrites DisguiseManager, DisguisePlayer, and PlayerDisguiseManager. Changes to disguising means that much of the core was also changed, primarily having to do with mapping by UUID versus player names. Several new API classes were added, such as EntitySelector, Managers, UtilTasks, and a brand new scoreboard API which is much more optimized and allows for much longer lines The new anticheat is hooked as well, with implementation for guardians which follow the players around. Release two code is also included, but is currently disabled via a boolean.	2016-08-10 21:03:30 -04:00
Sam	e05f90372a	Add kit upgrade details	2016-08-10 19:05:40 +01:00
Keir Nellyer	ff7a427787	Handle party chat correctly	2016-08-10 16:57:44 +01:00
Keir Nellyer	cbdce80483	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-08-10 16:01:47 +01:00
xGamingDudex	907ac7473f	Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698	2016-08-10 16:52:37 +02:00
Sam	2f3ff052ff	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-08-08 22:59:55 +01:00
Sam	4c825cf80b	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-08-08 22:48:33 +01:00
cnr	4180f03a52	Use the correct SalesPackageBase for gadgets	2016-08-07 22:40:26 -04:00
AlexTheCoder	95302177f8	Add cooldowns to all gui items tied to giving rewards to prevent some exploitation	2016-08-07 14:47:14 -04:00
AlexTheCoder	4e0971ab0a	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans	2016-08-05 14:35:57 -04:00
AlexTheCoder	bf7065732b	Fix jukeboxes not being removed from the world from cosmetics and scoreboards attempting to use data from indices they do not have	2016-08-05 13:34:04 -04:00
Keir Nellyer	1854b71757	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 # Conflicts: # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java	2016-08-05 17:05:01 +01:00
cnr	0ca4fe2d38	Disable MAC kick for suspicious movement	2016-08-04 12:41:59 -04:00
cnr	3610f78b37	Merge branch 'feature/thanks' into develop	2016-08-03 22:23:46 -04:00
Shaun Bennett	85c4c181ec	Reload ThankData when a player is /thank - Allows rewards to appear immediately at carl	2016-08-03 18:22:36 -05:00
Shaun Bennett	e113bedea5	Fix accidentally refactoring "thanks" in strings	2016-08-03 15:11:31 -05:00
Shaun Bennett	72f078fe54	Fix using wrong name, add missing jooq files	2016-08-03 15:04:06 -05:00
Shaun Bennett	6d93efc1a2	Adjust button text as well	2016-08-03 14:57:30 -05:00
Shaun Bennett	ad6c1dd970	Adjust some text wording	2016-08-03 14:55:33 -05:00
Shaun Bennett	2e80838376	Update ClaimTips lore	2016-08-03 14:25:07 -05:00
Shaun Bennett	1ae7f6cb25	Integrate the new ThankManager into Amplifiers	2016-08-03 14:03:12 -05:00
cnr	3f0938815d	Merge branch 'update/clans' into develop	2016-08-03 12:39:52 -04:00
Sam	2b8754aa32	Metal Kit bug fixes	2016-08-02 23:34:12 +01:00
Keir Nellyer	c327309a65	Switch over to new method of determining if user is banned, this will allow unbanning of players in the near future	2016-08-02 16:46:14 +01:00
Shaun Bennett	f41cd8c104	Add /thank command. Update jooq files	2016-08-02 00:10:46 -05:00
Sam	bd00ac8446	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-08-01 19:34:40 +01:00
Sam	2c37af32ca	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-08-01 19:19:34 +01:00
AlexTheCoder	d12d353c20	Fix pronoun in message autoreply	2016-07-30 17:36:03 -04:00
Keir Nellyer	635e07c5a2	This wasn't meant to be included in the last commit	2016-07-29 15:09:21 +01:00
Keir Nellyer	bb9dbf1da4	PC-877 Vanish report handler when teleporting to offender's server	2016-07-29 15:08:03 +01:00
Keir Nellyer	806ec2460a	Add Gameplay report category for gameplay related reports	2016-07-29 13:20:06 +01:00
Keir Nellyer	43c94e95b3	PC-875 Players should only be banned after 3 abusive reports (currently is set to 1)	2016-07-29 12:58:08 +01:00
Keir Nellyer	9c76fec54e	PC-874 Show label for report closure reason when closing a report	2016-07-29 12:56:14 +01:00
cnr	d853f8467c	Merge branch 'update/clans' into develop	2016-07-28 22:56:23 -05:00
TadahTech	9529789159	Remove 3 second chat delay.	2016-07-28 22:54:04 -05:00
AlexTheCoder	47d79bbad5	Fix bugs arising during clans release	2016-07-28 19:08:47 -04:00
LCastr0	ab8d6daa2c	GitHub being annoying again	2016-07-28 19:59:49 -03:00
LCastr0	ab52965e44	Power Play button inside Carl, and the power play manager	2016-07-28 18:07:10 -03:00
Keir Nellyer	5dd35d45c4	PC-873 Alert user regardless of usage if banned from using /report	2016-07-28 17:41:20 +01:00
Keir Nellyer	8ee6ab6a1b	Display message to reporters of a report when it is closed	2016-07-28 17:17:12 +01:00
TadahTech	ab9bf2f405	Fixes possible bug with party leaders not seeing chat. Adds pling when you received an invite.	2016-07-28 03:40:24 -05:00
cnr	dd38a1dd76	Merge branch 'update/clans' into develop	2016-07-27 20:40:35 -05:00
cnr	05e59ae9cc	Revert "Revert "Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing"" This reverts commit `917b83250d`.	2016-07-27 19:03:04 -05:00
AlexTheCoder	031a9575ae	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans	2016-07-27 15:13:18 -04:00
Sam	8648581140	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-07-27 19:57:25 +01:00
Sam	ee38cb4c39	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-07-27 19:56:36 +01:00
cnr	167c0f2b5e	Reimplement EnergyShopButton with new machinery	2016-07-27 13:52:03 -05:00
cnr	3cddf35d12	Refactor out legacy ConfirmationPage	2016-07-27 13:52:03 -05:00
cnr	3d0cc2a5fd	Refactor Clans gold dependency out of core	2016-07-27 13:52:03 -05:00
cnr	dc96258055	Merge branch 'feature/party-v2' into develop	2016-07-27 13:19:25 -05:00
Shaun Bennett	0d46bc4609	Add Amplifier thank button	2016-07-27 13:17:36 -05:00
Keir Nellyer	97d72e97e4	Variable refactorings for consistency	2016-07-27 16:09:38 +01:00
Keir Nellyer	f2435c3b43	Packet class refactorings	2016-07-27 16:08:23 +01:00
Keir Nellyer	d474139220	Don't show Punish GUI unless report result is ACCEPTED	2016-07-27 15:46:54 +01:00
Keir Nellyer	63917297ef	Show /report and /reportclose command usage when attempting to use the command incorrectly	2016-07-27 15:45:12 +01:00
xGamingDudex	72b5507390	Fixed PC-120	2016-07-27 12:29:07 +02:00
AlexTheCoder	157c969e8d	Completely prevent players in parties from joining Clans servers	2016-07-27 05:51:49 -04:00
Keir Nellyer	2a167745a6	Update chatsnap url	2016-07-26 16:51:59 +01:00
AlexTheCoder	a1fd021f8d	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans	2016-07-25 10:59:38 -04:00
AlexTheCoder	979bb92034	Allow treasure chests to be placed in other locations instead of fixing them in the main hub's configuration	2016-07-25 10:57:15 -04:00
AlexTheCoder	25b0ae5916	Add support for sending players back to any clans hub via portal	2016-07-25 10:56:30 -04:00
TadahTech	a23c2c4e1c	Update UI to reflect allowing upgrades to be shown, per kit.	2016-07-24 16:05:19 -05:00
Sam	76da92f42e	QuiverPayload added Basic implementation added	2016-07-24 21:27:31 +01:00
LCastr0	f4c40c61bb	Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics	2016-07-24 13:18:53 -03:00
LCastr0	195a82f78f	Github is annoying me about this, but I don't know what it is	2016-07-24 13:18:33 -03:00
LCastr0	0dce530438	PowerPlayClub managers and stuff	2016-07-24 13:15:32 -03:00
Sam	a8503d2fb8	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-07-24 11:50:48 +01:00
TadahTech	ceccf2d2ac	Don't give the item when a game is in progress.	2016-07-23 22:36:53 -05:00
TadahTech	133376fb94	Relocation of Full server check in party invites. Fixes a bug where people cannot invite players to their party, regardless of which server they are on, when the inivters server is full.	2016-07-23 19:50:57 -05:00
Sam	50de769e36	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-07-24 00:13:13 +01:00
AlexTheCoder	818ed4c9a9	Set up clans monetization features in the shop and fix some hardcoded names in core	2016-07-22 00:18:34 -04:00
TadahTech	5d0b5f80c0	Fix Party server sending. Tweak playercount and GUI display	2016-07-21 18:01:43 -05:00
Keir Nellyer	369246f635	Fix out of bounds statement parameter caused by earlier removal of report preferences	2016-07-21 23:11:48 +01:00
Keir Nellyer	c5f3f2b2d6	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-07-21 22:44:43 +01:00
AlexTheCoder	75cc75f40c	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans	2016-07-21 17:25:15 -04:00
TadahTech	2b8930eee8	Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2	2016-07-21 15:32:49 -05:00
TadahTech	d7c5184980	Party fixes and tweaks.	2016-07-21 15:24:48 -05:00
AlexTheCoder	fc3ceddf4d	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game Conflicts: Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java	2016-07-21 15:47:59 -04:00
Shaun Bennett	9ed0bbe43a	Fix NPC's for unloaded worlds	2016-07-21 14:22:38 -05:00
xXVevzZXx	0262452b6a	Add enchantments to items, lower arrow spawn rate and limit, give players some steak and make armor unbreakable.	2016-07-21 13:59:35 -05:00
Keir Nellyer	9b58c53e90	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-07-21 16:11:09 +01:00
Sam	faece2c5f8	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-07-21 11:13:15 +01:00
Sam	f48009d9f8	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-07-21 11:12:23 +01:00
Sam	e7658b4bf2	New kits and upgrades for old kits	2016-07-21 11:05:21 +01:00
AlexTheCoder	2615ef74dd	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans	2016-07-21 05:09:54 -04:00
TadahTech	b48f97fd2e	Fix stupid JOOQ issue and IntelliJ.	2016-07-21 03:46:18 -05:00
TadahTech	b734dc4e87	Remove Pay wall for Party sizes	2016-07-21 02:59:15 -05:00
TadahTech	9f0f4e0018	Fix possible cross server invite spamming.	2016-07-21 02:20:02 -05:00
TadahTech	f1b3c4756d	Use UUID's instead of playernames.	2016-07-21 02:16:26 -05:00
TadahTech	4cab91f251	Use getPlayerExact.	2016-07-21 02:05:37 -05:00
TadahTech	76ac89266e	-sigh- a hotfix. Won't invite players across servers who are already in parties. Fix transferring ownership to non-party members	2016-07-21 02:05:10 -05:00
cnr	b0f5b536b1	Merge branch 'feature/party-v2' into develop	2016-07-20 18:06:14 -05:00
Shaun Bennett	31d6a2542d	Replace runSync call with runAsync	2016-07-20 18:03:01 -05:00
Shaun Bennett	b136372d1b	Gem fountain changes; increase goal, link to eu	2016-07-20 18:03:01 -05:00
TadahTech	c3b7a81730	Don't show all buttons in all menus. Protected fields != private fields.	2016-07-20 17:48:24 -05:00
TadahTech	0fc64c45a8	Update JoinResponseReason	2016-07-20 16:33:26 -05:00
TadahTech	96261c1a6d	Party PR Updates.	2016-07-20 16:18:49 -05:00
TadahTech	67a185acc9	Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2	2016-07-20 15:52:59 -05:00
Keir Nellyer	48f9085c79	Small changes to report close functionality	2016-07-20 11:58:09 +01:00
Keir Nellyer	856f91da24	Update close report command syntax	2016-07-20 10:40:42 +01:00
Keir Nellyer	5c3f78b428	Fix query used to fetch report(s) account is handling	2016-07-20 10:40:03 +01:00
Sam	d53a917627	getAbilityDetails using map and list interface Changes so it uses the interface rather than the concrete class.	2016-07-19 22:38:32 +01:00
Keir Nellyer	37a06816dd	Modify /reportclose to no longer require a report id parameter	2016-07-19 16:37:53 +01:00
TadahTech	c8075b2b47	Merge remote-tracking branch 'origin/feature/party-v2' into feature/party-v2	2016-07-18 19:04:26 -05:00
TadahTech	b4aa303923	Bug fixes.	2016-07-18 19:04:02 -05:00
AlexTheCoder	5ecfaef413	Merge branch 'feature/mavericks-master-builders' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game	2016-07-18 16:28:22 -04:00
Keir Nellyer	976e8788b7	Update report message if a player reports another player multiple times	2016-07-18 18:37:21 +01:00
LCastr0	7c300acaa3	No particles for vanished players!	2016-07-16 20:00:21 -03:00
Sam	f012e8d4ed	Merge from develop	2016-07-16 08:41:15 +01:00
Keir Nellyer	0d9aad37f9	Optimise imports	2016-07-15 16:31:25 +01:00
Keir Nellyer	f0c2686ca7	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-07-14 23:01:11 +01:00
Keir Nellyer	da7806147d	These brackets don't need to be here	2016-07-14 22:39:59 +01:00
Keir Nellyer	7b5adc717d	Prevent non-handlers from closing a report	2016-07-14 22:16:53 +01:00
Keir Nellyer	1885854bc4	Simplify and shorten createReport method	2016-07-14 22:06:25 +01:00
Keir Nellyer	209ca20959	Rename "reportPlayer" to "createReport" for method name consistency	2016-07-14 21:13:06 +01:00
Keir Nellyer	f75806d2dd	Ensure messages shown to players are consistent	2016-07-14 21:11:43 +01:00
Keir Nellyer	4ed51b5747	Fix getProfiles and getReports methods	2016-07-14 21:01:49 +01:00
Keir Nellyer	65e8b92c1a	Small refactorings (class relocations and renames)	2016-07-14 20:15:14 +01:00
Keir Nellyer	15b5198dbb	Ensure words are fully capitalised Previously only the first word was capitalised.	2016-07-14 19:25:53 +01:00
Keir Nellyer	7f48151c8c	Made handler messages slightly more prettier	2016-07-14 19:19:16 +01:00
cnr	a0847b8d1a	Fix null ServerGroup uptimes value for MPSes	2016-07-14 08:08:24 -05:00
cnr	4d0903dba7	Fix compile error	2016-07-14 03:11:59 -05:00
Shaun Bennett	e28320b361	Fix disableCustom not firing properly	2016-07-14 02:47:49 -05:00
cnr	917b83250d	Revert "Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing" This reverts commit `30287a0832`, reversing changes made to `b8650d741d`.	2016-07-14 00:10:37 -05:00
samczsun	7dcf7378ef	Many changes Fix spectator race condition Refactor out cut clean into modules Add combat log module Add antixray module	2016-07-13 21:30:54 -05:00
cnr	a7b30f4f59	Merge branch 'thanos-mineware' into develop	2016-07-13 21:26:25 -05:00
cnr	4343fa3512	Merge branch 'project-cosmetics' into develop	2016-07-13 21:22:41 -05:00
LCastr0	6af04b5438	Fixes for winroom gadget disable messages	2016-07-13 18:21:08 -03:00
Shaun Bennett	369dabffae	Amplifier updates - move to boost shards only	2016-07-13 15:07:24 -05:00
Thanos Paravantis	711a04ffa8	Add Bawk Bawk Battles to hub compass	2016-07-13 21:40:31 +03:00
AlexTheCoder	9c3aee6373	Convert all possible gem vote rewards to treasure shard vote rewards to comply with Mojang EULA	2016-07-13 11:17:24 -05:00
cnr	7df228a8fa	Move WinEffectGadget schematics to update folder	2016-07-13 06:36:42 -05:00
Thanos Paravantis	179b59af2c	Merge branch 'develop' into thanos-mineware	2016-07-13 13:28:03 +03:00
cnr	e40abd4859	Merge branch 'thanos-mineware' into develop	2016-07-13 05:04:50 -05:00
cnr	85db0ad613	Remove global rawr	2016-07-12 15:51:47 -05:00
xXVevzZXx	654ab281ea	Add option of "uptimes" to servergroups	2016-07-12 15:44:29 -05:00
Thanos Paravantis	0f3b2da8b7	Fix Bouncing Block, re-add features for testing	2016-07-12 23:02:01 +03:00
cnr	daddaa477e	Merge branch 'update/brawl-games' into develop	2016-07-12 06:45:32 -05:00
xXVevzZXx	ac8a920484	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/brawl-games # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/GunModule.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/Gun.java	2016-07-12 03:07:31 +02:00
AlexTheCoder	d3270b9289	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans	2016-07-11 14:50:16 -04:00
AlexTheCoder	30287a0832	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing	2016-07-11 14:46:08 -04:00
Sam	f40299e402	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-07-11 18:34:48 +01:00
AlexTheCoder	0be317e5be	Implement tweaks and finalize implementations for bosses and fix loot dropping bugs	2016-07-11 11:36:48 -04:00
Thanos Paravantis	6a87be13f0	Remove features that contain bugs	2016-07-11 01:02:19 +03:00
Keir Nellyer	e1adf7d4e2	JavaDocs	2016-07-10 13:32:20 -04:00
Keir Nellyer	b808121d68	Make ReportResult and ReportMessage timezone friendly. This switches all if not most of the report feature code to using the new Java 8 date time API since it is much better for handling timezone's. This commit also creates a few new methods in UtilTime as they are used throughout the "report" and "chatsnap" packages. They may also come in useful for other developers using timezones.	2016-07-09 23:41:39 -04:00
Keir Nellyer	3f8eaf0da7	Missing semi-colon	2016-07-09 22:56:32 -04:00
Keir Nellyer	edf63dcafd	Print exceptions for everything!!!	2016-07-09 18:09:26 -04:00
Keir Nellyer	ac95a59f81	Mark reports as expired when an expired report is detected Also wrote JavaDocs for expireReport and saveReport methods.	2016-07-09 15:47:31 -04:00
Keir Nellyer	d7736e9e02	Wait until report data has been saved to the database, otherwise the message task will not function until it's second iteration	2016-07-09 15:32:46 -04:00
Keir Nellyer	400a6adab2	Show message when report has been closed Also run Bukkit API methods synchronously.	2016-07-09 15:24:41 -04:00
Keir Nellyer	e26ced1438	First report handler detail message should be instant	2016-07-09 14:59:27 -04:00
Keir Nellyer	5c6cac2849	Remove debug line	2016-07-09 14:57:55 -04:00
Keir Nellyer	c909cd4733	A report is active if it is being handled but has not yet been closed	2016-07-09 14:55:42 -04:00
Keir Nellyer	6a78556fda	Ninja fix for previous commit	2016-07-09 14:49:00 -04:00
Keir Nellyer	aadb3df715	A report is no longer active if a result for it has been set	2016-07-09 14:48:26 -04:00
Keir Nellyer	29b1110f6b	Access to SnapshotsManager inside ReportManager is no longer required	2016-07-09 14:40:17 -04:00
Keir Nellyer	1eb3fb4aa3	Modify GET_REPORTS_HANDLING query to ignore closed reports	2016-07-09 14:38:12 -04:00
Keir Nellyer	c98c352546	Prevent reputation from being 0, this causes all reports the player opens to be instantly closed	2016-07-09 14:37:23 -04:00
Keir Nellyer	87df6804c9	Improve code and error logging	2016-07-09 14:36:30 -04:00
Keir Nellyer	0783f3b693	Fix sql error when a report is closed due to expiration	2016-07-09 11:31:51 -04:00
Keir Nellyer	abea5bbf81	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-07-08 23:27:07 -04:00
Keir Nellyer	5c83f09456	SnapshotRepository no longer extends MinecraftRepository It doesn't need to.	2016-07-08 23:26:33 -04:00
Keir Nellyer	d9288277d5	Push chat snapshots from all servers This fixes an issue whereby the handler would not be able to see chat snapshots unless they begin the handling process whilst connected to the same server as the offender.	2016-07-08 23:22:55 -04:00
Timothy Andis	2cac4c9c66	Remove toLowerCase owner method	2016-07-08 16:17:48 -05:00
Keir Nellyer	a0d046ab8b	Optimize getting of ReportProfile's from database	2016-07-08 17:14:41 -04:00
TadahTech	cbb0fa37fb	Lang tweaks.	2016-07-08 15:32:25 -05:00
cnr	5b98bfddce	Update YouTube link to landing + sub confirmation	2016-07-08 15:20:50 -05:00
Thanos Paravantis	331c1bcf91	Merge branch 'develop' into thanos-mineware	2016-07-08 22:29:59 +03:00
TadahTech	1313db4071	Commit lost file.	2016-07-08 14:06:16 -05:00
TadahTech	ce72d25832	Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2	2016-07-08 13:09:02 -05:00
TadahTech	8c7308add5	Add documentation. Refactor code. Remove most command backend capabilities to limit user error. Cleanup.	2016-07-08 13:08:34 -05:00
xGamingDudex	5349d26115	Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into feature/mavericks-master-builders	2016-07-08 03:41:13 +02:00
Keir Nellyer	1ce1c796f4	Repository classes no longer need to extend MinecraftRepository	2016-07-07 21:12:08 -04:00
Keir Nellyer	b9f1dcbcd5	Make method `getReportPrefix(Report)` simpler	2016-07-07 21:05:41 -04:00
Keir Nellyer	8d2916c23e	Create JavaDoc's for all methods in ReportManager	2016-07-07 21:04:16 -04:00
xGamingDudex	c50ec49ad9	Minor updates Tweaked some location values. Added more event handling to the reveiw hub and mavericks hub. Added builder info holograms to all sides of the display slots in the mavericks hub.	2016-07-08 02:59:33 +02:00
Keir Nellyer	cb555a41ab	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-07-07 20:47:19 -04:00
Keir Nellyer	0dc17bf6fa	Further code cleanup	2016-07-07 18:12:52 -04:00
Keir Nellyer	58df3022a5	Completely remove old staff notifications system	2016-07-07 18:08:19 -04:00
Sam	da9ad913b2	Finalisation of update	2016-07-07 23:03:23 +01:00
Keir Nellyer	bc2b7884ee	Make this code a lot smarter	2016-07-07 17:57:19 -04:00
Keir Nellyer	4361379eaa	Close expired reports when they are detected This improves performance and allows for easier database maintenance.	2016-07-07 15:35:47 -04:00
Keir Nellyer	77a98bc250	Remove spammy and useless report notifications	2016-07-07 13:58:09 -04:00
Keir Nellyer	fa02b18ffb	These shouldn't be batched as there will only ever be a single query	2016-07-07 13:28:08 -04:00
Keir Nellyer	175c3523f8	Remove todo relating to removal of database cleanup of chat entries after a report has been closed An external cleanup job/script will be used to remove old data	2016-07-07 13:19:42 -04:00
cnr	443576ba1a	Update YouTube link and send shard reward message	2016-07-06 20:15:41 -05:00
samczsun	63b6158fe4	More UHC Fixes Fixes: PC-137 PC-138 PC-497 PC-665 PC-710 PC-719 PC-754 Also fixes chunk synchronization issue, plugs potential memory leaks Fancy spectating Use enum priorities	2016-07-06 15:55:12 -04:00
Shaun Bennett	8cf470cfd0	Update fountain goals	2016-07-06 13:39:56 -05:00
cnr	17f89f6937	Merge branch 'project-cosmetics' into develop	2016-07-06 13:00:29 -05:00
LCastr0	63500c19c9	Removed commented lines Added javadocs to GadgetChangeEvent	2016-07-06 14:45:05 -03:00
Thanos Paravantis	185ba600ca	Merge branch 'develop' into thanos-mineware	2016-07-06 17:48:31 +03:00
LCastr0	67adb34311	Fixes for the WinRooms Removed Freedom Chests from the menu	2016-07-06 00:00:50 -03:00
AlexTheCoder	eccd7deedc	Fix merge errors and properly force disable particles by checking the game's settings	2016-07-05 17:25:01 -04:00
Thanos Paravantis	0eab6db116	Soccer bug fixes and minor improvements - Slimeball will no longer be able to get stacked. - Players in soccer mode will not able to stack others. - Guardian lazer can no longer be used in the soccer field. - Players in soccer won't get knockback, except if they double jump.	2016-07-05 15:39:10 -05:00
Keir Nellyer	67213ec696	Tie all these together	2016-07-05 16:14:30 -04:00
TadahTech	9f58e57a67	Bug fixes.	2016-07-05 14:35:37 -05:00
TadahTech	978ee0055a	Bug fixes.	2016-07-04 09:15:47 -05:00
TadahTech	0ebddf9f45	Add UI Item. Add check to make sure player's cant be invited to another party if they're already in one. Bug fixes.	2016-07-04 05:43:01 -05:00
TadahTech	584c8f50f0	PC Party bugs and tweaks.	2016-07-04 05:12:02 -05:00
TadahTech	06feb615a9	Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2	2016-07-04 04:18:01 -05:00
AlexTheCoder	af9d91faa8	Further prevent nullpointer errors	2016-07-03 04:11:14 -04:00
AlexTheCoder	ffdc7b4be0	Temporarily patch random nullpointer	2016-07-02 18:05:26 -04:00
AlexTheCoder	9898b3d95d	Fix block state not saving on restore (Untested) (PC-610)	2016-07-02 18:02:59 -04:00
samczsun	54cda56c11	Initial Commit	2016-07-02 17:16:42 -04:00
LCastr0	050ae75e49	Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics	2016-07-02 13:33:33 -03:00
LCastr0	7a6335a021	Fixes for win rooms? Or not yet?!	2016-07-02 13:32:35 -03:00
AlexTheCoder	e4c94f5421	Fix whitelist for Customer Support servers	2016-07-02 01:32:42 -05:00
xGamingDudex	6d9e84b817	Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into feature/mavericks-master-builders Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/F.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/BuildData.java	2016-06-30 23:08:31 +02:00
xGamingDudex	32ee27d9ee	Small bugfixes with QA Never re-show reviewed builds in review-server. Toggle debug messages in review-server. Fixed minor bugs with QA	2016-06-29 03:49:53 +02:00
LCastr0	24186d9992	More fixes for gadget persistence	2016-06-28 18:11:00 -03:00
Thanos Paravantis	c5c08562c3	Merge branch 'master' into thanos-mineware	2016-06-28 23:01:42 +03:00
xGamingDudex	8ad63ef7ea	Tweaked some code to better fitt schematics.	2016-06-28 06:29:44 +02:00
Keir Nellyer	561734e7fe	Remove unused imports (accidentally added)	2016-06-27 21:18:40 -04:00
xGamingDudex	a69101bef3	Cleaned out some debug messages and added some java-docs.	2016-06-28 01:35:37 +02:00
AlexTheCoder	ab315627ad	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game	2016-06-27 17:45:36 -04:00
Keir Nellyer	48a2d0d304	Remove old completed todo	2016-06-27 18:06:01 +01:00
Keir Nellyer	42bd2148e5	Don't allow a user to handle more than one report simultaneously	2016-06-27 17:56:01 +01:00
xGamingDudex	d6672c44f4	Finalized the hub module and finished local testing Cleaned up some source. Applied some small updates. Finished local testing.	2016-06-27 00:34:17 +02:00
Keir Nellyer	90df695624	Merge branches 'feature/report-v2' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-06-26 00:18:07 +01:00
LCastr0	30f413d04e	Fixes for persistence: No longer save items after they are disabled No longer keep the particle effect after a staff vanishes	2016-06-25 02:22:20 -03:00
TadahTech	50759661cf	Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2	2016-06-24 23:52:27 -05:00
LCastr0	d75abe3aea	Persistence fixes	2016-06-25 00:36:00 -03:00
LCastr0	83f4b25887	Testing persistence fixes	2016-06-25 00:33:36 -03:00
cnr	c430566c6d	Never reset a player's YouTube click time locally	2016-06-24 16:59:27 -05:00
Shaun Bennett	94fe9f57d2	Add missing imports	2016-06-24 12:36:56 -07:00
Kenny Goodin	dc9145c707	Hotfix, disable youtube and twitter buttons in BonusGUI	2016-06-24 15:33:07 -04:00
Keir Nellyer	323d865b57	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 # Conflicts: # Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java	2016-06-24 18:13:51 +01:00
Keir Nellyer	c5319dbe1d	Switch identifier system for id system (no need for tokens any more)	2016-06-24 18:08:47 +01:00
Keir Nellyer	52873d5618	Do away with tokens	2016-06-24 17:59:26 +01:00
Keir Nellyer	45418b3a4d	Add todo	2016-06-24 17:56:01 +01:00
Keir Nellyer	daae2f7a3a	Shorten method name	2016-06-24 17:54:54 +01:00
Keir Nellyer	871bb04451	Fix /reporthandle command	2016-06-24 17:45:56 +01:00
Keir Nellyer	d178e9112b	Temporarily base priority on report age	2016-06-24 15:39:48 +01:00
Keir Nellyer	fd64753ba0	New /reporthandle command	2016-06-24 12:14:58 +01:00
TadahTech	8fbb06ae3d	Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 # Conflicts: # Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java	2016-06-24 04:11:38 -05:00
TadahTech	e71fc291d1	Fix cross server invites / joining servers.	2016-06-24 04:01:51 -05:00
Shaun Bennett	b4caf5125b	Adjust tip amounts	2016-06-24 03:16:42 -05:00
Shaun Bennett	d708c478d7	Dont display other boosters, fix typo	2016-06-24 03:16:42 -05:00
Shaun Bennett	348cb9efba	Fix remaining booster message	2016-06-24 02:23:09 -05:00
cnr	b58ff8c066	Add YouTube and Twitter buttons to UI	2016-06-24 01:30:10 -05:00
Shaun Bennett	def57e2c0b	Fix HubManager, add failsafe for BoosterManager	2016-06-23 23:19:02 -07:00
Shaun Bennett	fd843b88cb	Merge remote-tracking branch 'remotes/origin/develop' into feature/boosters-final # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/inventory/GemBooster.java # Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java # Plugins/Mineplex.StaffServer/src/mineplex/staffServer/customerSupport/CustomerSupport.java	2016-06-23 23:02:26 -07:00
Shaun Bennett	a9f291338f	Amplifiers GM Candidate	2016-06-23 22:49:12 -07:00
TadahTech	c204562eb3	Fix cross server invites / joining servers.	2016-06-23 23:25:26 -05:00
TadahTech	ce1aab5e11	Fixes and changes	2016-06-23 21:53:12 -05:00
cnr	3433e0e3bc	Merge branch 'project-cosmetics' into develop	2016-06-23 18:42:47 -05:00
Keir Nellyer	d67082bca2	Ran a code inspection and implemented some suggested changes	2016-06-23 23:31:51 +01:00
xXVevzZXx	dc57f7b4e6	add testrank command for SR.Mods	2016-06-23 22:05:26 +02:00
Keir Nellyer	7f75a7ff50	Unfortunately we can't batch these SQL commands as we have to retrieve the snapshot id after inserting	2016-06-23 20:36:34 +01:00
LCastr0	c1b7be6363	Fix merge problems	2016-06-23 16:33:20 -03:00
LCastr0	7749314e64	Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics	2016-06-23 16:11:49 -03:00
LCastr0	a441727e09	Freedom update: Freedom chests Freedom Aura Shock and Awe Leap of Freedom Price of Freedom Uncle Sam Morph Freedom Mount Uncle Sam Hat Persistence update: Items will still be enabled after player leaves the server	2016-06-23 16:09:31 -03:00
Keir Nellyer	e6989cd8da	Output errors caused by inserting snapshots into database	2016-06-23 20:06:16 +01:00
Keir Nellyer	4606f27408	Switch report ids to use data type 'long' This is because in the database we store them as an unsigned integer, which means the Java integer type will not be able to hold values after a certain point.	2016-06-23 14:11:58 +01:00
TadahTech	33cce620be	Update UI and fix typos	2016-06-23 03:11:45 -05:00
TadahTech	df53021f7c	Fix Party Redis. Improve Party UI. General testing and fixing. (Funny enough, again.	2016-06-23 02:56:42 -05:00
TadahTech	fb6a772eb0	Fix Party Redis. Improve Party UI. General testing and fixing.	2016-06-23 02:39:05 -05:00
Shaun Bennett	6e2c751be1	Adjust amplifiers queue message	2016-06-22 21:09:09 -07:00
Shaun Bennett	0873efd876	Update more lore text	2016-06-22 20:54:29 -07:00
Shaun Bennett	621d72f541	Fix merge issues, update lore text	2016-06-22 20:51:58 -07:00
Shaun Bennett	249a5c70aa	Merge remote-tracking branch 'remotes/origin/develop' into feature/boosters-final # Conflicts: # Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java	2016-06-22 20:35:40 -07:00
Shaun Bennett	906e0e0044	Allow API error messages from HTTP 503	2016-06-22 20:31:18 -07:00
Keir Nellyer	addbd4dd88	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-06-23 01:21:12 +01:00
Keir Nellyer	4fc5e036fa	Remove old redundant chat cache command Fix broken code in SnapshotPlugin	2016-06-23 01:13:18 +01:00
Keir Nellyer	8bbeb3292f	Removed old code resulting in compiler error and replaced with a todo for the future	2016-06-23 01:03:25 +01:00
Keir Nellyer	2931826916	Improve readability by separating these functions out	2016-06-23 01:01:20 +01:00
Keir Nellyer	352ecc6ad6	Improve database performance by executing queries in batch	2016-06-23 00:57:41 +01:00
Keir Nellyer	09a74e3772	Work on pushing chat snapshots to db	2016-06-23 00:38:24 +01:00
Alex-The-Coder	2453f82061	Rename Filterbutton.java to FilterButton.java	2016-06-22 18:40:12 -04:00
TadahTech	50534c3af9	UI And server manager changes	2016-06-22 17:28:43 -05:00
Shaun Bennett	e855a866c7	Fix more thanks and booster occurrences	2016-06-22 08:58:27 -07:00
xGamingDudex	318c137aba	Moved mavericks repository resources to core, merging review and game	2016-06-22 17:08:34 +02:00
TadahTech	e53b474f3f	Fix typo.	2016-06-22 00:59:22 -05:00
TadahTech	38a13d01f1	Open server menu properly	2016-06-22 00:56:44 -05:00
TadahTech	4d31867e98	PC Party updates.	2016-06-22 00:35:57 -05:00
Keir Nellyer	ef0c3721d8	Micro-optimisation since this ArrayList will only ever hold a maximum of 2 items	2016-06-21 17:47:44 +01:00
Keir Nellyer	b46f08938e	Implement age decay algorithm as supplied by @alexthecoder	2016-06-21 17:46:52 +01:00
TadahTech	e39326b592	Help Command UI.	2016-06-21 00:11:33 -05:00
TadahTech	b75e87753d	Party UI work.	2016-06-20 22:45:53 -05:00
TadahTech	a49e815765	Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2	2016-06-20 16:40:33 -05:00
TadahTech	2211cf4dec	Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java	2016-06-20 16:37:07 -05:00
Shaun Bennett	1c1912b92a	Update fountain goals again	2016-06-20 00:52:33 -05:00
Shaun Bennett	afc636b7c5	Fix amplifier reward message	2016-06-19 20:16:33 -05:00
Shaun Bennett	bb8d94f38a	Fix a lot more Booster cases	2016-06-19 19:48:17 -05:00
Shaun Bennett	63b7648608	Amplifier rename, move podium backwards	2016-06-19 19:05:04 -05:00
Keir Nellyer	b4f10531cb	Merge branch 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-06-19 22:46:19 +01:00
Keir Nellyer	2cfb84eece	Shorten some code	2016-06-19 22:46:06 +01:00
Keir Nellyer	ec2ec878e8	Message type id mapping in preparation for storing chat messages in database	2016-06-19 22:28:56 +01:00
Shaun Bennett	38058bc670	Confirmation Paging	2016-06-19 05:49:32 -05:00
Shaun Bennett	2f0a559441	Add reload command, change podium to lime dye, change tip message	2016-06-18 14:41:32 -05:00
Keir Nellyer	f34c65111b	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-06-18 00:48:00 +01:00
Shaun Bennett	5f9a57b7e2	Lower booster tip cooldown to 1 minute	2016-06-17 16:10:01 -05:00
Shaun Bennett	4e3062f413	Swap Cosmetic and Booster interface slot	2016-06-17 15:23:53 -05:00
Shaun Bennett	0873ee0116	Show entire booster queue in booster gui	2016-06-16 16:54:54 -05:00
samczsun	1893e98036	Don't run chat filtering on the main thread	2016-06-16 16:39:43 -04:00
TadahTech	5ac6249684	Fix Bridges Kits not getting their items. Fix Kits breaking at Level 5	2016-06-16 15:34:23 -05:00
Shaun Bennett	ea551182b6	Make booster gui smaller	2016-06-16 15:29:05 -05:00
TadahTech	e7d76e2ef4	Hot fixes.	2016-06-16 03:56:32 -05:00
samczsun	1e5d91e392	Make porting from old legendaries work, fix null commandcenter	2016-06-15 21:52:25 -04:00
Shaun Bennett	cbfbd6fe1c	Booster GUI update	2016-06-15 17:40:20 -05:00
TadahTech	27afd3d96c	Kit progression update	2016-06-15 15:54:53 -05:00
Shaun Bennett	aa785ed3d5	Code clean-up and documentation	2016-06-12 21:18:11 -05:00
TadahTech	22e22ff508	Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/party/Party.java # Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java	2016-06-12 00:42:22 -05:00
Keir Nellyer	6bc8039dbd	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-06-11 14:04:43 +01:00
Keir Nellyer	ed50e09a6e	Fix issue an old un-closed but expired report may be re-opened and cause issues	2016-06-11 13:59:53 +01:00
Keir Nellyer	197acee4ae	Implement server weighting	2016-06-11 13:47:45 +01:00
Shaun Bennett	cf87469400	Fix a possible NPE, use proper IP and port for api	2016-06-10 20:24:22 -05:00
Shaun Bennett	2421fd1cfe	Update booster page, proper booster rewards	2016-06-10 19:40:27 -05:00
Shaun Bennett	42c35063b3	Display all the boosters you have activated	2016-06-10 17:40:59 -05:00
Shaun Bennett	6964b1f266	Booster gui command	2016-06-10 17:20:23 -05:00
Shaun Bennett	e6920b4549	Work on booster gui, display wait time	2016-06-10 17:17:43 -05:00
Shaun Bennett	ceb4de8b35	Load booster groups for arcade	2016-06-10 16:33:53 -05:00
Thanos Paravantis	6d380c6c6f	Rename building champion to Speedy Builders	2016-06-10 22:44:13 +03:00
Shaun Bennett	0a204a3b90	Use redis pub/sub to send booster updates	2016-06-10 12:44:27 -05:00
Keir Nellyer	a73e1c24b5	Properly calculate user reputation	2016-06-10 15:47:59 +01:00
Keir Nellyer	380139477c	Reduce expiry time for reports	2016-06-10 12:59:50 +01:00
Keir Nellyer	36f47b7067	Clear report cache when report is closed	2016-06-10 12:41:02 +01:00
Keir Nellyer	09009c352b	Remove new-line in query	2016-06-10 12:34:23 +01:00
Keir Nellyer	2cacdbae34	Use more robust Guava Cache class for caching	2016-06-10 12:33:46 +01:00
Thanos Paravantis	52ce640391	Merge branch 'develop' into thanos-mineware	2016-06-10 12:15:54 +03:00
Shaun Bennett	e30cd6747b	Increase goal 10 million, probably need to change later	2016-06-09 23:40:58 -05:00
Shaun Bennett	1d365d726c	brawl fountain now displays proper info on the weekend	2016-06-09 23:40:58 -05:00
Shaun Bennett	08e47b4b1b	Enable tips in bonus gui	2016-06-09 22:41:41 -05:00
Keir Nellyer	4503f12738	Implement report caching	2016-06-10 00:28:07 +01:00
Keir Nellyer	22dbcbf90d	Move util method to sequence CompletableFuture's to new class 'UtilFuture'	2016-06-09 23:41:17 +01:00
Alex-The-Coder	77e9de0f8f	Update required rank in fountain add help message	2016-06-09 17:02:00 -05:00
Alex-The-Coder	0306f1d703	Update required rank in booster command help message	2016-06-09 17:02:00 -05:00
Alex-The-Coder	dbe8f39eeb	Update required rank in add booster help message	2016-06-09 17:02:00 -05:00
Keir Nellyer	fe06fba406	Re-word from "hacking" to "guilty" so that button is applicable for both types of reports	2016-06-09 22:49:04 +01:00
Keir Nellyer	ad17c620b7	Fix sql query for fetching report result counts	2016-06-09 22:48:18 +01:00
Keir Nellyer	e24d67ecd3	Report errors when fetching a ReportProfile and attempt to recover from it	2016-06-09 18:11:38 +01:00
Keir Nellyer	f0da319f46	Inventories must be handled on the main thread	2016-06-09 18:00:15 +01:00
Keir Nellyer	1db1257a05	Report message task for handler now checks if the report is still active Due to recent changes, this no longer needs to run asynchronously as the CompletableFuture class already makes thing asynchronous for us.	2016-06-09 17:45:08 +01:00
Keir Nellyer	5d9a317f2a	Fix sql queries which use reserved words	2016-06-09 17:06:44 +01:00
Keir Nellyer	e113b0744d	Fix incorrect column name when getting report reasons	2016-06-09 17:06:09 +01:00
Keir Nellyer	9dbef26b92	Fix small typo in comment	2016-06-09 16:34:18 +01:00
Keir Nellyer	8e48b00264	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-06-09 15:16:38 +01:00
cnr	ba319599ba	Fix fountain schematic file paths	2016-06-09 01:18:09 -05:00
Shaun Bennett	91f6ddce55	Add some minor documentation	2016-06-09 00:48:44 -05:00
Shaun Bennett	611cb28d1a	Fix a typo	2016-06-09 00:47:03 -05:00
Shaun Bennett	cade7b4081	Remove got boosters message	2016-06-09 00:43:59 -05:00
Shaun Bennett	d6bce63967	Use schematics from update folder	2016-06-09 00:43:03 -05:00
Shaun Bennett	ece08c23a9	Fix merge issues	2016-06-09 00:40:05 -05:00
Shaun Bennett	699b35995f	Merge remote-tracking branch 'remotes/origin/develop' into feature/gems # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java	2016-06-09 00:39:39 -05:00
Shaun Bennett	d4ac309daa	Merge remote-tracking branch 'remotes/origin/master' into feature/gems	2016-06-09 00:29:27 -05:00
Shaun Bennett	85829d355d	Fix command permissions	2016-06-09 00:25:54 -05:00
Shaun Bennett	22bb56dfda	Remove game booster button	2016-06-09 00:22:54 -05:00
Shaun Bennett	09d2c00f66	Proper display of extra gem fountain rewards	2016-06-09 00:14:01 -05:00
cnr	cf6e3cf05d	Merge branch 'feature/game-variants' into develop	2016-06-08 22:47:16 -05:00
Shaun Bennett	c9d5b91c52	Proper booster activation events	2016-06-08 19:22:25 -05:00
Shaun Bennett	37a412f1bf	Starting to merge boosters into arcade code	2016-06-07 17:24:24 -05:00
Sam	298c09ab82	Lowercase rank prefixes in tablist when in party When in a party the rank prefix in the tablist of every user is now uppercase.	2016-06-06 20:45:07 +01:00
TadahTech	474a9dc975	Heavy UI and Command work. Begin testing Time: 2hrs	2016-06-05 23:37:08 -05:00
TadahTech	c577e5827c	Heavy UI and Command progress. Time: 4hrs	2016-06-05 22:55:06 -05:00
TadahTech	a9c086172f	Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2	2016-06-05 19:06:15 -05:00
TadahTech	ee35dd3442	Redis system implementation and code refactoring. Total time: 13hr	2016-06-05 19:05:29 -05:00
LCastr0	2410151371	Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics	2016-06-05 17:46:27 -03:00
LCastr0	cb71bf4ba5	Removes morphs from gadget persistence (PC-429)	2016-06-05 17:44:34 -03:00
Sam	2755543686	Merge remote-tracking branch 'refs/remotes/origin/develop' into mopple	2016-06-05 15:32:06 +01:00
TadahTech	502111ef4e	Redis system needs a shit ton of work. Need to design it better.	2016-06-05 00:42:22 -05:00
TadahTech	4ce9c90839	Party Redis init. Wrap for 6/4/2016. Total time: 9.3 hrs.	2016-06-05 00:32:04 -05:00
TadahTech	8c3d5f66a2	UI work.	2016-06-05 00:03:01 -05:00
cnr	8de5280241	Disable /allowCmd	2016-06-04 22:55:15 -05:00
TadahTech	bccc11eeaf	Files changed that need to be edited later on with the new Party System. Memory commit	2016-06-04 22:41:01 -05:00
TadahTech	84f428fa99	Redis work: Command work: UI work: Total Time: 2.5hrs	2016-06-04 21:13:19 -05:00
TadahTech	22a438d5c1	Party system rewrite init. Barebones frame work: Total time - 2hrs.	2016-06-04 01:54:17 -05:00
Sam	c01b6da390	Staff is incognito could be found using /stats (PC-Bugs-407) Fixes an issue where players could do /stats <name> to find out if vanished players were on their server.	2016-06-03 13:14:54 +01:00
LCastr0	c5cbca3ed0	Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics	2016-06-02 18:30:22 -03:00
Sam	b51007da91	Merge remote-tracking branch 'refs/remotes/origin/develop' into mopple	2016-06-02 22:28:35 +01:00
LCastr0	b3291476cb	Changed method names Changed kit modifiers to be in an enum instead of creating a new class for each modifier Implemented kit modifiers in the games Removed renaming from Widder, Christmas Elf and Pumpling Changed the persistence to have the system that Connor added	2016-06-02 18:25:16 -03:00
Thanos Paravantis	c1bd25cdbe	Merge branch 'develop' into thanos-mineware Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java	2016-06-02 22:06:59 +03:00
cnr	894b7db18e	Remove remaining fake ultra tag artifacts	2016-06-02 02:25:15 -05:00
Keir Nellyer	9465ab40ab	Fix sql query for fetching name of user account	2016-06-01 16:51:22 +01:00
Sam	936eb1b978	Merge remote-tracking branch 'refs/remotes/origin/develop' into mopple	2016-06-01 15:41:22 +01:00
cnr	750120c106	Prevent developers from using /punish	2016-06-01 00:47:22 -05:00
cnr	84853a1f9a	Revert "Update chat-spam message with coupon link" This reverts commit `dfbb4dca11`.	2016-06-01 00:39:44 -05:00
cnr	825839d853	Fix PlayerKeyValueRepository's exception and return types	2016-06-01 00:38:29 -05:00
Sam	6cb275e036	PC-121 Changed 'a' to 'an' in the text component of the friend menu	2016-05-31 14:44:18 +01:00
Shaun Bennett	4e9a48ab4f	Finish off the tip system	2016-05-30 12:02:12 -05:00
Thanos Paravantis	e77bee5cd8	Implement building champion, remove quick climber and enhance chicken attack Building Champion achievement was implemented as a replacement for quick climber achievement, since quick climber is almost impossible to complete in public games. Build Champion is based on Build Race challenge, and it requires players to place all blocks in their inventory, within 15 seconds. Moreover, chicken minions can now attack players, even if they are stuck in the water.	2016-05-30 12:51:58 +03:00
Shaun Bennett	e380354bad	Refactor CurrencyType	2016-05-29 16:34:21 -05:00
Keir Nellyer	01855ba1ce	Some small changes to the reporting system after some very shallow initial testing has been done Improve exception handling (so we actually get a stacktrace if something goes wrong). Check if users can report before showing the category gui. Tell user if the report failed (due to some sort of internal error). Correctly get the id of a report when inserting into the database for the first time. Shorten some lambdas by using method references. Remove some unused imports. Small variable name changes.	2016-05-29 02:45:24 +01:00
Keir Nellyer	55392eae97	No need for 'this' keyword here	2016-05-29 01:10:42 +01:00
Keir Nellyer	075c2d21e9	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-05-29 00:27:48 +01:00
Keir Nellyer	20038f9e64	Massive changes made to how the report feature functions Re-enabled report feature (merge from develop disabled it). Moved reports from Redis to MySQL. Made everything asynchronous. Many many other miscellaneous changes. Bugs will now be worked out and then this should be ready for QA testing	2016-05-29 00:25:26 +01:00
Shaun Bennett	a1437a3044	Starting to add gui logic	2016-05-28 11:23:26 -07:00
Shaun Bennett	aebcfc2727	Booster tip system	2016-05-28 09:21:10 -07:00
Shaun Bennett	e00009a6d1	Fix CustomTagFix applying to holograms under certain conditions	2016-05-28 09:20:33 -07:00
xGamingDudex	4fc3c491f8	Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into feature/mavericks-master-builders	2016-05-28 02:04:27 +02:00
cnr	dfbb4dca11	Update chat-spam message with coupon link	2016-05-27 13:18:07 -05:00
LCastr0	255191f01a	Changed gadget persistence to use Player Key/Value system (Thanks to Connor) Changed the method names for some classes	2016-05-26 23:58:36 -03:00
samczsun	f1f464f3a4	Change listener priority again. Fixes PC-209	2016-05-26 14:29:13 -05:00
Keir Nellyer	ad486a7e22	Merge remote-tracking branch 'origin/develop' into feature/report-v2 # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/report/ReportCategory.java	2016-05-26 13:24:24 +01:00
cnr	1c66c10293	Don't create backing tables on startup	2016-05-25 17:59:21 -05:00
cnr	5331e2bec9	Allow PlayerKeyValueRepository Exceptions to propagate	2016-05-25 17:59:20 -05:00
xGamingDudex	8a2c30fa84	Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into feature/mavericks-master-builders	2016-05-26 00:06:23 +02:00
LCastr0	e52ff13712	Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics	2016-05-25 12:20:18 -03:00
LCastr0	460cb08f54	Adds old gadget names Adds another fix for winroom speed Moves gadgets to individual packages, easier to manage in a future update Adds gadget persistence (Or maybe not) Changed mount locked item data to 8 instead of 7	2016-05-25 12:19:06 -03:00
cnr	857cf6ad30	Add PlayerKeyValueRepository and BukkitFuture PlayerKeyValueRepository<V> is a key/value store whose keys are Strings and whose value type is parameterized by V. Each repository is backed by a MySQL table in the Accounts database. Access to PlayerKeyValueRepository's values is restricted via CompletableFuture to enforce async database access. BukkitFuture contains helpful utilities for producing, transforming, and terminating CompletableFutures with actions on the main thread. A typical PlayerKeyValueRepository action may look similar to the following, where we retrieve all key/value pairs for a player and perform an action with the result on the main thread: PlayerKeyValueRepository<String> repo = [...]; // init repo UUID uuid = [...]; // a player's UUID repo.getAll(uuid).thenCompose(BukkitFuture.accept(values -> { // this will be run on the main thread! // `values` is of type `Map<String,String>` }));	2016-05-25 08:35:05 -05:00
samczsun	72a2aa926f	Change event priority again. Fixes PC-216	2016-05-24 13:15:29 -04:00
Sam Sun	cd0e59087a	Don't drop items from hidden slimes. Fixes PC-276	2016-05-24 13:15:29 -04:00
xGamingDudex	f550df5a4b	Initial game commit.	2016-05-24 13:31:59 +02:00
Shaun Bennett	434ada2e86	Fix merge issues	2016-05-24 19:14:52 +10:00
Shaun Bennett	1377e6724f	Merge with develop	2016-05-24 19:10:55 +10:00
Shaun Bennett	12c5ba80b7	API Endpoints, Web calls, Gem Fountain Schematics, Game Menu Update, Booster implementation	2016-05-24 17:13:33 +10:00
Ben	8da4ac3135	[Brute/FleshHook] Deal more damage/pull velocity when charging up more [PC-340]	2016-05-23 23:42:12 +01:00
LCastr0	3ad7fc5f21	Adds old Mr.Punchman name Adds another fix for winroom speed	2016-05-22 21:46:22 -03:00
LCastr0	ed68ef332b	Fixes for Win Room (Players were able to see other players) Added command to allow other players to run ranked commands Fixes code styles	2016-05-22 21:05:48 -03:00
xXVevzZXx	c984bbfc8a	make it possible to add stats to the brawl games	2016-05-22 00:29:58 +02:00
LCastr0	92b6abc884	Fixes merging bugs	2016-05-20 23:53:27 -03:00
LCastr0	0109e2f2dd	Fixes for Illuminated chest Fixes for /check command (Support)	2016-05-20 23:33:58 -03:00
xXVevzZXx	0fb84e57c1	Merge branch 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java	2016-05-20 23:26:54 +02:00
cnr	d6750c7d91	Disable /unlockCosmetics on production servers	2016-05-20 03:23:27 -05:00
LCastr0	22fb507871	Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics	2016-05-20 05:14:29 -03:00
LCastr0	c58e0f3e30	Fixes for the 1 Shard thing (Next time, for testing, use /unlockCosmetics)	2016-05-20 05:11:59 -03:00
Shaun Bennett	efb264dd75	Hook into Booster API	2016-05-20 16:58:58 +10:00
Thanos Paravantis	28f1d45b1c	Update achievement category game enum	2016-05-19 20:55:22 +03:00
Thanos Paravantis	472d3881a0	Merge branch 'develop' into thanos-mineware	2016-05-19 20:49:45 +03:00
Thanos Paravantis	87c8c7efa4	Merge branch 'master' into thanos-mineware	2016-05-19 20:42:43 +03:00
cnr	7f44281441	Merge branch 'develop' into project-cosmetics	2016-05-19 10:04:19 -05:00
Shaun Bennett	012edfed45	Use loaded schematics to display fountain progress	2016-05-18 18:04:21 +10:00
LCastr0	11db05b6bf	Fixes spelling of MineStrike gun Fixes spectators not being sent to the winroom	2016-05-18 03:58:50 -03:00
Shaun Bennett	e3833b95ad	Update Gem Fountain purchase gui	2016-05-18 15:59:04 +10:00
TadahTech	3479d6e318	Fix incognito.	2016-05-17 18:12:05 -05:00
TadahTech	38a0b593ee	Fix height for 1.9 and 1.8 users. Thanks QA for not fully testing....	2016-05-17 18:11:28 -05:00
Ben	35c7b9a2bd	Incognito Updates: -ADD: Prompt in Tab to identify who is in vanish (Can be a * or [Vanish]) -ADD: Make it so /stats don't work on vanished staff. -ADD: Make sure it can be toggled off on /vanish again or network leave. Staff get stuck with it when resigning. Should stay on in-between lobbies.	2016-05-17 18:10:07 -05:00
Ben	8a75a5098c	Remove hub invisibility preference for all but Admins and higher.	2016-05-17 18:08:01 -05:00
Ben	014ce137fc	If a player uses /a regardless of if staff are online, offline, or vanished, making it always yield a response telling the player that if there are staff currently online, they will receive a reply soon - removing the "there are no staff online" message. Also a 60s Recharge for this.	2016-05-17 18:03:18 -05:00
Ben	6760c07e6c	Fix staff members getting stuck in both Incognito mode and the Hub Invisibility preference, and not being able to toggle either off them off because Incognito would stop Hub Invisibility from getting toggled (on OR off), and vice versa.	2016-05-17 18:00:20 -05:00
AlexTheCoder	141cafcf28	Implement initial game code and add skeleton for full play	2016-05-17 17:29:23 -04:00
xXVevzZXx	6e9b0e4fa5	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java	2016-05-17 14:41:17 +02:00
TadahTech	43cadf564e	Fix Carl the Creeper. Fix Bridges TNT exploit.	2016-05-16 22:03:27 -05:00
LCastr0	fb63b3a1a4	Fixes for winroom command, and illuminated chest	2016-05-15 22:49:10 -03:00
LCastr0	42eef838b3	Fixes podium not being enabled by default	2016-05-15 21:33:36 -03:00
xGamingDudex	a27a618b2f	Made debugging tools only available on test servers	2016-05-16 02:04:15 +02:00
xGamingDudex	816a7ca232	Re-Activated chest buttons	2016-05-16 01:57:58 +02:00
xGamingDudex	d92ad9c53f	Made illuminated chest purchasable and added appropriate lore	2016-05-16 01:51:40 +02:00
LCastr0	511726f72a	Treasure chest coin checker for test servers	2016-05-15 20:43:46 -03:00
xGamingDudex	4ebf48bd45	Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics	2016-05-16 01:34:08 +02:00
xGamingDudex	8ad7646128	Edits to treasure chests	2016-05-16 01:33:54 +02:00
xGamingDudex	f8d5bd3c11	Fixed treasure chests Items would sometimes pop out of chest blocks You could open illuminated chests before they were converted to real chests	2016-05-16 00:51:33 +02:00
LCastr0	09b7fbdbbe	Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics	2016-05-15 18:48:00 -03:00
LCastr0	4f79ec6551	Pinata fixes	2016-05-15 18:47:09 -03:00
xGamingDudex	b4aad690e5	Fixed some rewards and added party trail to chests	2016-05-15 23:31:10 +02:00
xGamingDudex	fdf167953f	Fixed emerald set order	2016-05-15 23:30:17 +02:00
xGamingDudex	1e6dda2d7d	Cleaned up some win effect backend code & fixed kits working in winroom	2016-05-15 23:28:12 +02:00
xGamingDudex	d850bed725	Minor code tweaking * Made reward manager ammo multiplier private final field * Removed old commented code from WinEffectPodium, WinEffectLavaTrap, ParticleMusic, ParticleEmerald, ParticleBlood * Cleaned up the GameModifierMineStrikeSkin filter * Removed unused Math#isBetween(double, double, double) method * Changed Animator to use PriorityQueue	2016-05-15 19:43:07 +02:00
xGamingDudex	97f82e422d	Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/animation/Animator.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/animation/AnimatorEntity.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ICosmeticShape.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ShapeWings.java	2016-05-15 16:03:36 +02:00
xGamingDudex	22e54557d8	Fixed cleaning method for WineffectRiseOfTheElderGuardian The class contained commented code, removed when debugging	2016-05-15 15:33:42 +02:00
xGamingDudex	abddc446fd	Added java docs and tweaked code * Fixed possible duplication bug in MulitBlockUpdaterAgent * Tweaked some of the factor methods for Shape.java * Cleaned some code in ShapeWings.java	2016-05-15 15:32:44 +02:00
LCastr0	1cc44d1b3e	Fixes for the following classes: KitGameModifier KitModifierType MultiBlockUpdaterAgent Shape GadgetManager KitModifierType HatLovestruck HatSecretPackage SetLove Animator AnimatorEntity AnimationPoint ICosmeticShape UtilText KitGameModifier KitModifierType Removed build.xml and org.eclipse.jdt.ui.prefs	2016-05-15 00:20:07 -03:00
xGamingDudex	24f7a4b409	Added "(Minestrike Weapon Skin)" suffix to MS skins in treasure rewards	2016-05-14 18:53:09 +02:00
samczsun	b2e92fdf15	Don't pass on INTERACT_AT as INTERACT. Fixes PC-114	2016-05-14 09:42:28 -05:00
LCastr0	20b9f428b4	Fixes Illuminated Chest's Lore Fixes Pinata Burst not being saved Fixes AWP Asiimov and XM1014 Tranquility materials Removes Fireworks WinRoom Changes prices of things from 1 shard to Treasure Chest More unused imports removed Fixed ANGLE_WING_PATTERN -> ANGEL_WING_PATTERN Adds javadoc to UtilColor.applyColor() Adds javadoc to UtilColor.getNextColor() defaultLeatherColor -> DEFAULT_LEATHER_COLOR Adds suggestions for UtilColor Adds final modifier to _worldBorders (UtilPlayer) Changed _worldBorders key from String to UUID Adds suggestion for UtilPlayer Adds final modifier to _type (GameModifierSubPage) Adds final modifier to _type and _kitType (KitGameModifierPage) DefaultDencity -> DefaultDensity (Shape) Changed <Vector> to <> (Shape) dencity -> density (ShapeBox, ShapeGrid, ShapeSphere) Using speed and count in constructor (ShapeWings) Removed empty constructor (WorldGenCleanRoom, MultiBlockUpdaterAgent) Adds final modifier to all fields (AnimationPoint)	2016-05-14 01:18:37 -03:00
Shaun Bennett	b802cdec6d	Rename shop to "Fountain Keeper"	2016-05-14 14:01:28 +10:00
xXVevzZXx	63c44afa10	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants	2016-05-13 22:05:27 +02:00
xXVevzZXx	df5c628c35	add new gamemodes Tiny Winners, Random Kit SSM, UHC SW, UHC SG and improve OP SG, OP SW, OP Bridges, Dukes of decoration, OP Gladiators, Faster than Light, Bunny Hopper and Countdown	2016-05-13 20:23:04 +02:00
xGamingDudex	2cc609b67e	Moved some rewards from normal to valentines	2016-05-13 01:28:26 +02:00
xGamingDudex	35ab155756	Removed unnecessary lore from minestrike game modifiers	2016-05-13 01:20:06 +02:00
xGamingDudex	d34f77a381	Moved some rewards from normal to winter chest	2016-05-13 01:19:06 +02:00
xGamingDudex	9c2c415eb2	Fixed the emerald trail leaving from idle to moving	2016-05-13 01:14:00 +02:00
xGamingDudex	3bb3821fa9	WinEffect gadget disable and MineStrike name and data update	2016-05-13 01:04:35 +02:00
xGamingDudex	4958ab8149	Bug Fixes * Fixed Menu page adding glow to win effects if game modifiers were active * MineStrike skins were not properly applying material and data * Skinned knife was not dealing damage	2016-05-13 00:38:56 +02:00
xGamingDudex	06e583c05e	Added flat podium to Firework and Punchman	2016-05-12 23:50:41 +02:00
xGamingDudex	956d64d750	Git Merge Import Fix	2016-05-12 23:46:39 +02:00
xGamingDudex	29d4db0bfd	Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics Conflicts: Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java	2016-05-12 23:46:17 +02:00
xGamingDudex	2db98613ab	Cosmetic Update * Redid the Reward manager Added new rewards to the chest and changed some values * Fixed some MineStrike skin bugs * Removed particles/death effects from Minestrike * Removed old test minestrike skins * Moved minestrike skins to correct package * Changed the illuminated chest animation a bit * Fixed other minor bugs	2016-05-12 23:42:37 +02:00
LCastr0	6f4c6bc545	Fixes counter on WindUp suit Removes kit modifier categories	2016-05-12 15:00:43 -03:00
Keir Nellyer	13ff2e5263	Fix query for pulling report profiles Previously we didn't check that the user actually reported an issue so in effect we were creating a report from every single logged incident (regardless of whether the user in question was involved).	2016-05-12 14:38:04 +01:00
Keir Nellyer	814f3516de	Make the chat abuse color easier on the eyes Dark blue [bold] is hard to read, dark aqua [bold] should be easier to read.	2016-05-12 14:22:19 +01:00
xGamingDudex	276f572009	Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics Conflicts: Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathPinataBurst.java	2016-05-10 20:21:37 +02:00
xGamingDudex	1b0b9a894b	Tweaked some cosmetics * Changed Party Death to firework icon * Removed idle spark from Emerald Trail * Changed wing style to pixie from angle on infernal wings * Added black dots to YinYang Started some work on the RewardManager	2016-05-10 20:20:44 +02:00
LCastr0	4fada6de49	Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics	2016-05-10 12:45:22 -03:00
LCastr0	5b8ff933b1	Removed more unused imports Fixed some lores and names for cosmetics Renamed some classes to match Set name Commented out the Lovely set (Duplicate of Cupid's Love) Fixed set descriptions Added 'Comming soon...' to set bonuses	2016-05-10 12:44:45 -03:00
Keir Nellyer	7c80c3826b	Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report	2016-05-08 21:49:16 +01:00
Conrad	ac86f3ac8c	Merge pull request #55 from Mineplex-LLC/alex-mcl Change the visuals of the Billboards and of ELO's display in the stat…	2016-05-08 13:29:23 -04:00
AlexTheCoder	34e8d65f4d	Change the visuals of the Billboards and of ELO's display in the stats menu to be more user friendly	2016-05-07 21:16:12 -04:00
Keir Nellyer	b68127b111	Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report	2016-05-08 00:37:59 +01:00
Keir Nellyer	b1a41c3cb3	Make chat abuse colour easier on the eyes Dark blue [bold] is hard to read, dark aqua [bold] should be easier to read.	2016-05-07 22:48:49 +01:00
xGamingDudex	5649939f8c	Removed some old disabled code.	2016-05-06 21:59:18 +02:00
xGamingDudex	e04a897488	Added some pre-animation to chicken win effect. Removed some comments.	2016-05-06 21:58:31 +02:00
xGamingDudex	0fea90516b	Alternative emerald trail for full set	2016-05-06 13:24:06 +02:00
xGamingDudex	f58db6ee3b	Removed firework from party death Replaced the death effect with item drops instead	2016-05-06 13:12:28 +02:00
xGamingDudex	d60fea4f76	Added chicken and guardian win room schematic handlers	2016-05-06 13:00:45 +02:00
LCastr0	97ef801e3d	Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics	2016-05-06 00:40:55 -03:00
LCastr0	49c45628a2	Removed more unused imports Fixed some lores and names for cosmetics Renamed some classes to match Set name Commented out the Lovely set (Duplicate of Cupid's Love)	2016-05-06 00:40:22 -03:00
Shaun Bennett	93c2886601	Add boosters to inventory menu	2016-05-06 13:31:59 +10:00
Conrad	55d40a1a6b	Merge pull request #53 from Mineplex-LLC/feature/logitech-brand Changed design of billboard and fixed its centering in hubs	2016-05-05 18:33:15 -04:00
AlexTheCoder	f329051399	Changed design of billboard and fixed its centering in hubs	2016-05-05 18:25:51 -04:00
xGamingDudex	17a4517e71	Merge remote-tracking branch 'origin/develop' into project-cosmetics Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java	2016-05-05 21:03:15 +02:00
xGamingDudex	1a96ea3c18	Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics	2016-05-05 20:29:28 +02:00
xGamingDudex	db21c7dd22	EGit FTW! Git, you are the greates, randomly deciding not to include everything when I spesify you to do so.... This should have been part of prev commit.	2016-05-05 20:26:00 +02:00
xGamingDudex	9fca9283e2	Fixed skin layers for Player/Human disguises	2016-05-05 10:39:00 +02:00
Keir Nellyer	e1f2bb9740	Use all-man style braces here to be compliant with the coding standards (cherry picked from commit `e553ac5`)	2016-05-04 16:02:39 +01:00
Keir Nellyer	a663cb3e01	Revert "Revert "Report system (version 1)"" This reverts commit `d0d2de1e21`. # Conflicts: # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java	2016-05-04 15:24:29 +01:00
Conrad	145ea9221a	Merge pull request #40 from Mineplex-LLC/clans/beta Clans/beta	2016-05-03 16:57:07 -04:00
LCastr0	cfc6f3703d	Merge pull request #50 from Mineplex-LLC/develop Merge from develop	2016-05-03 13:24:32 -03:00
Conrad	3c482e38cc	Merge pull request #47 from Mineplex-LLC/feature/logitech-brand Convert over to System.out.println() for error messaging and add prot…	2016-05-02 16:34:58 -04:00
Conrad	2cd76fbf72	Merge pull request #48 from Mineplex-LLC/alex-mcl Add catch for rare occurrence where players have no stored data	2016-05-02 16:34:50 -04:00
AlexTheCoder	ccd5b47d75	Convert over to System.out.println() for error messaging and add protection for billboards in Hub via a new manager	2016-05-02 16:20:41 -04:00
LCastr0	055b8684c2	- Added action bar message when booster is ready (Wind Up Suit) - Moved each suit to an individual package, to make it easier to work with - Removed some unused imports - Added util to get entity egg data - Added kit modifiers: Beastmaster, Horseman and Necromancer (SG), Apple (Bridges) - Added specific kit pages to game modifier menu	2016-05-02 00:13:06 -03:00
Keir Nellyer	fa017c185d	Add method to load ReportProfile from database	2016-05-01 22:48:02 +01:00
Keir Nellyer	41bc9672ab	Remove un-needed imports	2016-05-01 21:49:08 +01:00
Keir Nellyer	ccf14d0d2a	Declare final variables in ReportCategory	2016-05-01 21:12:01 +01:00
Keir Nellyer	132f431a94	Map each ReportResult to its id in the database We no longer use the statistic system to store the results of reports but rather store the result of each ticket in a database table.	2016-05-01 21:10:55 +01:00
Keir Nellyer	1d36d4c4b9	Map each ReportCategory to it's id in the database	2016-05-01 21:04:20 +01:00
AlexTheCoder	7e97bd346e	Change an internal method to private and add missing class JavaDoc	2016-05-01 15:16:42 -04:00
AlexTheCoder	335c5a4510	Clean up billboard generation and clearing, rewrite MapRender for logos, and add JavaDocs to comply with code standard	2016-05-01 14:58:40 -04:00
AlexTheCoder	48c8a5a630	Force structure to spawn correctly, complete with maps on item frames	2016-05-01 01:56:07 -04:00
Ben	189f9ad524	Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta	2016-05-01 01:42:32 +01:00
Ben	2337e89a93	Improvements to the Clans ban system in general as it was performing more operations than required, and accessing the database more than was necessary. Polished up the Clans ban GUI as well.	2016-05-01 01:42:11 +01:00
AlexTheCoder	070326e72d	Create systems to automatically create and destroy branding boards, as well as implement the Logitech branding	2016-04-30 19:26:16 -04:00
Keir Nellyer	e553ac5aab	Use all-man style braces here to be compliant with the coding standards	2016-04-30 23:12:25 +01:00
Keir Nellyer	bce218a65e	Merge branch 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-04-30 23:11:35 +01:00
AlexTheCoder	39c105f0cf	Add catch for rare occurrence where players have no stored data	2016-04-30 15:34:04 -04:00
Conrad	d0d2de1e21	Revert "Report system (version 1)"	2016-04-30 14:53:59 -04:00
Conrad	e0e30a8b7f	Merge pull request #43 from Mineplex-LLC/alex-mcl Fix Async Elo Ranked Bans	2016-04-30 14:46:49 -04:00
AlexTheCoder	37a815d52a	Update JavaDocs to fit Mineplex standard	2016-04-30 14:41:28 -04:00
AlexTheCoder	2e4bae6915	Merge branch 'feature/top-elo' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla	2016-04-30 14:14:14 -04:00
AlexTheCoder	2dc5c46624	Fix naming convention on checkRankBannedAsync	2016-04-30 14:13:21 -04:00
AlexTheCoder	41e26f283c	Fix all async elo ranked ban methods and switch to callback system for API hooks	2016-04-30 14:10:09 -04:00
TadahTech	6e35bc0989	Stop spamming the chat.	2016-04-30 00:55:59 -05:00
Keir Nellyer	2490e3df82	Previous git merge cause this single line to be deleted I literally have no idea why or how this happened.	2016-04-29 23:47:01 +01:00
Keir Nellyer	6a00f26d5f	Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java # Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java	2016-04-29 23:42:27 +01:00
Keir Nellyer	81cebc4ce7	Swap static helpers for a much better solution This allows for easier refactoring in the future when we move away from retrieving the CoreClientManager from a static instance. Mineplex coding standards are also against the use of static helpers in scenarios such as this, therefore this commit brings this branch to be in-line with the coding standards.	2016-04-29 23:37:40 +01:00
Shaun Bennett	184d247fc9	Start adding BoosterPage. Move Boosters to core to support UI's	2016-04-29 17:37:34 +10:00
AlexTheCoder	a8d9745320	- Fixed order of Top Elo	2016-04-29 00:12:25 -04:00
TadahTech	26f6a1189f	Prettyfy EloCommand	2016-04-28 21:34:43 -05:00
TadahTech	e83e4b270c	Prettyfy EloCommand	2016-04-28 21:34:07 -05:00
TadahTech	00efb7d72e	Fix ELO query	2016-04-28 21:20:48 -05:00
TadahTech	84ca13c0d3	Fix ELO query	2016-04-28 21:09:28 -05:00
TadahTech	80ea7b7a4c	Fix ELO query	2016-04-28 21:09:07 -05:00
TadahTech	5a4f89b484	Fix ELO query	2016-04-28 21:04:07 -05:00
AlexTheCoder	7c279998ec	- Changed top elo queries	2016-04-28 21:55:51 -04:00
AlexTheCoder	8e68d62356	- Added documentation for new EloManager methods	2016-04-28 21:16:18 -04:00
AlexTheCoder	2887630cf8	- Added javadoc headers	2016-04-28 21:11:38 -04:00
AlexTheCoder	4b7684da4c	Merge branch 'feature/top-elo' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla	2016-04-28 21:05:56 -04:00
AlexTheCoder	e032b81842	- Made SQL calls async	2016-04-28 20:59:49 -04:00
TadahTech	562e950361	Remove File headers.	2016-04-28 19:46:13 -05:00
TadahTech	680e579223	Merge Alex's branch into mine. Convert to Java 8 Remove unneeded comments.	2016-04-28 19:39:24 -05:00
TadahTech	168483a9fc	Communities work	2016-04-28 19:30:05 -05:00
TadahTech	725481f310	Top Elo data for Webpage	2016-04-28 19:23:57 -05:00
TadahTech	84c0b1b389	Top Elo data for Webpage	2016-04-28 19:22:45 -05:00
AlexTheCoder	156982460f	- Fixed water permanently [MCL] - Fixed team balancing [MCL] - Fixed overjoining [MCL] - Changed bans for quitting ranked matches [MCL]	2016-04-28 20:03:09 -04:00
Keir Nellyer	5dbb3744d1	Improve reputation map initialization logic	2016-04-28 23:52:26 +01:00
Keir Nellyer	c82dd27b64	Make getValueOf method more robust	2016-04-28 23:36:41 +01:00
Keir Nellyer	bff5751691	Remove very last @author tag	2016-04-28 14:41:44 +01:00
AlexTheCoder	dcd376b837	- Improved graphics for Elo display in /stats	2016-04-28 01:01:14 -04:00
AlexTheCoder	189296a586	- Fixed using water in restricted zones in MCL - Implemented Elo in /stats menu	2016-04-28 00:53:04 -04:00
AlexTheCoder	b4c5be81f3	- Fixed random weather in MCL - Added Elo Division display to /stats for applicable games - Made fishing rods kept on death in MCL	2016-04-27 23:12:38 -04:00
AlexTheCoder	a16145479e	- Disabled picking up lava - Leaving ranked matches temp bans players from rejoining them	2016-04-27 03:18:44 -04:00
LCastr0	d0e7590b2a	Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics	2016-04-26 23:23:45 -03:00
LCastr0	a7ef8bec49	Adds new constructor to NotePlayer, to be able to send the song to specific players Some WindUp costume fixes Added actionbar and song to WindUp suit Created new booster manager	2016-04-26 23:21:59 -03:00
xGamingDudex	38d03b8468	Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics	2016-04-27 00:03:29 +02:00
xGamingDudex	79f210e242	Schematic and WinEffect update +Added better schematic support +Fixed schematics not sending block updates to nearby players +Added win room schematics *Tweaked some of the win rooms +Added sounds to the Lava Trap win effect.	2016-04-27 00:01:30 +02:00
Shaun Bennett	714000163b	Add messages when fountain is complete and resets	2016-04-26 16:19:27 +10:00
Shaun Bennett	4a8c38e1c8	Add fountain reset command	2016-04-26 15:33:52 +10:00
Shaun Bennett	cabf4c4c8b	Add BlockProgressBar for Gem Fountain	2016-04-26 15:26:07 +10:00
Shaun Bennett	e8370579c0	Counter refactoring	2016-04-26 13:55:06 +10:00
Thanos Paravantis	d0336be7b7	Add new achievements and modify current ones	2016-04-25 22:59:24 +03:00
LCastr0	28de514d1a	Adds some utils for UtilColor Small changes in Wind Up suit	2016-04-24 21:39:35 -03:00
Thanos paravantis	856eb6059b	Update statistics and implement data tracker	2016-04-24 22:39:56 +03:00
Keir Nellyer	8969ec172b	Merge branch 'feature/report' into feature/report-v2	2016-04-24 18:26:10 +01:00
Keir Nellyer	949f9ca712	Don't allow players to report themselves I left this to last minute to make testing easier, as with this check in place it means at least two players are required to test the report mechanism.	2016-04-24 18:10:01 +01:00
Keir Nellyer	dab1f9485c	Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report	2016-04-24 17:17:17 +01:00
Keir Nellyer	9df4dac023	Remove dead code This was left over from before I took over development of the report feature.	2016-04-24 17:16:36 +01:00
Keir Nellyer	713263214f	Run ReportPurgeTask asynchronously This prevents the task from hanging the server which may be an issue when a large amount of reports exist.	2016-04-24 17:15:12 +01:00
Keir Nellyer	57e9cd6e19	Add class headers and remove @author tags This makes the PR compliant with with the Mineplex coding style. Class headers are used to describe the function of a class and git history will be used to determine the author of a class.	2016-04-24 17:10:29 +01:00
Keir Nellyer	84f5bd2f31	Handle abusive report types	2016-04-24 16:51:01 +01:00
Thanos paravantis	e2a6500bce	Update game achievements	2016-04-24 13:37:39 +03:00
Shaun Bennett	b21dfad12e	Merge remote-tracking branch 'remotes/origin/develop' into feature/gems # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java	2016-04-24 13:37:45 +10:00
Shaun Bennett	c60beec68c	Implement Fountain GUI	2016-04-24 12:40:38 +10:00
LCastr0	491c509317	Added UnlockCosmetics command (/unlockCosmetics <type>) Added Ammo command (/ammo <gadget> <ammo> [player]) Added util for red world border screen (UtilPlayer.sendRedScreen) Added new costume -> Wind Up Removed test gadget (ItemBouncyBall)	2016-04-23 22:16:02 -03:00
xGamingDudex	ccd630e2ae	Leftovers from merge	2016-04-23 00:56:19 +02:00
xGamingDudex	b7099088a9	Merge remote-tracking branch 'origin/develop' into project-cosmetics Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/block/schematic/Schematic.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguisePlayer.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/data/TNTGenerator.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/MiscManager.java	2016-04-23 00:55:48 +02:00
Thanos paravantis	fa75bc15ad	Merge branch 'develop' into thanos-mineware Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java	2016-04-22 22:03:15 +03:00
Jonathan Williams	fe0cee65e8	Added gem and coin rewards back into bonus.	2016-04-22 05:33:25 -05:00
Jonathan Williams	260c617007	Merge remote-tracking branch 'remotes/origin/alex-mcl' into develop	2016-04-22 05:12:30 -05:00
Jonathan Williams	e28621ae26	Set oldElo equal to new elo on new row.	2016-04-22 05:04:13 -05:00
AlexTheCoder	70541fd6f2	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla	2016-04-22 05:41:24 -04:00
Jonathan Williams	d73b720323	Merge branch 'features/elo' into develop	2016-04-22 04:34:35 -05:00
Jonathan Williams	477acf044e	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop	2016-04-22 04:34:21 -05:00
Jonathan Williams	6db7e648f5	Don't insert new row if the update doesn't succeed because of elo mismatch on loss.	2016-04-22 04:20:59 -05:00
Jonathan Williams	7b18efa7b0	Prevent farming elo up with multiple games by dc and joining new game.	2016-04-22 04:05:07 -05:00
Jonathan Williams	ddd1c5af9b	Removed EloSettings and fixed scoreboard.	2016-04-22 03:10:09 -05:00
Jonathan Williams	a31eccc15b	Multiply new rating by team size. MIssed that undo!	2016-04-22 02:53:02 -05:00
Jonathan Williams	757c945320	Added in kFactor ratio application to rating delta.	2016-04-22 02:35:37 -05:00
Jonathan Williams	aa6d25139f	Tweaked elo for team games.	2016-04-22 02:04:57 -05:00
Jonathan Williams	776093288a	Fixed rating not setting in EloPlayer constructor.	2016-04-22 01:11:48 -05:00
Jonathan Williams	977fbe684a	Fixed elo query.	2016-04-22 01:06:33 -05:00
Jonathan Williams	6d00e8b41f	Refactored Elo to work correctly.	2016-04-22 00:21:11 -05:00
Shaun Bennett	8a5fdccb60	Add to fountain button	2016-04-22 11:26:05 +10:00
AlexTheCoder	d0e3b094c1	- cleaned up and prepped for live update	2016-04-21 20:57:35 -04:00
Shaun Bennett	e46798f20e	Fix NPE in AdminCommand from IncognitoManager being null	2016-04-22 10:49:34 +10:00
Shaun Bennett	435d3968a2	Fix Fountain string being changed to Counter from refactor	2016-04-21 19:46:20 +10:00
AlexTheCoder	d57cc48f0f	- Added new features!	2016-04-20 22:31:54 -04:00

... 12 13 14 15 16 ...

3962 Commits