10945 Commits

Author	SHA1	Message	Date
AlexTheCoder	df741fd394	Fix UtilVariant and disable Thanksgiving Chickens in Christmas Chaos	2016-12-01 01:22:32 -06:00
AlexTheCoder	e8cc23279f	Start debugging CC	2016-12-01 01:22:32 -06:00
AlexTheCoder	df48369e70	Revamp original Pumpkin King morph, add a new Christmas King Morph, and make the Christmas King morph the new reward for Christmas Chaos	2016-12-01 01:22:32 -06:00
AlexTheCoder	58fe232520	Fix redis pubsub for SalesAnnouncements	2016-12-01 01:20:18 -06:00
AlexTheCoder	72669c7640	Remove malfunctioning visibility refreshers and block direct connection to Clans servers for non-staff	2016-12-01 01:20:18 -06:00
AlexTheCoder	3a7ff872d6	Update Rune Amplifier display to be less confusing	2016-12-01 01:20:18 -06:00
Sam	6d1c368452	Fix no drops	2016-11-30 20:23:45 +00:00
Sam	a7143897a0	Vertical Border and achievements fix	2016-11-30 19:52:27 +00:00
Sam	60c1d747c5	Remove PackMaster Achievement	2016-11-30 17:37:50 +00:00
Sam	bb7191504c	UHC Achievements	2016-11-26 00:40:19 +00:00
Sam	ddab450c8e	Another border size problem...	2016-11-25 00:44:13 -05:00
Sam	f2eb1209db	Wrong border size	2016-11-25 00:44:13 -05:00
Sam	4158d09106	UHC Bug fixes!	2016-11-25 00:44:13 -05:00
AlexTheCoder	6fefd71bb8	Remove all chickens on game state change and stop chickens spawning in any UHC type	2016-11-25 00:41:47 -05:00
AlexTheCoder	26262479f6	Remove Smoke Bomb and Illusion from Clans	2016-11-25 00:41:47 -05:00
cnr	3f72ded65e	Revert "Retry CTF proxy fix" ... This reverts commit 67a663891e.	2016-11-24 06:49:26 -06:00
cnr	5e218d019c	Set view distance before loading UHC worlds	2016-11-24 04:50:54 -06:00
Shaun Bennett	f6bf316afb	Update rank colors	2016-11-24 04:58:03 -05:00
Shaun Bennett	4ffe9ef220	Disable UHC in player servers (temporary)	2016-11-24 04:57:21 -05:00
Shaun Bennett	8ffe76c2d0	Fix Bonus Rewards for Omega/Illumination	2016-11-24 02:41:58 -05:00
Shaun Bennett	192273314f	Merge remote-tracking branch 'origin/develop' into develop ... * origin/develop: (37 commits) Implement new sales announcement system in Lobbies and ClansHubs, and remove old Unranked Player Manager Fix SkyWarrior Kit Undo my report changes Set up support server with Thankful Chest tracking and Eternal Rank Add Cake Mount and implement it in Thankful Chest Use getName() instead of a String Enable MountChicken with some small modifications and add it to Thankful Chest Implement Thankful chest, patch Trick or Treat chest showing as purchasable, make SubscriptionDuration enum public and static, and create a Power Play Reward Remove MCL and OITQP from the stats page Take a second crack at fixing invisibility across Arcade and Clans Properly block placement of redstone-based blocks in Clans Fix Clans servers not restarting every night, display an uptime notification whenever Clans servers shut down for any reason, and remove unnecessary onDisables from the main ClansManager onDisable Patch Frozen players in clans spawning CombatLog NPCs when leaving, patch ClansCommandExecutedEvent not always being called, clean up ClanBanner code, and make Freeze System and Nether Manager effectively block Clans Commands (particularly teleportation) Fix game scoreboards breaking when given more than 15 lines and removed OITQ Payload from the server selection compass GUI Patch Items with type FEATHER, BONE, or RAW_CHICKEN being automatically instantly removed, patch Carl the Creeper not viewing playwire as an available reward to inform players about, and patch Carl the Creeper not informing players of available rewards on Clans Hubs and Lobbies not included in the main server group Fix HolidayManager being outdated Update Enderchest endpoint location Setup enderchest API QA changes More bugs ...	2016-11-24 00:51:46 -05:00
AlexTheCoder	be4627812b	Implement new sales announcement system in Lobbies and ClansHubs, and remove old Unranked Player Manager	2016-11-24 00:51:28 -05:00
Shaun Bennett	8d9f697bdd	Fix SkyWarrior Kit	2016-11-24 00:50:03 -05:00
Shaun Bennett	8882bfee5c	Merge remote-tracking branch 'remotes/origin/develop' into update/uhc-moppletop ... * remotes/origin/develop: Set up support server with Thankful Chest tracking and Eternal Rank Add Cake Mount and implement it in Thankful Chest Use getName() instead of a String Enable MountChicken with some small modifications and add it to Thankful Chest Implement Thankful chest, patch Trick or Treat chest showing as purchasable, make SubscriptionDuration enum public and static, and create a Power Play Reward Remove MCL and OITQP from the stats page Take a second crack at fixing invisibility across Arcade and Clans Properly block placement of redstone-based blocks in Clans Fix Clans servers not restarting every night, display an uptime notification whenever Clans servers shut down for any reason, and remove unnecessary onDisables from the main ClansManager onDisable Patch Frozen players in clans spawning CombatLog NPCs when leaving, patch ClansCommandExecutedEvent not always being called, clean up ClanBanner code, and make Freeze System and Nether Manager effectively block Clans Commands (particularly teleportation) Fix game scoreboards breaking when given more than 15 lines and removed OITQ Payload from the server selection compass GUI Patch Items with type FEATHER, BONE, or RAW_CHICKEN being automatically instantly removed, patch Carl the Creeper not viewing playwire as an available reward to inform players about, and patch Carl the Creeper not informing players of available rewards on Clans Hubs and Lobbies not included in the main server group # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java	2016-11-24 00:48:15 -05:00
Shaun Bennett	86591cf4a3	Merge remote-tracking branch 'origin/update/uhc-moppletop' into update/uhc-moppletop ... * origin/update/uhc-moppletop: Fix HolidayManager being outdated	2016-11-24 00:15:03 -05:00
Shaun Bennett	b291090ace	Undo my report changes	2016-11-24 00:14:56 -05:00
AlexTheCoder	e85ee39ac5	Set up support server with Thankful Chest tracking and Eternal Rank	2016-11-23 23:43:42 -05:00
AlexTheCoder	a669ac4105	Add Cake Mount and implement it in Thankful Chest	2016-11-23 23:43:42 -05:00
AlexTheCoder	31fd148487	Use getName() instead of a String	2016-11-23 23:43:42 -05:00
AlexTheCoder	c028edb064	Enable MountChicken with some small modifications and add it to Thankful Chest	2016-11-23 23:43:42 -05:00
AlexTheCoder	cfa5512141	Implement Thankful chest, patch Trick or Treat chest showing as purchasable, make SubscriptionDuration enum public and static, and create a Power Play Reward	2016-11-23 23:43:42 -05:00
AlexTheCoder	ca68b59ba2	Remove MCL and OITQP from the stats page	2016-11-23 23:41:10 -05:00
AlexTheCoder	0a458c150f	Take a second crack at fixing invisibility across Arcade and Clans	2016-11-23 23:41:10 -05:00
AlexTheCoder	e4a968759a	Properly block placement of redstone-based blocks in Clans	2016-11-23 23:41:10 -05:00
AlexTheCoder	32c9900069	Fix Clans servers not restarting every night, display an uptime notification whenever Clans servers shut down for any reason, and remove unnecessary onDisables from the main ClansManager onDisable	2016-11-23 23:41:10 -05:00
AlexTheCoder	18992efa5a	Patch Frozen players in clans spawning CombatLog NPCs when leaving, patch ClansCommandExecutedEvent not always being called, clean up ClanBanner code, and make Freeze System and Nether Manager effectively block Clans Commands (particularly teleportation)	2016-11-23 23:41:10 -05:00
AlexTheCoder	c2de8c35e2	Fix game scoreboards breaking when given more than 15 lines and removed OITQ Payload from the server selection compass GUI	2016-11-23 23:41:10 -05:00
AlexTheCoder	1bbabe46f7	Patch Items with type FEATHER, BONE, or RAW_CHICKEN being automatically instantly removed, patch Carl the Creeper not viewing playwire as an available reward to inform players about, and patch Carl the Creeper not informing players of available rewards on Clans Hubs and Lobbies not included in the main server group	2016-11-23 23:41:10 -05:00
AlexTheCoder	44efedbc81	Fix HolidayManager being outdated	2016-11-23 19:11:44 -05:00
Shaun Bennett	15f3b19f8a	Merge remote-tracking branch 'origin/update/uhc-moppletop' into update/uhc-moppletop ... * origin/update/uhc-moppletop: Retry CTF proxy fix Eternal Giveaway Fixes Eternal giveaway refactoring Revert: Disable Fated giveaway tools for now Eternal Rank # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java	2016-11-23 18:11:26 -05:00
Shaun Bennett	bfa27f2bc4	Update Enderchest endpoint location	2016-11-23 18:10:59 -05:00
xXVevzZXx	b42f3eb5fd	Fix final bugs and improve island system	2016-11-23 19:56:46 +01:00
Shaun Bennett	e892476ca0	Setup enderchest API	2016-11-22 08:17:24 -05:00
Sam	325c0ab56c	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop	2016-11-21 19:13:34 +00:00
Sam	92ed095e92	QA changes	2016-11-18 21:32:02 +00:00
Shaun Bennett	dd7e559a37	Merge remote-tracking branch 'origin/develop' into develop ... * origin/develop: Retry CTF proxy fix Eternal Giveaway Fixes Eternal giveaway refactoring Revert: Disable Fated giveaway tools for now Eternal Rank	2016-11-17 22:50:23 -05:00
samczsun	67a663891e	Retry CTF proxy fix ... But this time, let's allow deregistration even if it hasn't been registered by us, because it auto-registered itself	2016-11-17 22:49:15 -05:00
Shaun Bennett	3d5e61e0f1	Eternal Giveaway Fixes	2016-11-17 21:05:10 -05:00
Shaun Bennett	562d7de1a9	Eternal giveaway refactoring	2016-11-17 21:05:10 -05:00
Shaun Bennett	cdfd030999	Revert: Disable Fated giveaway tools for now	2016-11-17 21:05:10 -05:00
Shaun Bennett	712019b45b	Eternal Rank	2016-11-17 21:05:10 -05:00
Shaun Bennett	c080d41dc2	Temp DB fixes	2016-11-17 19:08:32 -05:00
xXVevzZXx	85d6452432	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/skyfall	2016-11-17 23:17:24 +01:00
Sam	0ca79f193f	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop	2016-11-17 21:20:28 +00:00
Sam	53b67214fb	More bugs	2016-11-17 21:20:00 +00:00
Shaun Bennett	f6a694b4fc	Fix Metal Man distribution	2016-11-17 16:18:51 -05:00
Shaun Bennett	10911c9a9c	Revert CTF Proxy Fix	2016-11-17 16:17:39 -05:00
Sam	142cf4dd93	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop	2016-11-17 19:41:47 +00:00
Sam	78a123156a	Memory leaks!	2016-11-17 19:38:07 +00:00
xXVevzZXx	26d8fe5e6e	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/skyfall	2016-11-17 19:19:28 +01:00
Shaun Bennett	e845f7fca9	Disable Fated giveaway tools for now	2016-11-17 02:13:48 -05:00
LCastr0	b862a30c76	Thanksgiving Cosmetics (#278) ... * Added chickens to Holiday Manager (Thanksgiving) Added TextEffect Moved all the effects to a different package to make it easier to find Added method in Effect to get the Effect Location * Removed(?) wildcard import * Testing New year thing Added some symbols to UtilBlockText * Allow multiple pets with the same EntityType * Added Stray Morph Added Shulker Pet Added code for a possible new year effect Added Metal Man Morph to the menus Added Metal Man Morph as an yearly bonus for PPC subscriptions * Added chickens to Holiday Manager (Thanksgiving) Added TextEffect Moved all the effects to a different package to make it easier to find Added method in Effect to get the Effect Location * Removed(?) wildcard import * Testing New year thing Added some symbols to UtilBlockText * Allow multiple pets with the same EntityType * Added Stray Morph Added Shulker Pet Added code for a possible new year effect Added Metal Man Morph to the menus Added Metal Man Morph as an yearly bonus for PPC subscriptions * I seriously don't remember what is in this commit, I'm just doing it to fix the thing with develop... * Fixed Pet menu Fixed morph menu Changed from List to Set * Changed from PurchasUnknownSalesPackage to AddUnknownSalesPackageOwned * Added Santa Morph Removed Sleigh Morph Changed all the cosmetics GUIs to start on the second row, instead of the first * Changed some stuff from Holiday Manager so now chickens will walk around when spawned * Added sound effects to Metal Man Added slowness to Metal Man * Added new lore for the Metal Man Morph description Added Stray Morph Ability Fixed some problems with the Thanksgiving Chickens * Added Fated giveaway manager and animation Moved titan and fated giveaway managers to a new package * Fixed lores for Stray morph and Shulker pet Changed ability of Stray morph * Removed Stray and Shulker pet from the menu Deleted Pet class since it was not being used Changed position of achievement on the menu Changed color of chicken's name Changed colors of Power Play message Stray morph, Santa morph and Shulker pet are hidden from the menus for now Removed feathers dropping from chickens, changed them to snow particles * Added hover ability to Metal Man Morph * Fixed some stuff on Metal Man	2016-11-17 02:06:00 -05:00
cnr	db1598f896	Revert 1.11 disguise changes ... Entity type tracking for disguises is now done in our spigot build.	2016-11-16 23:36:47 -06:00
Shaun Bennett	cbc9aeedc6	Report Feature Improvements (#269) ... Report Feature Improvements	2016-11-16 22:52:14 -05:00
Shaun Bennett	c250796bdf	Fix pom.xml formatting	2016-11-16 22:37:25 -05:00
AlexTheCoder	7d14b6073d	Give SlackAPI a valid payload link, fix some display issues with clans nether, fix claiming in clans nether, update coordinates to match new map	2016-11-16 22:37:25 -05:00
AlexTheCoder	5e1fcabe36	Final changes for S2	2016-11-16 22:37:25 -05:00
AlexTheCoder	a8e3a530c1	Prevent safely logging out in shop zones while tagged	2016-11-16 22:37:25 -05:00
AlexTheCoder	4a186a8dec	Disable crafting of hoppers	2016-11-16 22:37:25 -05:00
AlexTheCoder	4fc2b875d4	Add a clans map generator to codebase	2016-11-16 22:37:25 -05:00
AlexTheCoder	a219a2d072	Fix TNT breaking bedrock, increase build height and add a minimum chest place height	2016-11-16 22:37:25 -05:00
AlexTheCoder	1535fcc38b	Fix temp blocks in unloaded claims not restoring, fix ClassCombatCreatureSpawnEvent having a null world name, fix block toss fallingblocks solidifying in unloaded chunks, make safelog in clans disable when server shuts down, and make UtilBlock recognize 1.8 fence gates as usable blocks	2016-11-16 22:37:25 -05:00
AlexTheCoder	63ef68976c	Patch illusion in nether, stop cobble generation, lower rune drop rate, make tnt time based and better function in water, make scorching not damage teammates or those in safezones, make runed pickaxe more effective	2016-11-16 22:37:25 -05:00
Sam	22b7ce60eb	For sam	2016-11-17 02:56:58 +00:00
Alexander Meech	c21e71606d	Fix message line spacing for Prince Artix	2016-11-16 21:42:47 -05:00
AlexTheCoder	b374d728f5	Change playwire button, modify player messages, and fix availability bugs	2016-11-16 21:42:47 -05:00
AlexTheCoder	0070fed6c7	Fix playwire multithreading and convert to new 5-ticket per 24-hour system	2016-11-16 21:42:47 -05:00
AlexTheCoder	824ef685c0	Add missing return	2016-11-16 21:42:47 -05:00
AlexTheCoder	d5f89bb370	Add more blocked commands and move the blocked command handler below the Mineplex command executor	2016-11-16 21:42:47 -05:00
AlexTheCoder	4cb257e84a	Tweak blocked commands system	2016-11-16 21:42:47 -05:00
Sam Sun	4709161180	Attempt to fix CTF Proxies (#280)	2016-11-16 21:40:42 -05:00
md-5	735550c157	Use Mineplex Pair Util Class in Halloween 2016 (#274) ... JavaFX is not included in OpenJDK.	2016-11-16 20:29:33 -05:00
Shaun Bennett	0039b79281	Change Youtube Button Link (#275) ... * Fix possible NPE in Preferences * Change youtube button link	2016-11-16 20:23:14 -05:00
Sam	8d6eb13504	Add "%player% is your teammate" in 2 player team games (#273) ... * Add "%player% is your teammate" in 2 player team games * Add to Team Skyfall	2016-11-16 20:10:16 -05:00
Sam	684432d7dc	Add Rules Command (#272) ... * Added a /rules command * Remove unused space * More Spaces!	2016-11-16 19:59:24 -05:00
Sam	51c7801a9f	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop	2016-11-15 20:01:21 +00:00
cnr	70ca2c7964	Add 1.11 support	2016-11-15 13:58:31 -06:00
xXVevzZXx	a74bc71018	fix bugs and make some improvements	2016-11-15 17:04:38 +01:00
Sam	faba1f2369	Forgot the actual UHC class...	2016-11-13 12:35:48 +00:00
Sam	efc73d220f	Change how UHC handles time	2016-11-13 12:35:38 +00:00
Sam	07cd716cf7	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop	2016-11-13 10:37:21 +00:00
Sam	aa4ef9f4ad	Big bugs	2016-11-12 21:50:38 +00:00
Keir Nellyer	6e5db69b0c	Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report	2016-11-10 13:52:44 +00:00
Sarah	e71187aa33	Add new Brawl Games (#260) ... * add more Brawl games * fix some bugs in new brawl games * fix even more bugs * Fix some super paintstrike bugs * Add some Javadoc	2016-11-09 20:38:49 -05:00
Keir Nellyer	af7557c9b1	When multiple accounts with the same name occur, pick the one that ... logged in most recently	2016-11-09 01:25:33 +00:00
Nate Mortensen	3b83a9bdc3	Reformat Block Hunt	2016-11-08 10:44:39 -05:00
Nate Mortensen	6db79c3ca5	Remove disguises when players switch to Seeker	2016-11-08 10:44:39 -05:00
Nate Mortensen	0607355ee0	Prevent cloaked players from having their visibility reset	2016-11-08 10:44:39 -05:00
Nate Mortensen	e3b701f948	Don't give infestors an initial disguise	2016-11-08 10:44:39 -05:00
Keir Nellyer	6273996ebe	Only set incognito and teleport player when report is hacking or ... gameplay offense	2016-11-07 15:38:55 +00:00
Sam	6a9648e646	Solo Mode and Faster UHC	2016-11-05 11:06:12 +00:00
xXVevzZXx	af7de62ff7	Fix non upgradeable perks being not unregistered	2016-11-04 06:02:13 -05:00
Keir Nellyer	407ec0d924	Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report	2016-11-03 20:11:21 +00:00
xXVevzZXx	d93cdfee8f	Add Team stats display for Skyfall	2016-11-02 21:42:53 -05:00
Nate Mortensen	f587445ffc	Remove extraneous horses when the game ends ... When players using the horseman kit win a game, they never die, which is the only time that spawned horses are removed. To fix this, at the end of the game all horses belonging to players that have survived are explicitly removed, which removes all remaining horses.	2016-11-02 17:01:17 -04:00
LCastr0	9267a36528	Disable Halloween 2016 (#261) ... * Removed all the halloween related items: - Haunted chests can only be opened if player already had ammo - Removed Halloween theme from the hub - Removed pumpkins from in-game * Added Halloween items to the Omega Chest * Fixed weight for items in the omega chest * Changed Disk to Disc in RewardManager Changed values for omega rarities * Final commit (removed win room test command) * Removed Halloween words from Draw My Thing and Master Builders	2016-11-02 16:49:31 -04:00
Sarah	afac2aea3f	Skyfall Update (#262) ... * Fix some bugs, improve Skyfall and add Skyfall Teams * re-enable debug * Fix Perks not being unregistered from the EventHandler * Remove unused import * Remove unused imports	2016-11-02 16:48:44 -04:00
Sam	b122fba97e	Fix arrows not getting removed!	2016-11-02 16:48:01 -04:00
Alexander Meech	1f69c204f6	Fix Trick or Treat Chest Logging in Cust Server	2016-11-02 16:47:38 -04:00
Alexander Meech	e73947b9b1	Hotfix pumpling pet being added to Haunted Chest	2016-11-02 16:47:38 -04:00
Keir Nellyer	aaa248833e	Don't allow players to have more than 5 open snapshots at a time	2016-11-01 17:21:56 +00:00
Keir Nellyer	828f39536b	Don't allow players to have more than 5 open reports at a time	2016-10-31 15:49:15 +00:00
Keir Nellyer	b5ef642f39	Improve getReportHandling code	2016-10-30 22:13:52 +00:00
Keir Nellyer	4971adcfb3	This should be an inner join	2016-10-30 01:53:52 +00:00
Keir Nellyer	e72573d6fd	Fix getReports method not checking report cache first	2016-10-30 01:41:28 +00:00
Keir Nellyer	8f07d377f1	Clear report cache after closing message has been sent, prevents ... report cache being cleared and instantly reloaded	2016-10-30 01:25:06 +00:00
Keir Nellyer	1405aef0c3	Update code to use column creatorId instead of creator	2016-10-30 01:16:40 +00:00
Keir Nellyer	08f113bb99	Various improvements and fixes to report related database queries	2016-10-30 01:58:56 +01:00
Keir Nellyer	ce4672f026	Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report	2016-10-29 15:54:13 +01:00
Keir Nellyer	7aa3daca9d	PC-1140 Fix various issues with region-locked reports	2016-10-29 15:54:01 +01:00
Keir Nellyer	696a99b872	Refactor some parameter names to make method function more obvious	2016-10-29 15:26:02 +01:00
Keir Nellyer	3dc441d61d	PC-1016 Delete snapshots > 30 days and not linked to report in ... cleanup task	2016-10-29 14:38:16 +01:00
Keir Nellyer	09e5d13b96	PC-1016 Rename column creator to creatorId	2016-10-29 14:27:19 +01:00
Keir Nellyer	eb37c5da2e	PC-1016 Create column created to store date time for snapshots	2016-10-29 14:26:16 +01:00
samczsun	07c93606f8	GameChatManager: Check if the game exists	2016-10-28 17:57:25 -04:00
samczsun	873e93747e	HolidayManager: Fix CME	2016-10-28 17:57:25 -04:00
samczsun	49c5df6e68	Parties: Check if target is null before inviting	2016-10-28 17:57:25 -04:00
samczsun	1d961c7d81	GamePlayerManager: Don't load kits if offline	2016-10-28 17:57:25 -04:00
samczsun	a7986a0719	Party: Fix NPE ... Filter out members who are no longer online when sending messages	2016-10-28 17:57:25 -04:00
samczsun	d2a2fdfd46	UHC: Fix NPE ... Players who joined after the gamestate has been set to PREPARE should not be considered as in the game	2016-10-28 17:57:25 -04:00
samczsun	a729b03ce7	UtilParser: Handle null lastDamageCauses	2016-10-28 17:57:25 -04:00
samczsun	0c1f6cbedc	Rewrite CombatLogModule	2016-10-28 17:57:25 -04:00
samczsun	70ed2e4fbb	CompassModule ... Integrate with CombatLogModule	2016-10-28 17:56:46 -04:00
samczsun	e8becf3819	Op on dev servers too	2016-10-28 17:56:08 -04:00
samczsun	e7b744f527	UHC rewrite	2016-10-28 17:56:08 -04:00
Keir Nellyer	f0f01b74e8	PC-1016 Schedule cleanup task for everyday at 00:00 CDT	2016-10-28 18:13:20 +01:00
samczsun	7a0fba3027	Make Trick Or Treat chests open 4	2016-10-28 00:10:17 -05:00
Keir Nellyer	4b3cadbb5a	Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/BuyChestButton.java	2016-10-27 23:53:32 +01:00
Keir Nellyer	8283af25af	Remove resolved todo for metrics command	2016-10-27 23:49:40 +01:00
Keir Nellyer	e7ff175eff	Remove report site token todo message (is now resolved)	2016-10-27 23:48:54 +01:00
Keir Nellyer	30f56e3b12	PC-1016 Add cleanup task sql script	2016-10-27 23:40:09 +01:00
Keir Nellyer	100dc53ead	PC-1150 Close div's correctly	2016-10-27 16:09:11 +01:00
Keir Nellyer	3bcfa6adc5	PC-1150 Only show information section of site when report is being ... displayed	2016-10-27 15:34:07 +01:00
Shaun Bennett	577e640f4a	Add KillAura Type E and F checks - no Action enabled yet	2016-10-26 23:00:47 -04:00
Shaun Bennett	0c0ad5ab13	PPC Items (#252) ... Update/ppc items	2016-10-26 22:30:58 -04:00
LCastr0	a340f15d63	Fixed changes requested by Shaun	2016-10-27 00:27:50 -02:00
Shaun Bennett	f06325d972	Super Smash Mobs Update (#243) ... Update/ssm	2016-10-26 22:03:43 -04:00
Alexander Meech	d13387df52	Make trick or treat chest dynamically controlled (#256) ... * Implement trick or treat chest in customer support server * Add several new reward types, implement trick or treat chest and all its animations, and fix playwire nested threads	2016-10-26 22:02:46 -04:00
Keir Nellyer	3bd575b718	PC-1153 Improve /reportmetrics usage	2016-10-26 13:29:11 +01:00
Keir Nellyer	79b5439aa4	Small refactoring	2016-10-26 10:50:49 +01:00
Keir Nellyer	a97ad8dd76	PC-1153 Don't allow days argument to exceed 30 days	2016-10-26 10:42:10 +01:00
Keir Nellyer	f5a81f083e	Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report	2016-10-26 10:28:13 +01:00
Keir Nellyer	52d001c26e	PC-1153 Add /reportmetrics command	2016-10-26 10:28:01 +01:00
Alexander Meech	39f0cd79bb	Cap purchase date for sampson	2016-10-25 13:34:22 -04:00
Alexander Meech	3e8eecdf91	Update reward weightings for sigils	2016-10-25 13:34:22 -04:00
Alexander Meech	6d982f3df9	Fix spin ticket reward threading	2016-10-25 13:34:22 -04:00
Alexander Meech	273f95f8ff	Fix playwire threading	2016-10-25 13:34:22 -04:00
AlexTheCoder	a36ebf4528	Add several new reward types, implement trick or treat chest and all its animations, and fix playwire nested threads	2016-10-25 13:34:22 -04:00
AlexTheCoder	ab228fb492	Implement trick or treat chest in customer support server	2016-10-25 13:34:22 -04:00
cnr	44e016f272	Fix infinite loop in GameWorldManager	2016-10-25 01:44:07 -05:00
Keir Nellyer	e4c7e31185	Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report	2016-10-24 15:00:10 +01:00
Alexander Meech	d6dc750ece	Prevent MPS servers with Lobbyblablabla-1 as... ... ...the name from being loaded as an applicable lobby server	2016-10-24 01:21:56 -04:00
xGamingDudex	eaee382e7f	Small typo	2016-10-23 16:22:27 +02:00
xGamingDudex	c0ec1e1ff7	Prevent infinite speed effect on creeper	2016-10-23 03:11:51 +02:00
xGamingDudex	7b7b7aadf8	Fix a notorious XP bug in the wolf kit	2016-10-23 01:28:57 +02:00
xGamingDudex	1a847862d5	Prevent sometimes duplicate usage of the snowman smash	2016-10-23 01:28:04 +02:00
xGamingDudex	4531902adc	Prevent guardian abilities from affecting team mates	2016-10-23 01:27:34 +02:00
xGamingDudex	0306d0d9d1	Fix chicken rocket to deal damage and knockback	2016-10-23 01:27:09 +02:00
Keir Nellyer	ff8f77f8d1	Rename these variables to make better sense	2016-10-22 23:08:59 +01:00
Keir Nellyer	ecd9dfef1a	PC-1139 Update chatsnap site to support displaying of snapshots with ... no associated report	2016-10-22 20:49:14 +01:00
xGamingDudex	2d0d78e1b7	Prevent snowman smash from affecting self, and give 3 snowmen	2016-10-22 21:28:11 +02:00
Keir Nellyer	c6ca976653	PC-1139 Add /chatsnap command	2016-10-22 20:23:31 +01:00
Keir Nellyer	81bf9bc406	Small method rename	2016-10-22 19:21:38 +01:00
Keir Nellyer	35048b46a7	Report/snapshot code clean-up	2016-10-22 19:17:20 +01:00
Keir Nellyer	e0d05d3c87	PC-1140 Keep reports region-separated	2016-10-22 15:06:18 +01:00
xGamingDudex	295f1f255f	Fixed rare NPEs	2016-10-22 13:09:56 +02:00
xGamingDudex	720e965d08	Fixed chicken rocket.	2016-10-22 10:49:21 +02:00
xGamingDudex	4e433665cc	Fixed golem smash affecting team mates	2016-10-22 10:49:02 +02:00
xGamingDudex	8414a17978	Don't apply velocity to team mates	2016-10-22 10:48:36 +02:00
xGamingDudex	d2be1fc646	Don't set team mates on fire on direct fireball hit	2016-10-22 10:48:09 +02:00
xGamingDudex	1ae89adfb0	Remove debug messages	2016-10-22 09:40:06 +02:00
LCastr0	6de2df5cc4	Fixed lores ... Fixed icons Removed sleigh, chicken mount and wind up suit from menus Added javadocs to sleigh	2016-10-22 02:27:44 -02:00
LCastr0	83ba1cb26e	- Removed debug message ... - Added check for player teleport when opening a chest - Added Turkey Morph and Chicken Mount to PowerPlayClubRewards	2016-10-21 18:48:47 -02:00
LCastr0	0d6ff42a8d	- Fixed players not being kicked from treasure chest locations when they are being opened ... - Increased the time needed for the Wind Up suit to be charged - Added effect for the Wind Up suit to blink between yellow and red when the effect is active	2016-10-21 18:06:13 -02:00
Keir Nellyer	5f755add78	Rename /reportstats command to /reporthistory	2016-10-21 17:24:27 +01:00
LCastr0	56db128730	Merge pull request #251 from Mineplex-LLC/develop ... Merge 'develop' into 'update/ppc-items'	2016-10-21 13:05:00 -02:00
xGamingDudex	cfd2343f0e	Fixed zombie perk Deaths Grasp	2016-10-21 16:51:47 +02:00
xGamingDudex	b8c474a92d	Fixed daze potion	2016-10-21 16:51:29 +02:00
xGamingDudex	bcfdfd4619	Added better team mate detection for team super smash	2016-10-21 16:51:16 +02:00
Keir Nellyer	b0ac3cac8c	Show link to view chat log in /reportinfo	2016-10-21 09:32:11 -04:00
Keir Nellyer	63514029f2	Generate missing tokens for snapshots on report load	2016-10-21 09:32:11 -04:00
xGamingDudex	ff1d29bd2e	Apply wool bomb damage to self in team games	2016-10-21 01:37:14 +02:00
xGamingDudex	70d554fa2d	Fixed witch daze potion	2016-10-21 01:12:02 +02:00
xGamingDudex	ca0f36d142	Prevent armorstand used by laze to block projectiles	2016-10-21 00:55:44 +02:00
xGamingDudex	45c5ba66bd	Prevent multiple perks from affect team mates and cleaned up some code	2016-10-21 00:55:18 +02:00
xGamingDudex	c8edc2d01e	Rewrote daze potion damage calculations	2016-10-21 00:54:04 +02:00
xGamingDudex	6a6a589cb7	Fixed wolf cub sometimes not being removed	2016-10-21 00:25:37 +02:00
xGamingDudex	db3106d8a4	Prevent golem fissure from effecting team mates	2016-10-20 23:20:26 +02:00
xGamingDudex	d26103d321	Increase Whirlpool damage	2016-10-20 23:20:02 +02:00
xGamingDudex	d42a5f1897	Prevent Chicken Rocket from resetting cooldown when hitting team mates	2016-10-20 23:13:32 +02:00
xGamingDudex	08b7b7cb48	Removed unused files. Move wool bomb patch to correct file	2016-10-20 23:11:55 +02:00
xGamingDudex	7ad0b214a5	Change team display text	2016-10-20 23:08:40 +02:00
xGamingDudex	be2bc09896	Added comma to laser text	2016-10-20 22:56:12 +02:00
xGamingDudex	875bdc1fca	Removed unused code	2016-10-20 22:50:12 +02:00
xGamingDudex	d119a94d53	Fixed concurrency issue	2016-10-20 22:44:43 +02:00
xGamingDudex	4e4fd2a8e9	Changed respawn title text	2016-10-20 22:44:13 +02:00
xGamingDudex	0705e38b3e	Fixed NPE	2016-10-20 22:43:51 +02:00
Shaun Bennett	f8010f4ad0	Merge pull request #245 from Mineplex-LLC/update/report-improvements ... Report Feature Improvements	2016-10-19 22:53:53 -04:00
samczsun	bafad1189b	ProgressingKitManager: Temporarily add finally	2016-10-19 22:38:39 -04:00
samczsun	38ef65c32e	Fix memory leak in ItemSnowball	2016-10-19 22:38:39 -04:00
samczsun	2ed03147b0	Make WinEffectGadget clean up even if exceptions occur	2016-10-19 22:38:39 -04:00
samczsun	5168044be5	Fix memory leak in WinEffectHalloween	2016-10-19 22:38:39 -04:00
samczsun	d2c0b34459	PlayerMap	2016-10-19 22:38:39 -04:00
samczsun	09fe7b736a	Don't enable debugging	2016-10-19 22:38:39 -04:00
samczsun	bcb56c50f5	Fix memory leak in AntiHackGuardian	2016-10-19 22:38:39 -04:00
samczsun	25d6a4239e	Fix memory leak in StatsManager, CombatManager	2016-10-19 22:38:39 -04:00
samczsun	2b6d7a4d7a	Fix memory leak in ParticleFairy	2016-10-19 22:38:39 -04:00
samczsun	a59dde44c6	Remove recharge data on quit instead of later	2016-10-19 22:38:39 -04:00
samczsun	19eeae7f7f	Fix memory leak in ParticleFoot	2016-10-19 22:38:39 -04:00
samczsun	6f80e21372	Fix memory leak in carl, server	2016-10-19 22:38:39 -04:00
samczsun	bd9aa38afa	Make DisguiseManager clean up after lazy callers	2016-10-19 22:38:39 -04:00
samczsun	a338fb27d3	Various memory leak fixes	2016-10-19 22:38:39 -04:00
samczsun	b3ed9db2c7	Fix memory leak in ProgressingKitManager	2016-10-19 22:38:39 -04:00
samczsun	c00502d91f	Fix memory leak in WinEffectPodium	2016-10-19 22:38:39 -04:00
samczsun	894e6b4a89	Fix memory leak in CombatLogNPC	2016-10-19 22:38:39 -04:00
samczsun	0cbd4a9de2	Fix memory leak in Teleport	2016-10-19 22:38:39 -04:00
samczsun	dbd5203e9d	Fix memory leak in ParticleFreedom	2016-10-19 22:38:39 -04:00
AlexTheCoder	6719f11358	Fix playwire command not requiring console to use it	2016-10-19 22:36:03 -04:00
AlexTheCoder	13220e267c	Re-enable animation	2016-10-19 22:36:03 -04:00
AlexTheCoder	16b195d2ab	Make playwire-given carl spin tickets update while the player is logged in	2016-10-19 22:36:03 -04:00
AlexTheCoder	2e280d62de	Block rain on the support server	2016-10-19 22:35:17 -04:00
AlexTheCoder	6d9d42cfdd	Allow pets to be given from the support server	2016-10-19 22:35:17 -04:00
Alexander Meech	60fad6316b	Ensure command used is actually /pumpkin	2016-10-19 20:59:12 -04:00
AlexTheCoder	26baf6aa67	Make Halloween pumpkins actually drop gems and shards in Block Hunt and Minestrike	2016-10-19 20:59:12 -04:00
AlexTheCoder	55b37e0261	Fix players being able to log in multiple times via different bungees	2016-10-19 20:58:05 -04:00
xGamingDudex	db9f358718	Increase Angry Heard durration	2016-10-20 02:01:40 +02:00
xGamingDudex	59712b4089	Prevent multiple abilities from dealing damage and knockback on teammate	2016-10-20 02:01:23 +02:00
xGamingDudex	21d004b3f2	Make the skelleton kit deal static 6 damage for arrows	2016-10-20 02:00:30 +02:00
xGamingDudex	6851a20e92	Fix /lives debug command	2016-10-20 02:00:01 +02:00
xGamingDudex	0d688534b1	Reduce slime smash durration	2016-10-20 01:28:25 +02:00
xGamingDudex	33a7deed58	Tweaked witch daze potion damage	2016-10-20 01:27:43 +02:00
xGamingDudex	74d6c599b5	Fixed snowman turret targeting team mates	2016-10-20 01:27:22 +02:00
xGamingDudex	82f1ec1ac6	Tweaked spider smash	2016-10-20 01:01:46 +02:00
xGamingDudex	2306dbc909	Fixed creeper XP	2016-10-20 01:01:31 +02:00
LCastr0	225f5c6b7c	Internal: ... - Removed Win room test command - Fixed spelling error in MountSpider - Changed MountChicken so it can now jump - Still working on the Sleigh morph - Added Wind Up Suit for testing - Removed unused code from MountSpider External: - Added Sleigh Morph (Still need some work on it)	2016-10-19 18:44:57 -02:00
xGamingDudex	8de69d2573	Fixed guardian passive to acctually work	2016-10-19 17:49:59 +02:00
xGamingDudex	0b02bc9e2d	Fixed with daze potion self damage and only randomly working	2016-10-19 16:35:49 +02:00
xGamingDudex	9e3cf58ff5	Type in blaze smash	2016-10-18 19:39:06 +02:00
Keir Nellyer	db0bfece23	Prevent re-saves from un-aborting user reports	2016-10-16 23:23:55 +01:00
Keir Nellyer	3db7e27ecd	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/report-improvements	2016-10-15 15:23:26 +01:00
xGamingDudex	35c9d2ecb1	Tweaked damage/KB values and fixed text issues	2016-10-15 14:56:38 +02:00
Keir Nellyer	1ab646bbda	Fix error message colouring when there are no reports to handle	2016-10-14 19:14:50 +01:00
Keir Nellyer	64bb01c92f	Move /reportabort functionality over to the /reportclose gui	2016-10-14 19:14:35 +01:00
Keir Nellyer	28603ec8c5	Remove resolved TODOs	2016-10-14 18:47:25 +01:00
Keir Nellyer	4b4dc74cbf	PC-1000 Token column is now 8 characters	2016-10-14 16:29:04 +01:00
Keir Nellyer	b6bda9418d	PC-1000 Make all token related things work together	2016-10-14 16:28:42 +01:00
cnr	8e7ae7f55f	Make Power Play status clearer on support server	2016-10-14 00:26:33 -05:00
cnr	8ebad90f52	Don't lock current month's cosmetic on resub day ... This fixes an issue where a player might lose the current month's cosmetic on the date of resubscription until his/her payment method was charged	2016-10-14 00:26:33 -05:00
cnr	0e5d8cc785	Replace pumpling spawn flicker with short glow	2016-10-14 00:25:55 -05:00
Keir Nellyer	3b7169ad3d	PC-1000 Implement token generating method	2016-10-14 01:14:51 +01:00
Sam	76a413548b	More unused imports	2016-10-13 23:31:32 +01:00
Sam	4810960d82	Stop visible armorstands	2016-10-13 23:19:11 +01:00
Sam	99c72a3b31	Fix debug command	2016-10-13 23:10:59 +01:00
Sam	e698037a73	Remove unused import	2016-10-13 22:44:48 +01:00
Sam	c93e6be98b	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm	2016-10-13 22:43:08 +01:00
Sam	ca0da15b8c	Fix magma cube	2016-10-13 22:43:04 +01:00
Sam	f72f6e8aaa	Tweaks	2016-10-13 20:20:00 +01:00
Sam	a5d52d9e2f	MERGE PLEASE!	2016-10-13 16:11:01 +01:00
Shaun Bennett	8974b2b395	Fix Carl Error	2016-10-13 04:07:05 -04:00
Shaun Bennett	bb32a06caf	Add Halloween Words	2016-10-12 23:30:52 -04:00
AlexTheCoder	7ec530a8c7	Fix lobby protection on build server, make map locks persistent, implement larger parsing size, make map lock command require op, prevent raining on build server, and make block hunt actually work with any map with required information regardless of order	2016-10-12 23:01:25 -04:00
Shaun Bennett	62d08e74e3	Remove voting code	2016-10-12 22:54:14 -04:00
Alexander Meech	87122e9904	Update youtube link	2016-10-12 22:54:14 -04:00
Alexander Meech	63c14a99ab	Update playwire displayed cooldown time	2016-10-12 22:54:14 -04:00
AlexTheCoder	6d36034115	Remove voting from carl the creeper, move spin tokens to playwire, unify link messages in all carl the creeper links	2016-10-12 22:54:14 -04:00
xADudex	311751cc39	Pumpkin's Revenge (#237) ... * Initial Commit * Update * Bunch of new stuff * Fixed fletcher arrow typo * Added reward pet, fixed typo, tweaked lose cinematic * Lots of tweaks and fixes with QA * Cleaning up a little code * Removed debug message on prince death * Added nighttime to halloween game lobby maps * Tweaked spawn rates and mob caps * Typo * Tweaked texts, cleaned import and cleared all mobs from boss cinematic * Fixed creepers not getting properly removed during boss cinematic * Reward typo * Fixed rare NPE * Typos * Tweaked mini zombie * Typo * Prevent zombie from spawning minis after being removed * Tweaked wave announcements + formated WaveVictory * Changed color of prince tag + formated ZombieSpawner * Fixed (another) rare NPE * Tweaked boss wave cinematic	2016-10-12 22:40:05 -04:00
AlexTheCoder	66dfe06b34	Clean up bucket fixing in clans	2016-10-12 21:50:18 -04:00
AlexTheCoder	2ac7f72327	Fix clans water exploit and ruined pickaxe duping exploit	2016-10-12 21:50:18 -04:00
Keir Nellyer	03e219f552	Add header to /reportstats and further improvements	2016-10-13 02:15:49 +01:00
Keir Nellyer	2e16eef5d9	Make /reportstats work with offline players and other small improvements	2016-10-13 01:18:23 +01:00
Keir Nellyer	76539648da	PC-1109 Fix /reportstats if player doesn't have at least 5 reports in ... each role	2016-10-12 17:36:54 +01:00
Keir Nellyer	ca09253292	PC-954 Tweak error message when no reports are available for handling ... Also close gui after clicking item and remove old un-necessary code.	2016-10-12 17:30:19 +01:00
Keir Nellyer	f42678a9ef	PC-954 Fix incorrectly sized inventory	2016-10-12 17:23:42 +01:00
Keir Nellyer	eb6d893414	PC-954 Allow staff to select what kind of report they'd like to handle	2016-10-12 17:15:48 +01:00
Keir Nellyer	15cf3a2bee	PC-1019 Give indication of when a report is forwarded to a team	2016-10-11 14:30:43 +01:00
Keir Nellyer	3dc9038bae	Fix incorrect column name in statement	2016-10-11 01:22:43 +01:00
Keir Nellyer	1f47d51935	Merge branches 'develop' and 'update/report-non-sequential' of github.com:Mineplex-LLC/Minecraft-PC into update/report-non-sequential ... # Conflicts: # Plugins/Mineplex.ReportSite/view.php	2016-10-11 00:55:26 +01:00
Keir Nellyer	f39ee7c247	Update chatsnap site to handle new token system	2016-10-11 00:45:33 +01:00
Keir Nellyer	5c5c159ee3	Add support for assigning tokens to snapshots (excluding actual ... generation part)	2016-10-11 00:22:29 +01:00
Sam	2b2bb817be	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm	2016-10-09 12:24:51 +01:00
Sam	2b124cb16c	I have really lost track on what I'm doing...	2016-10-09 12:24:49 +01:00
Shaun Bennett	0dca2e9d46	Fix BabyFirework NPE, TreasureLocation argument exception, Add TimingsFix to Hub	2016-10-08 19:42:29 -04:00
Sam	28a2a8c098	More from GI testing	2016-10-08 11:14:55 +01:00
Keir Nellyer	e4d3621512	Create SnapshotMetadata class in prepartion of snapshot tokens	2016-10-07 18:25:20 +01:00
LCastr0	8ab61b2b06	Public: ... - Added Chicken Mount - Added Turkey Morph Internal: - Changed the Morph system (Using UtilMorph)	2016-10-06 14:19:44 -03:00
LCastr0	3707de6742	Made Haunted Chests buyable	2016-10-06 12:43:19 -04:00
LCastr0	9f66bf438c	Fixes for the CustomerSupport server	2016-10-06 12:43:19 -04:00
Sam	e5e953a8ab	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm	2016-10-06 15:03:53 +01:00
Sam	bb9ca490b1	GI changes	2016-10-06 15:03:51 +01:00
Kenny	0f44483f07	Merge pull request #233 from Mineplex-LLC/project-cosmetics ... Project cosmetics	2016-10-06 04:31:56 -04:00
LCastr0	d6e9283cce	Changed world time so its not too dark	2016-10-06 05:26:58 -03:00
Shaun Bennett	a6727bf104	Halloween Fixes/Prep	2016-10-05 22:57:44 -04:00
LCastr0	c0754a23c8	Fix Slime Soccer, Add /unlockcosmetics and /lockcosmetics for other players (#232) ... * Added option to run /unlockcosmetics and /lockcosmetics for other players * Fixed Slimeball Soccer field location	2016-10-05 22:08:27 -04:00
cnr	bd90c465dd	Update PPC button to reflect new claiming style	2016-10-05 22:03:04 -04:00
cnr	20c37bf3d6	Unlock PPC cosmetics on the first of the month ... The relevant cosmetic will be revoked if the player's subscription lapses during that month	2016-10-05 22:03:04 -04:00
cnr	8793be56ed	Add 'come back on $DATE' message to carl for Power Play	2016-10-05 22:03:04 -04:00
LCastr0	a1ec102419	Fixed Slimeball Soccer field location	2016-10-05 21:54:17 -03:00
LCastr0	5939c304a5	Added option to run /unlockcosmetics and /lockcosmetics for other players	2016-10-05 20:13:30 -03:00
LCastr0	876d35b482	Cosmetics Bug Fixes (#229) ... * Fixes for the Block Morph * Fixes for the Witch Morph * Fixed memory leak on ArrowTrailHalloween, thanks to Sam, again	2016-10-05 17:16:25 -04:00
Alexander Meech	dae3c60247	Make support text for power play claims more accurate (#228) ... * Make support text for power play claims more... ...accurate * Reverse text	2016-10-05 17:13:32 -04:00
Shaun Bennett	25000f7367	Merge pull request #226 from Mineplex-LLC/bugfix/report-hotfix ... Report feature hotfixes	2016-10-05 17:13:08 -04:00
Lucas de Castro Queiroz	49510e6f9f	Fixed memory leak on ArrowTrailHalloween, thanks to Sam, again	2016-10-05 16:21:40 -03:00
LCastr0	314c88333a	Merge pull request #230 from Mineplex-LLC/develop ... Merges develop into project-cosmetics	2016-10-05 16:14:51 -03:00
Keir Nellyer	643656de0d	Merge remote-tracking branch 'origin/bugfix/report-hotfix' into bugfix/report-hotfix	2016-10-05 15:32:05 +01:00
Keir Nellyer	e6bb0c2d78	Improve handling of circumstances whereby a report exists but no ... corresponding chatsnap log on chatsnap site	2016-10-05 15:31:46 +01:00
LCastr0	8da5813f29	Add Halloween Cosmetics (#227) ... * Internal: Changed imports from java.awt.Color to org.bukkit.Color External: Added Double Jump Halloween Added Arrow Trail Halloween Added Pumpkin Hat * Internal: Fixed Arrow Trail Halloween Added new methods to ParticleData Renamed playerNPC to _playerNPC (WinEffectLavaTrap) Removed unecessary method (WinEffectManager) Added a command to test win rooms properly Fixed Squid Morph not showing name unless players hovered over it Created a Manager for the Morphs so we avoid using deprecated methods External: Added Halloween Win Room Added Grim Reaper Morph Added Headless Horseman Morph Added Nightmare Steed * Internal: Renamed RewardType enums to have upper case External: Added Halloween Death Effect Added Haunted Chest Added Baby Zombie Jockey Pet Changed the names of the items Added Grim Reaper pet * Slack integration to test stuff (Will not be in the code in the last commit) * Fixed Grim Reaper Hoe not being removed after the morph is disabled * Details for the Haunted Chest * Details for all the items (lores, icons, texts, effects, etc) Removed Headless Horseman Morph * Fixes for lores and names Support server stuff * Fixes for the Lock and Unlock cosmetics commands * Fixes for the Grim Reaper Morph * Fixes for the Grim Reaper Morph Removed debug messages * Fixed a memory leak. Thanks to Sam * Fix imports * Removed unused code Added javadocs to UtilTextBottom#displayProgress() Added javadocs to UtilAlg#getRandomLocation() * Removed Death Effect Increased Arrow Trail particles Increased Double Jump particles	2016-10-05 10:27:45 -04:00
Keir Nellyer	a4e1fb3c8d	Prepare database for snapshot tokens	2016-10-05 14:31:01 +01:00
Keir Nellyer	46db80a056	Always check game object is not null before attempting to access it (#225)	2016-10-04 15:32:04 -04:00
Sam Sun	5d8c079be6	Understand the squid disguise code (#217)	2016-10-04 15:28:12 -04:00
Keir Nellyer	22707d6d2e	Only execute if throwable is null	2016-10-04 16:34:19 +01:00
Keir Nellyer	6709001c89	Remove double handle check, pointless and can potentially cause issues	2016-10-04 16:25:51 +01:00
Keir Nellyer	afee339e16	Any report with a handler and no conclusion is an active report, ... therefore we don't need to check if the report is active	2016-10-04 16:20:11 +01:00
Keir Nellyer	c462282632	Merge branches 'bugfix/report-hotfix' and 'develop' of github.com:Mineplex-LLC/Minecraft-PC into bugfix/report-hotfix	2016-10-04 10:40:43 +01:00
LCastr0	515fd9fb70	Merge branch 'project-cosmetics' of github.com:Mineplex-LLC/Minecraft-PC into project-cosmetics	2016-10-03 22:44:24 -03:00
LCastr0	fb29947705	Fixes for the Witch Morph	2016-10-03 22:43:49 -03:00
Sam	53c6c07208	Lazer to Laser	2016-10-03 23:17:14 +01:00
Sam	e48dfbefe4	Even more fixes!	2016-10-03 21:20:15 +01:00
Sam	4e9cf4dbb4	More fixes	2016-10-03 19:45:15 +01:00
Keir Nellyer	a923f80438	Accidentally missed out inserting reportTeams' "enums"	2016-10-03 19:24:01 +01:00
Keir Nellyer	17b04a6a84	PC-1021 Prevent 'null' player being punished	2016-10-03 10:00:04 +01:00
LCastr0	0181e21853	Fixes for the Block Morph	2016-10-01 23:54:35 -03:00
Sam	668abad83a	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm	2016-10-01 15:49:10 +01:00
Sam	4bfc632fd5	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm	2016-10-01 15:45:05 +01:00
cnr	e867a09b5c	Update support server to accommodate power play changes	2016-09-30 21:52:07 -07:00
cnr	6e2512e0cf	Merge branch 'project-cosmetics' into develop	2016-09-30 21:47:08 -07:00
cnr	d00c887a84	Hide Power Play Metal Man reward for now	2016-09-30 21:00:02 -07:00
LCastr0	76fc4d6ac4	Merging	2016-10-01 00:46:36 -03:00
LCastr0	0797f90d3b	Fixes for the Witch Morph	2016-10-01 00:42:40 -03:00
cnr	25701dae7d	Enable Metal Man morph in the GUI	2016-09-30 20:25:57 -07:00
cnr	4b1b57d452	Add first-time signup Metal Man reward	2016-09-30 20:17:07 -07:00
cnr	64802769d6	Implement Power Play reward month calculations	2016-09-30 11:13:29 -07:00
Keir Nellyer	7926d88d5b	Update report result reason length as future version of Minecraft ... will be increasing message lengths	2016-09-30 17:18:47 +01:00
cnr	4fe5eb8b45	Stub out new Power Play rewards calculations	2016-09-30 00:10:42 -07:00
TadahTech	2a81f2b317	Fix UI for PlayWire changes ... Fix memory leak in Menu (cherry picked from commit 770c899)	2016-09-30 00:56:40 -04:00
Sam	36c26c0b2c	Fix MineStrike Issues (#222) ... * Check if the costume is null before doing anything. * Disable entity specing	2016-09-29 23:37:41 -04:00
Sam Sun	81070eac62	Plug up memory leaks in IdleManager (#224) ... Somehow, IdleManager was keeping Player references loaded despite having removed them on PlayerQuitEvent. This may be because of the runnable scheduled for 5 ticks after a teleport which would insert players after they quit. In any case, this was keeping entire worlds loaded in UHC. Pretty bad. Moral of the story? Use UUIDs!	2016-09-29 23:29:53 -04:00
Alexander Meech	0caa84f703	Optimize Clan Banners (#221) ... * Optimize BannerRepository.java * Optimize banner loading in BannerManager.java * Optimize banner loading in ClansManager.java * Remove unnecessary runAsync * Optimize Siege Weapon storage * Forgot a ! in my while loop	2016-09-29 23:04:19 -04:00
Timothy Andis	7d4c817856	Game Lobby/Playwire/Command Fixes (#223) ... * Tweak team locations to accommodate MPS' Disable certain commands from being used. * Change PlayWire things. * Update MPS locations. * Update. * Remove debug * Remove debug. Ty Sam	2016-09-29 23:00:26 -04:00
Keir Nellyer	2a2cd5024a	Change message displayed when an error occurs	2016-09-30 01:56:49 +01:00
Keir Nellyer	ee532c1b8e	Improve exception handling	2016-09-30 01:44:49 +01:00
Keir Nellyer	de72f119fe	Don't allow players to handle new accounts in exceptional cases	2016-09-30 01:28:07 +01:00
Keir Nellyer	4818936943	Prevent double exception logging	2016-09-30 01:16:30 +01:00
Keir Nellyer	45eeac8cee	Prevent double exception printing when an error occurs whilst saving ... a report	2016-09-30 01:05:50 +01:00
Keir Nellyer	26d6540b2f	Fix closing reason being truncated with long closing messages	2016-09-30 00:36:52 +01:00
Keir Nellyer	dd5a284d55	Print stacktrace when unable to fetch report player is handling	2016-09-30 00:29:57 +01:00
Sam	22f8a1496a	Guardian fixes	2016-09-29 22:44:03 +01:00
Shaun Bennett	9d6985ddcd	Fix MPS zip file name, null amp stand	2016-09-29 09:10:25 -04:00
Shaun Bennett	b3d8c72953	Add Game Lobby world settings (#220)	2016-09-29 00:22:42 -04:00
Shaun Bennett	7ff6e33941	LegacyGameLobbyManager bug fixes	2016-09-28 23:05:02 -04:00
Timothy Andis	620e219b14	Change MPS world zip (#219) ... * Change MPS map name	2016-09-28 21:32:51 -04:00
Shaun Bennett	b27e1ffbd1	Reward shards on thank claim instead of when being thanked	2016-09-28 21:28:07 -04:00
Shaun Bennett	3ede0e5644	Merge Report System v2 (#216) ... Report system (v2)	2016-09-28 17:39:26 -04:00
Timothy Andis	3d7647b26b	Game Lobby Update (#215) ... * Game Lobby update. Phase 1. * Correctly apply kit data to players who use the next best game feature. * I can do integer comparisons, I promise. * So much stuff, all minor. * Suck it Carl. * Fix Party bug. Update LobbyManager * Allow QA to test KitProgression @shaun cherry pick this plz. * Proper generation check (testing) Remove debugging from NextBestGame * Correct Amplifier looking direction. Fix Death tag hard coded kits Misc podium work. * ClansHub and Tweaks to the lobby manager * WA Tweak.	2016-09-28 10:17:05 -04:00
Keir Nellyer	31dcc87385	Slight code cleanup	2016-09-28 10:51:55 +01:00
Keir Nellyer	f8ad302d80	Simplify handling of optional reason	2016-09-28 10:41:56 +01:00
Keir Nellyer	6f77c05f1e	Players should still be report banned if they reach abuse threshold ... even if reportCloser is not present Also alert players of report closing regardless of whether reportCloser is present	2016-09-28 10:40:39 +01:00
Keir Nellyer	84e1a7291b	Report result gui should handle messaging of player invoking team ... assignment	2016-09-28 10:35:49 +01:00
Keir Nellyer	e54f70d194	JavaDocs for abortReport and assignTeam methods	2016-09-28 10:31:54 +01:00
Sam	c4e36b2269	Moppletop's September Bug Sprint (#214) ... * Earth Cost issue * Instances of "Tip" to "Thank" * PC-930 Fix an infinite loop when the game ends. * PC-959 Fixes an issue where people could spam drop grenades. * PC-668 Cosmetic Set bonuses no longer carry into MS games * Changes metal's passive Metal's passive is now that it gains 0.5 hearts per armor piece. This avoids the problem of being unkillable	2016-09-27 21:11:49 -04:00
Sam	78e6f3bf71	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm	2016-09-27 19:02:56 +01:00
Sam	68c62acb00	Guardian changes	2016-09-27 19:02:54 +01:00
Keir Nellyer	1543b539ba	Refactor unbox optional collection to utility class	2016-09-26 11:01:27 +01:00
Keir Nellyer	f42681c390	Remove old todo	2016-09-26 10:33:46 +01:00
Keir Nellyer	f63561b05e	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-09-26 10:19:13 +01:00
Keir Nellyer	125428d09e	Make getReport return Optional as it is quite likely that this will ... return null	2016-09-26 10:02:30 +01:00
Sam	96e1e944e1	Addition of the GWEN kit and a billion other things	2016-09-25 22:32:23 +01:00
samczsun	b35d933e56	Fix PlayWire error, handle future errors properly	2016-09-25 16:28:02 -04:00
samczsun	3f3241bec9	Reformat developer servers	2016-09-25 16:28:01 -04:00
Keir Nellyer	32385d4064	Update error message for non-titans, due to change made in previous commit	2016-09-25 02:28:42 +01:00
Keir Nellyer	a413df9f52	Limit feature to titans for damage limitation	2016-09-25 02:01:10 +01:00
Keir Nellyer	42ea7f85af	Remove un-required tab changes	2016-09-25 01:36:23 +01:00
Keir Nellyer	17b98888fc	Update database upgrade script for latest changes	2016-09-25 01:29:18 +01:00
Sam	f8a135cf50	Full system conversion	2016-09-25 00:56:06 +01:00
Sam	315a50aa16	Whoops	2016-09-24 21:34:45 +01:00
Sam	baafa62713	Just more converting	2016-09-24 21:09:25 +01:00
LCastr0	1475243d8a	Added MetalMan to the GUI for testings	2016-09-23 23:14:10 -03:00
Sam	f5a7f35d94	More kits	2016-09-23 18:58:14 +01:00
samczsun	187c6ec67c	Remove debug messages	2016-09-22 21:25:40 -04:00
samczsun	548e23a212	Fix fetching timestamp from wrong column	2016-09-22 21:21:16 -04:00
Sam	f6acedba5f	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm	2016-09-22 17:11:25 +01:00
Sam	2ba2b21577	Progress on converting SSM to a new cleaner system	2016-09-22 17:11:21 +01:00
Keir Nellyer	b24429783b	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/bonuses/BonusManager.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java	2016-09-22 16:28:16 +01:00
Keir Nellyer	df17177892	PC-1003 Forgot to commit some changes from last commit	2016-09-22 16:10:31 +01:00
Keir Nellyer	ea74826d0c	PC-1003 Prevent rogue Report objects being cached and cause handler message spam	2016-09-22 16:01:11 +01:00
Keir Nellyer	6494720d2e	PC-998 Limit chat messages to 3 minutes	2016-09-22 15:48:01 +01:00
Shaun Bennett	79e6903c8b	Enable Speed and Glide punishments, remove hack from ban reason	2016-09-22 08:44:58 -04:00
Shaun Bennett	7f447f8084	Setup compass for game changes	2016-09-22 00:33:48 -04:00
Shaun Bennett	a3d210871d	Add ignored checks to GWEN (#211)	2016-09-21 23:21:02 -04:00
Shaun Bennett	e15804fc15	Prevent players from joining 1.9+ games with 1.8 clients (#212)	2016-09-21 23:19:55 -04:00
Shaun Bennett	9be26a92d1	Remove NCP	2016-09-21 22:21:49 -04:00
Sam	ac967f6b18	OITQP no longer in Beta (#210) ... * Convert OITQP into a module based system. * More magic modules * Achievements and Stats * Achievement menu update * Removed some Util methods I added that were never used. * Missed a few things * To Alex, Love Sam * Gem and achievement kits	2016-09-21 22:05:21 -04:00
Sarah	c1c46aceb8	Skyfall Game(#208) ... * basic prototype of the game Skyfall * new crumble mechanic * Developing basic game with basic mechanics and basic kits. * Fix merge issues * Add Supply Grop and Deathmatch and change map crumbling * Make cosmetical changes for QA and add Stat Trackers and Achievements * Add version requirement * Change scoreboard layout * Dont crumble the first island, but the islands over the spawn points * Remove Surefoot, fix TNT, remove boats and remove elytra on contact with water/lava * Unused imports * Fix kit description, modify island crumbling and add ring damage * Revert to normal crumble values * Add Javadoc * Remove more unused imports * Check for material data on ring generation * Add Block effect for Booster Ring recharge * Unused imports... * Add Elytra removal message and countdown * "Fix" food issues and some other minor things * Add chest refill to scoreboard from beginning * Fix supply drop * Unused imports..... * Re-enable Anti Cheat * Add java doc, remove system messages and add exeptions * The end of the great label debate * Fix method naming conventions * Remove more labels * Disable Booster kit	2016-09-21 21:57:38 -04:00
samczsun	7252906d30	Better synchronization of Managers	2016-09-21 21:37:57 -04:00
samczsun	92a0d606d4	Fix timings	2016-09-21 21:37:57 -04:00
samczsun	ec4add259d	Teleport players back to center of arcade lobby	2016-09-21 21:37:57 -04:00
Timothy Andis	bf61296948	PlayWire Ad integration (#207) ... * PlayWire integration. * Tweak PlayWire display. Update the GUI command. Temp set cooldown to 10 seconds for testing *WILL BE REMOVED* * PlayWire stuff. * PlayWire streaks and tweaks.	2016-09-21 21:24:58 -04:00
Keir Nellyer	1eecfbafee	Small code improvement	2016-09-21 16:33:05 +01:00
Keir Nellyer	c6eb23812f	PC-1001 Do not show private messages between users unless reporter is ... involved	2016-09-21 13:21:23 +01:00
Keir Nellyer	09287ddefc	PC-1002 Automatic reports bans show the id of the report which caused ... the ban	2016-09-21 12:22:55 +01:00
Keir Nellyer	e73b06b5ab	PC-998 Change cache time for chat messages to 5 minutes	2016-09-21 11:46:03 +01:00
Sam	209ea32ef9	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm	2016-09-20 09:18:20 +01:00
Keir Nellyer	32563904fa	PC-997 Show total counts when showing report statistics	2016-09-19 10:38:03 +01:00
LCastr0	f0c7b1d6aa	Whoops, forgot this	2016-09-18 16:18:33 -03:00
LCastr0	537dc28daa	Used proper method to add specific prizes	2016-09-18 16:16:57 -03:00
LCastr0	ae6868b76a	Added Witch Morph ... Added Metal Man morph	2016-09-16 20:46:52 -03:00
Keir Nellyer	2cdab061b6	PC-886 Move report bans over to punishment gui	2016-09-16 17:40:14 +01:00
Keir Nellyer	ebe212c8ff	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-09-15 17:30:27 +01:00
William Burns	199d6cba3e	Add a period to the anticheat ban message. (#206)	2016-09-14 20:50:08 -04:00
Alexander Meech	93c227a22d	Change Mavs Basketball to 5 Minutes (#201) ... * Update ScoringManager.java * Update Basketball.java	2016-09-14 20:49:24 -04:00
Keir Nellyer	da5a8d5b46	PC-966 Reports assigned to RC now have a higher priority instead of no decay effect	2016-09-14 21:51:06 +01:00
Keir Nellyer	a64ba4db2a	Include sender as being a recipient for testing reasons when checking if player can create a chat abuse report	2016-09-14 21:44:57 +01:00
Sam	1458cb84b9	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm	2016-09-14 20:14:05 +01:00
Keir Nellyer	9af606ae20	Ensure suspect messages actually involved the reporter	2016-09-14 14:53:39 +01:00
Keir Nellyer	efe532e8a6	Clean-up createReport method	2016-09-14 14:37:44 +01:00
Keir Nellyer	464099dc87	Correctly handle weird cases whereby an account may be involved in ... multiple open reports of the same category	2016-09-14 14:26:12 +01:00
Keir Nellyer	2be0522599	Attach JavaDocs and small method renames	2016-09-14 14:14:11 +01:00
Keir Nellyer	425d814ac4	PC-966 When selecting a new report for a user to handle, always ... prioritise reports assigned to teams that the user is a member of	2016-09-14 12:14:14 +01:00
Keir Nellyer	5ad4f2831d	PC-966 Only allow members of team to handle report if team assigned ... to report	2016-09-14 12:13:41 +01:00
Keir Nellyer	20c4488c5f	PC-966 Add gui button for passing report to RC team ... Misc. other changes	2016-09-13 18:28:09 +01:00
Keir Nellyer	d115097eb9	PC-966 Implement support for teams to be assigned to a report	2016-09-13 17:01:47 +01:00
Keir Nellyer	f1d1585585	PC-966 Implement method to get members of a team	2016-09-12 18:13:10 +01:00
Keir Nellyer	ee6e8a9656	PC-966 Implement report user cache	2016-09-12 18:07:01 +01:00
Keir Nellyer	a39d894d85	PC-966 Add support for saving report teams to database	2016-09-12 17:54:00 +01:00
Keir Nellyer	fae7e93f1a	PC-966 Add support for loading report teams from database	2016-09-12 17:08:11 +01:00
Keir Nellyer	a5e5be4329	PC-951 Fix handler message task not being cancelled when closing report	2016-09-12 11:56:21 +01:00
Keir Nellyer	5e5cb3284a	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-09-12 10:11:31 +01:00
cnr	6de3640243	Disable immediate ban actions for Glide and Speed	2016-09-11 17:54:50 -05:00
LCastr0	36ce7ef222	Fixes for the Omega chest giving duplicated items (#202)	2016-09-10 23:05:29 -04:00
Connor James	454e1c8c11	AntiCheat 1.2 (#200) ... * Implement Anticheat 1.2 hooks * Add default check thresholds for unknown check types * Add violation level support for new checks * Add ban waves for KillAura type D * Amend DELETE_PENDING now that it's not hardcoded * Add instant bans for high VL Glide/Speed * Don't specify hack type in banwave ban message	2016-09-10 23:01:13 -04:00
Sam	38473dcffd	Fix metal taking too little damage with full iron (#203)	2016-09-10 22:47:52 -04:00
LCastr0	f6b06c63ac	Fixes for the Omega chest giving duplicated items	2016-09-10 00:43:08 -03:00
AlexTheCoder	23a330d449	Add monster maze and bawk bawk battles to mixed arcade display in compass and set beta button to new oitq payload gamemode	2016-09-08 03:50:45 -04:00
Shaun Bennett	e12ed35da1	Fix NPE and kit upgrades issue	2016-09-07 23:13:28 -04:00
Shaun Bennett	493086fcf3	Merge pull request #198 from Mineplex-LLC/update/developer-servers ... Update/developer servers	2016-09-07 21:21:35 -04:00
Shaun Bennett	9318ba4de2	Merge branch 'develop' into bugfix/samczsun ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java	2016-09-07 20:12:57 -04:00
Shaun Bennett	7fbd6087eb	Merge pull request #187 from Mineplex-LLC/update/oitq ... Skywars Update Patch	2016-09-07 20:08:08 -04:00
samczsun	fba449ca03	Don't rearrange GUI if all dev servers are ingame	2016-09-07 19:17:47 -04:00
samczsun	a8adf23c15	Allow dev servers	2016-09-07 11:45:42 -04:00
Keir Nellyer	7b6f0ae221	PC-953 Make report ids in /reportstats command clickable	2016-09-07 16:40:05 +01:00
Sam	bed563876a	Add a comment to explain usage of KitUpgradeShop	2016-09-07 14:18:07 +01:00
Shaun Bennett	ba322f0df1	Merge pull request #195 from Mineplex-LLC/update/emergency-support-fixes ... Update/emergency support fixes	2016-09-07 07:57:53 -04:00
Shaun Bennett	b1b9900c9e	Add offline stat checking	2016-09-07 07:47:19 -04:00
Keir Nellyer	e2840f36b5	PC-958 Don't allow chat abuse reports of players who haven't spoken ... in chat	2016-09-07 11:28:20 +01:00
Keir Nellyer	640a8d3516	PC-958 Allow reporting of offline players	2016-09-07 09:50:10 +01:00
AlexTheCoder	225583a13d	Remove join restrictions on beta servers from unranked players	2016-09-06 21:36:30 -04:00
Sam	5bf35d49db	Message inconsistancy	2016-09-06 21:38:43 +01:00
Sam	be268991b0	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-09-06 21:37:33 +01:00
Sam	7a5a6c3d00	Fix duplicate message	2016-09-06 19:55:31 +01:00
Keir Nellyer	353cdb2413	Merge remote-tracking branch 'origin/feature/report-v2' into feature/report-v2	2016-09-06 17:28:03 +01:00
Keir Nellyer	b1b275fc67	PC-958 Prepare codebase for reporting of offline players	2016-09-06 17:27:48 +01:00
Keir Nellyer	94b5a6e760	PC-952 Add /reportinfo	2016-09-06 16:43:51 +01:00
AlexTheCoder	64db10c91a	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/emergency-support-fixes	2016-09-05 20:27:09 -04:00
AlexTheCoder	a124aa3d85	Fix items added via support server not showing up in customer service logs	2016-09-05 20:25:02 -04:00
samczsun	444fe5d151	Remove hacky reflection method to get server name	2016-09-05 18:37:17 -04:00
samczsun	08090f5e06	PC-818 ... Seismic Charges can no longer remove barrier blocks	2016-09-05 18:25:16 -04:00
samczsun	11c97691a9	PC-937 ... This commit allows Arcade to consider spectating and vanished players when deciding to autostart a game	2016-09-05 18:25:16 -04:00
samczsun	6490ab3786	Don't hide banwave animation from staff	2016-09-05 18:25:16 -04:00
samczsun	3aaa9b2514	Sort tab list properly	2016-09-05 18:25:16 -04:00
samczsun	6b1d551a37	Remove please investigate	2016-09-05 18:25:16 -04:00
samczsun	0678f7287d	No fake levels for those who don't want it	2016-09-05 18:25:16 -04:00
samczsun	d09b27bfe1	Fix disguises prevent join, join rank check bugs	2016-09-05 18:25:16 -04:00
samczsun	c18d771715	Unbreak Squid in SSM	2016-09-05 18:25:16 -04:00
Keir Nellyer	e2455bbc9d	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-09-05 20:04:12 +01:00
cnr	ccd81c1820	Fix BlockIgniteEvent NPE in MavericksManager	2016-09-05 13:42:24 -05:00
Sam	12130d41e6	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-09-05 17:59:51 +01:00
Sam	8ebaad4736	Beta ready commit	2016-09-05 17:59:49 +01:00
Keir Nellyer	acd63c90a1	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/preferences/PreferencesRepository.java # Plugins/Mineplex.Core/src/mineplex/core/preferences/UserPreferences.java # Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/ExclusivePreferencesPage.java # Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java	2016-09-05 14:26:06 +01:00
AlexTheCoder	a7b0c9de05	Fix unnecessary calls to mysql/mssql databases in support server	2016-09-05 04:46:13 -05:00
AlexTheCoder	504432d87b	Fix titan command not being registered	2016-09-05 04:46:01 -05:00
AlexTheCoder	9ce49b10c0	Add a command to allow support agents to check for ownership of internal sales packages	2016-09-05 04:45:51 -05:00
AlexTheCoder	ffb6073532	Fix unnecessary calls to mysql/mssql databases in support server	2016-09-04 23:44:54 -04:00
AlexTheCoder	b5771550ad	Fix titan command not being registered	2016-09-04 23:28:25 -04:00
AlexTheCoder	866c3ee7c9	Add a command to allow support agents to check for ownership of internal sales packages	2016-09-04 22:11:05 -04:00
AlexTheCoder	29bb2a3895	Add an enjin chargeback command and fix punishing in support servers	2016-09-04 00:39:44 -05:00
AlexTheCoder	b3478d70e8	Update support packages	2016-09-04 00:39:44 -05:00
AlexTheCoder	5b80f3b6ac	Fix clan banner being removed from support server information	2016-09-04 00:39:44 -05:00
AlexTheCoder	e2d3763ec0	Add an enjin chargeback command and fix punishing in support servers	2016-09-03 15:42:32 -04:00
Sam	34ee62bdc3	Fix NPE	2016-09-03 20:32:10 +01:00
AlexTheCoder	3088d79cf5	Update support packages	2016-09-03 15:16:59 -04:00
Sam	b3212fc003	Particle changes	2016-09-03 20:13:08 +01:00
Sam	4b1c93150b	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-09-03 20:12:39 +01:00
Sam	8d5d0c6272	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-09-03 18:29:37 +01:00
Sam	c3c61b8189	Merge fix	2016-09-03 18:29:18 +01:00
Sam	fc0217f1fd	More magic OITQ	2016-09-03 18:25:17 +01:00
Sam	e0424c78b2	Added spawn barrier	2016-09-03 18:24:56 +01:00
Sam	7eb148cc59	Ultimate colour change	2016-09-03 18:24:44 +01:00
AlexTheCoder	09a535466a	Fix clan banner being removed from support server information	2016-09-03 11:37:45 -04:00
Shaun Bennett	e57d009341	Remove unused import!	2016-09-03 01:11:50 -04:00
Shaun Bennett	586a768c7b	Fix enjin listener else bug	2016-09-03 00:59:15 -04: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	2bce540c5d	Disable Antihack in the staff server	2016-09-02 02:51:34 -05:00
cnr	374142e63f	Merge branch 'update/the-smoothest-release-we-will-never-have' into develop	2016-09-02 00:42:51 -05:00
TadahTech	e2f974e1e6	Add sounds and messages to basketball.	2016-09-02 00:40:23 -05:00
cnr	ae0d30558c	Merge branch 'update/the-smoothest-release-we-will-never-have' into develop	2016-09-02 00:12:12 -05:00
AlexTheCoder	9abbe1bfb9	Update support whitelist and op list	2016-09-02 00:10:36 -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
TadahTech	d8486abbfd	Fix minor best game issues.	2016-09-01 20:05:53 -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	a6360249b7	Use party if a player has it.	2016-09-01 08:47:43 -05:00
TadahTech	6f3d7dcd29	Merge branches 'develop' and 'update/the-smoothest-release-we-will-never-have' of https://github.com/Mineplex-LLC/Minecraft-PC into update/the-smoothest-release-we-will-never-have	2016-09-01 08:45:43 -05:00
TadahTech	41936e0efc	Remove users from the map.	2016-09-01 08:31:16 -05:00
TadahTech	fdc54e1dd1	Fix BestGame not cancelling for parties.	2016-09-01 08:29:51 -05:00
cnr	05f640266f	Fix basketball scoring infinite loop	2016-09-01 06:36:47 -05:00
TadahTech	107a296239	Fuck you intellij	2016-09-01 05:49:59 -05:00
TadahTech	53846acbf6	Dont let Minestrike use NextBestGame	2016-09-01 05:39:47 -05:00
TadahTech	9fcee07427	Fix people getting stuck in chests.	2016-09-01 05:34:37 -05:00
TadahTech	68743cf73c	Mavs changes.	2016-09-01 03:24:38 -05:00
TadahTech	46053e82e1	Mavs changes.	2016-09-01 02:35:31 -05:00
TadahTech	c0c75ea375	Allow team selecting to work on the mavs hub.	2016-08-31 23:46:29 -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
Sam	57292414c6	Gems for winners	2016-08-31 22:55:13 +01: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
Sam	0b7fdc01eb	Initial balence change	2016-08-31 16:30:50 +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
Sam	6a139d5c55	Tiny code improvement	2016-08-31 13:28:48 +01:00
Sam	7599630328	Pyromancer Ultimate name change	2016-08-31 13:27:07 +01:00
Sam	8d222aafec	Fix increasing loop in Overtime	2016-08-31 13:26:54 +01:00
Sam	1bfebf358f	Add Overtime	2016-08-31 12:07:50 +01:00
Sam	47df09b770	Handle null sound	2016-08-31 12:07:35 +01:00
Sam	b1faecea49	Kit Fire incorrect values	2016-08-31 12:07:25 +01:00
Keir Nellyer	41bae9d5f8	Add bottom margin so that big chat logs do not collide with footer	2016-08-31 10:45:38 +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	8397f53d39	Remove unneeded teleportation in clans hubs	2016-08-30 03:27:11 -04: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
AlexTheCoder	5108a6f08d	Convert to npc for entering mavericks lobby	2016-08-30 01:02:26 -04:00
AlexTheCoder	d7d8ef021e	Disable using cosmetics inside mavericks hub	2016-08-30 00:47:48 -04:00
TadahTech	94bfc9aa15	Use proper server group / remove testing.	2016-08-29 22:33:01 -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
Alexander Meech	464c9fcdc3	Update steal chance	2016-08-29 20:37:02 -04: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	7a3ce9813c	Payload (OITQ)	2016-08-29 23:08:04 +01:00
Sam	9454e1f409	Skywars and Kit Progression	2016-08-29 23:07:48 +01:00
Keir Nellyer	b30f395d88	Update chat snap site for backend changes	2016-08-29 12:21:57 +01:00
Sam	ec8ed76270	Convert old perks to new perks	2016-08-28 09:06:07 +01:00
Sam	88f4813534	Perk related issue	2016-08-28 09:05:49 +01:00
Sam	ccd855da84	Name the ultimates	2016-08-28 09:05:31 +01:00
Sam	54e8f8e5e8	Code improvement and cleanup	2016-08-28 09:05:11 +01:00
Sam	34c6e1cab7	Add the base of kit progression	2016-08-28 09:04:46 +01:00
Sam	d81ed348f3	Remove used import	2016-08-28 09:04:09 +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
Sam	4bc49e6133	Solve merge conflicts	2016-08-26 21:21:18 +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
Sam	c2344a0494	Magnet not giving the kill	2016-08-25 20:26:18 +01:00
Sam	265ab620e4	Fix Magnet affecting teams members	2016-08-25 20:10:13 +01:00
Sam	9c5ab7c67e	Remove Fire Aspect 2	2016-08-25 20:09:50 +01:00
TadahTech	2a861460c6	Remove unused variables	2016-08-25 05:12:29 -05:00
TadahTech	b3b8f44b3a	Fix perks not being registered.	2016-08-25 05:11:52 -05:00
TadahTech	f976f56fb7	Merge branches 'develop' and 'feature/lobby-update' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/lobby-update	2016-08-25 04:26:21 -05:00
TadahTech	ebfd00ebc3	Fix centering of the Preference Menu	2016-08-25 04:04:53 -05:00
TadahTech	f9cc505908	Minor tweaks to soccer fields	2016-08-25 04:02:17 -05:00
TadahTech	19cfcc414b	Fix stacking minecarts	2016-08-25 03:58:39 -05:00
TadahTech	41b40fa12c	Fix painting breaking.	2016-08-25 03:54:10 -05:00
cnr	8617572980	Fix preferences menu interaction in Clans{,Hub}	2016-08-25 02:26:42 -05:00
TadahTech	77e0090531	Tweak preferences	2016-08-25 00:17:31 -05:00
TadahTech	f518185518	Tweak parkour	2016-08-24 22:55:39 -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	352e1e0eb2	Merge branch 'update/skywars-finalised' into develop	2016-08-24 17:22:01 -05:00
cnr	df1fc60d3d	Merge branch 'update/skywars-finalised' into develop	2016-08-24 17:12:58 -05:00
Sam	4088d2a311	Air teleportation fix ... Makes it less likey that a player would die of fall damage when using the eye of ender	2016-08-24 19:50:38 +01: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	42c228773c	Fix entity directions	2016-08-23 01:52:19 -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
Sam	e0f319ea09	Change kit internal names ... Changes the kit internal names to match the current skywars ones in order so that kit progression experience is carried over during this update.	2016-08-22 17:28:51 +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
Sam	7db41a8be5	Reduce Earth kit scaling	2016-08-20 22:45:17 +01:00
Sam	28bbda23f5	Remove debug commands	2016-08-20 22:44:54 +01:00
Sam	e6530a6f44	More tweaks and fixes	2016-08-20 12:14:01 +01: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
cnr	5365f1269f	Delay Anticheat enable in Clans ... This ensure the anticheat has registered GameStartEvent before we fire it	2016-08-18 20:46:24 -05:00
cnr	72ddfd5d85	Disable server spawn radius in Clans ... Defer to the spawn claim area, instead	2016-08-18 20:44:01 -05: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
Sam	3b11a2e985	Killstreaks	2016-08-18 22:02:33 +01: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
AlexTheCoder	c66e485c9e	Fix arrow knockback	2016-08-17 23:22:30 -04:00
Sam	6c1bd88631	Increase passive knockback	2016-08-17 23:33:31 +01:00
Sam	1565b66395	Ore level changes	2016-08-17 23:33:17 +01:00
Sam	8d6e4a5fd3	Remove some unused code and cleanup	2016-08-17 22:28:22 +01: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	604f5bc2cc	Update to work with new scoreboard system	2016-08-16 11:03:12 +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	84e5b38380	Testing session feedback	2016-08-16 10:53:37 +01:00
Sam	dac4d9595c	Change scoreboard to use new system	2016-08-15 20:28:12 +01:00
Sam	6839006bd1	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-08-15 20:25:01 +01:00
Sam	d5d8f07085	Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple	2016-08-15 19:21:56 +01:00
Sam	df606d5e07	Changed game logic to try out multiple round concept	2016-08-15 19:19:20 +01:00
Sam	09741d4d2a	Added VersionModule (The new way to check client versions for games)	2016-08-15 19:18:51 +01:00
Sam	ea7d877d36	Some attempt at per player kits	2016-08-15 17:45:24 +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
Sam	33cb4db338	Minestrike - Stop vanished players being assigned teams on join	2016-08-12 19:52:23 +01:00
Sam	2915a5e3b9	Add mid-game kit changing NPCs	2016-08-11 21:16:49 +01:00
Sam	69fd78bbf2	Remove Shurikens	2016-08-11 19:05:13 +01: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
Sam	60a46c8c10	Fire burst is now instant	2016-08-11 14:26:25 +01:00
Keir Nellyer	5b516fd7bd	Show player name in black if not suspect	2016-08-11 11:37:09 +01:00
Keir Nellyer	09b458af68	Mega-hack to remove unwanted whitespace (allowing the page to render ... correctly)	2016-08-11 11:37:09 +01:00
Keir Nellyer	ebea70d078	Remove echo port debug line	2016-08-11 11:35:13 +01:00
Keir Nellyer	735eccca37	Move font styling over to stylesheet	2016-08-11 11:35:13 +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	82b2541e34	PC-827 ... Team SSM - Teammates can no longer cancel each other's Blaze Firefly	2016-08-10 21:47:13 +01:00
Sam	df646b0659	PC-897 ... SG - Spectators can no longer punch fireballs from the world border	2016-08-10 21:46:37 +01:00
Sam	a02699d84a	PC-898 ... SSM - Fixes an issue where kit armor would not appear correctly in your inventory.	2016-08-10 21:46:02 +01:00
Sam	933861176d	PC-662 ... Castle Siege - Fixes the game not ending if the whole of one team left.	2016-08-10 21:45:27 +01: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
Keir Nellyer	e43c241338	Display suspect username in red in chat log	2016-08-10 15:30:17 +01:00
Sam	87dd4c5632	Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple	2016-08-09 20:23:58 +01:00
Sam	c19825cbb0	Remove unused imports	2016-08-09 20:23:50 +01:00
Alexander Meech	5fca64b86b	Remove safezone requirement for observer mode	2016-08-09 15:10:45 -04:00
Keir Nellyer	84d7838e13	Allow setting of alternative MySQL port	2016-08-09 15:37:45 +01:00
Keir Nellyer	bc1265a828	Remove custom font on player ranks to match rest of site	2016-08-09 15:23:15 +01:00
Keir Nellyer	d627c6e98e	Improve css styling slightly	2016-08-09 15:20:49 +01:00
Keir Nellyer	31800ee1e7	Colour suspect messages	2016-08-09 15:17:19 +01:00
Sam	950a46ad12	Fix Throwable Dirt's velocity	2016-08-09 14:06:39 +01:00
Sam	5fd5245978	Use attack name	2016-08-09 13:07:17 +01:00
Sam	95c23585c8	Missed a file	2016-08-09 12:53:54 +01:00
Sam	acd5e0c1d2	Added minecart colors	2016-08-09 12:53:34 +01:00
AlexTheCoder	e5a96e8189	Fix incorrect casing in mapping outposts	2016-08-08 21:54:27 -04: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
Sam	3bab7ffe44	Use attack name for Snowballs and Eggs	2016-08-08 22:48:13 +01:00
Sam	239761962d	Now 1.9!	2016-08-08 20:49:24 +01:00
Keir Nellyer	6294e66484	Show report category on report site	2016-08-08 16:51:40 +01:00
Sam	93e49bc8a6	Stop placing and dropping of skill items	2016-08-08 16:44:13 +01:00
cnr	4180f03a52	Use the correct SalesPackageBase for gadgets	2016-08-07 22:40:26 -04:00
AlexTheCoder	5a2871528f	Small aesthetic change to ghasts	2016-08-07 18:53:35 -04:00
AlexTheCoder	73cb42c7ab	Make outposts actually end after they expire	2016-08-07 18:53:23 -04:00
AlexTheCoder	cce871b0e2	Stop runes being applied to stacks of items	2016-08-07 18:53:05 -04:00
AlexTheCoder	4e8ed68efd	Stop bows from selling in stacks	2016-08-07 18:52:48 -04:00
AlexTheCoder	36e6c7ce33	Fix slight error in amplifier end messages	2016-08-07 18:52:21 -04:00
AlexTheCoder	e16d88e52b	Add 'Safe' items replacing normal trapped chests and make craters not spam message when they explode	2016-08-07 18:52:00 -04:00
AlexTheCoder	5985731909	Make block drop rate 30% like normal TNT	2016-08-07 17:55:38 -04:00
AlexTheCoder	36aa1f9317	Stop swords and bows from being sold in stacks	2016-08-07 15:02:23 -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
Sam	280ff577fa	Metal Kit skill item placing and dropping	2016-08-07 01:25:48 +01:00
Sam	44274bcc64	Projectiles, Enchanted armor & StackOverFlows ... Fixes an issue where players with enchanted armor would cause the server to frezze for an extended amount of time due to a stackoverflow error when hit by projectiles such as snowballs or eggs.	2016-08-07 01:23:03 +01:00
Sam	4173c96d32	Fixes inconsistency with the scoreboard	2016-08-06 23:56:54 +01:00
AlexTheCoder	c5d979e5dc	Remove unnecessary while loop	2016-08-06 03:08:29 -04:00
AlexTheCoder	8eb74de2e8	Make outposts not try to block all right clicking everywhere -.-	2016-08-05 21:34:31 -04:00
Sam	691fc309c4	Documentation	2016-08-05 22:11:25 +01:00
Sam	e6bdfe8ba7	Per player fireworks	2016-08-05 22:11:15 +01: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	5b03692c97	Add in cooldowns for other clans shop buttons to stop autoclick exploits	2016-08-05 14:33:59 -04:00
AlexTheCoder	599c47a8c2	Prevent stacks of runes being consumed on one item	2016-08-05 14:33:21 -04:00
AlexTheCoder	a56f72b6af	Unify standard for event spawn points	2016-08-05 14:32:30 -04:00
AlexTheCoder	4637bc8531	Prevent war times from displaying as negative	2016-08-05 14:31:13 -04:00
AlexTheCoder	223fb0e526	Use custom explosion calculations as opposed to default mineplex explosion handling	2016-08-05 14:30:00 -04:00
AlexTheCoder	d73ced0e87	Stop portals from spawning in mid-air	2016-08-05 14:28:49 -04:00
AlexTheCoder	6170f9df87	Actually enable create button by removing stray '!'	2016-08-05 14:27:07 -04:00
AlexTheCoder	027b6b3fc4	Prevent players from using /c home after recently being in combat	2016-08-05 14:25:47 -04:00
AlexTheCoder	ce6a0b376c	Prevent players using the gui to bypass join cooldowns	2016-08-05 14:24:56 -04:00
AlexTheCoder	e01b57ceac	Implement auto restart system for clans servers in off-peak times	2016-08-05 14:24:00 -04:00
AlexTheCoder	ee1f2a7ef9	Make trapped chests more resistant to being opened and allow all chest types to be opened by besiegers, as well as preventing recruits from using hoppers to get items out of chests (PC-611)	2016-08-05 14:22:17 -04:00
AlexTheCoder	1ab5c8229b	Make bosses clean up after themselves and be more error-resistant	2016-08-05 13:40:05 -04:00
AlexTheCoder	14f140143b	Re-enable music in hub gadgets	2016-08-05 13:34:33 -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
Sam	2c6fc85fee	Logic fix and message change	2016-08-04 17:59:28 +01:00
cnr	0ca4fe2d38	Disable MAC kick for suspicious movement	2016-08-04 12:41:59 -04:00
Sam	618a132806	Payload path marker logic change	2016-08-04 17:29:40 +01:00
Sam	24c1e5fc3b	Kit items are now unbreakable	2016-08-04 17:29:01 +01:00
Sam	23b7064d43	Island ores bug	2016-08-04 16:56:13 +01:00
Sam	190ced7d97	Metal Kit tweaks	2016-08-04 16:55:52 +01:00
xXVevzZXx	91cf391724	some adjustments to UHC Survivalgames	2016-08-04 00:33:24 -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	a61906acfa	Ignore "Testing" boostergroup when announcing activation	2016-08-03 14:24:49 -05:00
Shaun Bennett	ca13b8f29e	Fix compile errors	2016-08-03 14:18:26 -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
AlexTheCoder	fb3cfecc79	Move recharge handler	2016-08-02 20:44:09 -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
md_5	dad453bd84	Remove Sentry - Unused	2016-08-02 11:42:16 +10:00
Sam	62a1968b01	Experimental Metal Kit	2016-08-02 01:13:16 +01:00
AlexTheCoder	4fdbb1fc9d	Fix assorted bugs	2016-08-01 14:48:44 -04: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
Sam	4085453f0f	Ninja Dash stopping/not working on rails	2016-08-01 18:47:17 +01:00
Sam	71f9fd97d6	End Effect change ... Reduced the amount of TNT thrown and reduced the velocity at which they are fired.	2016-08-01 18:46:35 +01:00
Sam	8f96b15454	Ninja Dash damage radius fix	2016-08-01 17:18:01 +01:00
Sam	84a4aa5157	Reduce Shuriken damage	2016-07-31 13:47:28 +01:00
Sam	1fde433c50	More changes and fixes	2016-07-30 22:53:36 +01:00
AlexTheCoder	cd237b8d3b	Make players teleport to shops once they return to the nether	2016-07-30 17:42:57 -04:00
AlexTheCoder	d12d353c20	Fix pronoun in message autoreply	2016-07-30 17:36:03 -04:00
AlexTheCoder	2d39dbfb58	Move clans admin text	2016-07-30 17:34:03 -04:00
AlexTheCoder	fe92633802	Add claim limit override for admin claiming	2016-07-30 16:49:39 -04:00
AlexTheCoder	d1d366dcf8	Add a cooldown to clans shops to reduce chance of edge-case negative gold balances	2016-07-30 09:46:02 -04:00
AlexTheCoder	9e2ba8c653	Fix fissure applying to anvils	2016-07-30 09:36:38 -04:00
Sam	063e05c0f3	Move subtle changes and fixes	2016-07-29 19:07:24 +01:00
AlexTheCoder	ecb56bf450	Fix players being able to use de-blink to teleport between worlds	2016-07-29 13:35:09 -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
AlexTheCoder	96e0625548	Fix mislabeling of shop item in user display	2016-07-29 03:15:22 -04: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	62e0a39ee8	Fix some medium graphics issues	2016-07-28 23:28:47 -04:00
cnr	8d0dc0ce08	Merge branch 'feature/party-v2' into develop	2016-07-28 21:19:52 -05:00
AlexTheCoder	f53503f16a	Move code in sync runnable	2016-07-28 21:07:29 -04:00
AlexTheCoder	dddfb4420c	Fix players being allowed to recall through worlds	2016-07-28 21:05:25 -04:00
AlexTheCoder	841a44b8a6	Make clan create button functional	2016-07-28 21:02:04 -04:00
AlexTheCoder	16804a860c	Made duping usage for class shop impossible	2016-07-28 20:22:30 -04:00
AlexTheCoder	97d5d21a55	Fix lightning orb duping	2016-07-28 19:43:43 -04:00
AlexTheCoder	853fe31fbe	Merge branch 'update/clans' of github.com:Mineplex-LLC/Minecraft-PC into update/clans	2016-07-28 19:11:39 -04:00
AlexTheCoder	3aad06cc8a	Make Clans displayed as FULL instead of BETA in server compass	2016-07-28 19:11:14 -04:00
AlexTheCoder	47d79bbad5	Fix bugs arising during clans release	2016-07-28 19:08:47 -04:00
AlexTheCoder	f3944527f8	Display clans purchases properly in support server	2016-07-28 19:08:24 -04:00
LCastr0	ab8d6daa2c	GitHub being annoying again	2016-07-28 19:59:49 -03:00
Sam	9b71f8c30b	Typo in KitBarrage	2016-07-28 22:49:58 +01:00
Sam	6c11037460	First QA testing session feedback	2016-07-28 22:39:05 +01:00
LCastr0	ab52965e44	Power Play button inside Carl, and the power play manager	2016-07-28 18:07:10 -03:00
Sam	771f643b42	Jumping disabled during Pyromancer ULT	2016-07-28 21:01:29 +01:00
cnr	a498bc13db	Reinstate async wrappers for clans gold access	2016-07-28 14:59:43 -05:00
Sam	446aec5187	Add "for Team X" when picking up the Arrow powerup	2016-07-28 20:19:50 +01:00
Sam	ba03051689	Add 1 second respawn delay	2016-07-28 19:33:16 +01:00
Sam	d30703c570	Completed game logic & Kit fixes	2016-07-28 19:31:15 +01:00
Shaun Bennett	9c42f4c147	Use the proper boostergroup for amplifier thanks	2016-07-28 13:27:48 -05: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
AlexTheCoder	f0be7794f5	Lower skeleton king passive rate	2016-07-28 06:16:20 -04:00
AlexTheCoder	4efe1fe76d	Make boss portals open where the boss spawned	2016-07-28 05:46:26 -04:00
AlexTheCoder	c30d30b2e7	Fixes event mobs getting stuck outside	2016-07-28 05:33:37 -04: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
AlexTheCoder	639e089901	Disable clans tutorial	2016-07-28 04:28:34 -04:00
AlexTheCoder	aef94e13a8	Fix message not being sent	2016-07-28 04:18:29 -04:00
AlexTheCoder	b718a72366	Fix shop chunk size being too small for map	2016-07-28 02:59:03 -04:00
cnr	dd38a1dd76	Merge branch 'update/clans' into develop	2016-07-27 20:40:35 -05:00
AlexTheCoder	d5a1312c48	Update border size to match new map	2016-07-27 20:46:40 -04: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
Sam	00c0e38b82	Kit upgrades now display	2016-07-27 23:02:40 +01:00
xXVevzZXx	749fa36a5a	remove debug and check for Integer class	2016-07-27 16:47:08 -05:00
cnr	646ce96250	Ensure gold balance row is present	2016-07-27 16:15:03 -05:00
AlexTheCoder	62871686b0	Update clans store items to currency changes	2016-07-27 16:57:07 -04:00
cnr	dfbebe11f4	Use separate gold balances for each clans server	2016-07-27 15:52:07 -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
AlexTheCoder	6180bea5cc	Update clans drop aesthetics and spawn/shop locations	2016-07-27 15:07:11 -04:00
xXVevzZXx	43c45f4094	add timer to dragon escape	2016-07-27 13:59:35 -05: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
Sam	888d3fb1aa	Payload logic progress	2016-07-27 19:56:31 +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	4dbbe6c32a	Allow Collector instance to be configured in parameters	2016-07-27 16:49:50 +01: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	20fc867578	Display rank 'ALL' as 'Player'	2016-07-27 15:52:22 +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
xGamingDudex	161381f393	Fixed PC-698	2016-07-27 12:09:59 +02:00
AlexTheCoder	157c969e8d	Completely prevent players in parties from joining Clans servers	2016-07-27 05:51:49 -04:00
AlexTheCoder	d162750aec	Keep nether loaded if its not empty	2016-07-27 04:47:03 -04:00
AlexTheCoder	ea3cb36d3a	Clean up miniboss mobs after their chunk unloads	2016-07-27 04:43:00 -04:00
AlexTheCoder	85cf005eba	Small clans economy changes	2016-07-26 22:33:19 -04:00
AlexTheCoder	9c700425fd	More javadocs	2016-07-26 22:32:46 -04:00
Keir Nellyer	2a167745a6	Update chatsnap url	2016-07-26 16:51:59 +01:00
AlexTheCoder	d98ca0ab3c	Remove unused miniboss	2016-07-26 09:00:37 -04:00
AlexTheCoder	bb5d766ba6	Patch war point evasion by committing suicide in safezones	2016-07-26 07:35:11 -04:00
AlexTheCoder	34d5fb5e24	Fix craters getting glitched in wilderness	2016-07-26 07:15:40 -04:00
AlexTheCoder	e396acc69c	Fix clans ips being added to the bungee rotator	2016-07-26 07:15:09 -04:00
AlexTheCoder	4df8de58a6	More javadocs	2016-07-26 05:51:42 -04:00
AlexTheCoder	bf5e9f1d76	ADD JAVADOCS TO CLANS	2016-07-26 05:50:43 -04:00
AlexTheCoder	61eca3ced0	Removed auto disguising from clans hub and removed clans tnt protection	2016-07-26 00:54:31 -04:00
AlexTheCoder	7b358adba1	Prevent runed pickaxe from destroying the nether	2016-07-25 20:26:23 -04:00
AlexTheCoder	b41ad2e087	Fix NPC orientation in clans hub	2016-07-25 12:28:25 -04:00
AlexTheCoder	aecaa89443	Update clans hub spawn location	2016-07-25 12:08:37 -04:00
AlexTheCoder	9a73784b7c	Make clans in the hub route through clans hubs	2016-07-25 11:18:10 -04: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	6f0d21120e	Serious tweaks to gameplay and begin documentation	2016-07-25 10:59:03 -04:00
AlexTheCoder	0ecdce4edc	Add clans hub to maven	2016-07-25 10:58:32 -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
AlexTheCoder	275ab52f79	Create a clans-only hub	2016-07-25 10:55:18 -04:00
AlexTheCoder	9fab8366b7	Add support for clans hub connection inside bungees	2016-07-25 10:52:48 -04:00
TadahTech	5180e46be7	Revert party chat symbol to "@". Change team chat symbol to "#".	2016-07-24 22:17:50 -05:00
Sam	80eb7b2fd3	Gives Super Arrow on start.	2016-07-24 22:44:50 +01:00
Sam	576b92a5ce	Ultimates added to QuiverPayload	2016-07-24 22:06:14 +01:00
TadahTech	a23c2c4e1c	Update UI to reflect allowing upgrades to be shown, per kit.	2016-07-24 16:05:19 -05:00
Sam	ef797aa599	Velocity fix	2016-07-24 21:41:42 +01: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
Sam	4728a50ca9	Small message change ... Avoids using two variables	2016-07-24 11:49:57 +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
Sam	03b3c1864d	Map crumble issue ... Fixes an issue where the max distance of a map would not be calculated correctly affecting the map crumble	2016-07-24 00:12:48 +01:00
Sam	d3c9957f95	Ultimate length tweaks	2016-07-23 23:43:06 +01:00
Sam	43aae5e076	Ultimate visual and gameplay improvements	2016-07-22 22:47:29 +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
AlexTheCoder	869dfc1dfa	Finalize Amplifier system	2016-07-21 20:21:11 -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	891a3231d8	Change banner GUI	2016-07-21 17:37:02 -04:00
AlexTheCoder	b87c6cfff0	Fix git removing class	2016-07-21 17:27:41 -04:00
AlexTheCoder	75cc75f40c	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans	2016-07-21 17:25:15 -04:00
AlexTheCoder	55c63364f2	Fix KOTH starting in other hub worlds and hub basketball teams always being null	2016-07-21 16:57:24 -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	286a7aa32a	Even more debug	2016-07-21 16:16:38 -04:00
AlexTheCoder	4a77a587f8	Fix git removing a class	2016-07-21 16:11:05 -04:00
AlexTheCoder	b5ce35544f	Fix merge conflict	2016-07-21 15:48:56 -04: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
AlexTheCoder	97ef408e14	Debug	2016-07-21 15:46:48 -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
AlexTheCoder	11992129d1	Convert to EntityPortalEnterEvent	2016-07-21 14:01:08 -04:00
AlexTheCoder	d59882007b	Slightly increase boundaries	2016-07-21 13:55:09 -04:00
AlexTheCoder	37cf863625	Tiny fixes	2016-07-21 13:46:13 -04:00
AlexTheCoder	57f9f7db4b	Fix ClassCastException	2016-07-21 13:25:17 -04:00
AlexTheCoder	1f2b1557d5	Work on amplifiers and deleting banners when the clan is deleted	2016-07-21 13:20:45 -04: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	e5cd38c11b	Revert enjin changes	2016-07-21 05:20:47 -04:00
AlexTheCoder	2615ef74dd	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans	2016-07-21 05:09:54 -04:00
AlexTheCoder	1dedde41a8	Banners and beginning javadocs	2016-07-21 05:09:31 -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	e7da161f35	Revert "Fixed PC-706" ... This reverts commit 96d16be5b7.	2016-07-20 20:07:06 -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
cnr	9a06cce0a0	Merge branch 'feature/party-v2' into develop	2016-07-20 16:41:50 -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
AlexTheCoder	ff210271c9	Add javadocs	2016-07-20 12:21:15 -04:00
AlexTheCoder	0b4c9d78ff	Finalize game integration into map	2016-07-20 11:22:14 -04:00
AlexTheCoder	29d52ac075	More work on Nether	2016-07-20 10:42:24 -04:00
Keir Nellyer	1ca7519963	Make index preservation faster	2016-07-20 13:19:21 +01:00
Keir Nellyer	85c1bc1728	Ensure returned list really is in the original order	2016-07-20 13:08:33 +01:00
TadahTech	136eb078ef	PC-426: Update UX for non-premium players: ... Removes the in game advertisement display when selecting servers. Removes all chat throttling. Adds a message sent on join to the player, promoting the newest sale or promotion.	2016-07-20 06:59:37 -05:00
Keir Nellyer	a78c71793a	Made filter method return results in the same order they were entered and generally improved method code	2016-07-20 12:46:10 +01: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
Sam	7e26480452	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-07-19 22:29:00 +01:00
Sam	3411a3b978	Throwable Dirt colliding issues ... Fixes the falling dirt block colliding with the thrower.	2016-07-19 22:28:56 +01:00
Sam	8b552a69de	Removal of debug message	2016-07-19 21:45:03 +01:00
Sam	765958a421	Code cleanup for PerkDirtCannon ... Cleans up some bad code in PerkDirtCannon and now removes the dirt blocks on death.	2016-07-19 20:51:14 +01:00
Sam	7470078da9	Typo in PerkFireBurst ... Should say Blaze Rod instead of Snowblock	2016-07-19 20:50:19 +01:00
Sam	588e32e1b1	Addition knockback perk for Earth Kit ... Adds a perk so that the Earth kit takes 75% less knockback while on the ground	2016-07-19 20:49:27 +01:00
Sam	0390822fd7	IceBridge item no longer droppable	2016-07-19 20:48:36 +01:00
Sam	63a0eebd02	Increased chance enchanted of armour	2016-07-19 20:48:12 +01:00
Keir Nellyer	80f0113183	Fix commands out of sync error by storing the result of the query	2016-07-19 17:56:27 +01:00
AlexTheCoder	0eac157701	Implement basketball features in the hub and begin setting up coordinates	2016-07-19 12:45:38 -04:00
Keir Nellyer	fccc1834a5	Rewrite view.php to work without MySQL native driver	2016-07-19 17:31:46 +01:00
Keir Nellyer	1c1825710d	Merge remote-tracking branch 'origin/feature/report-v2' into feature/report-v2	2016-07-19 16:38:19 +01:00
Keir Nellyer	37a06816dd	Modify /reportclose to no longer require a report id parameter	2016-07-19 16:37:53 +01:00
TadahTech	c32e647d9e	Add private messaging system	2016-07-18 22:21:09 -05:00
TadahTech	ce4289fa00	Don't do weather.	2016-07-18 22:13:32 -05: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
TadahTech	36f2873e15	Map Parser update.	2016-07-18 19:00:11 -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
AlexTheCoder	c58d226680	More work on Nether and Runes	2016-07-18 16:26:05 -04:00
Keir Nellyer	d9240e1589	Invalid PHPDoc made me write bad code :P	2016-07-18 19:29:05 +01:00
Keir Nellyer	ca835bb4c6	Remove all try...finally clauses as they aren't supported in PHP 5.4	2016-07-18 19:08:37 +01:00
Keir Nellyer	976e8788b7	Update report message if a player reports another player multiple times	2016-07-18 18:37:21 +01:00
Keir Nellyer	103f31afc1	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-07-18 17:17:11 +01:00
Keir Nellyer	17c7f36b04	Fix getInvolvedUsers not getting reporters	2016-07-18 14:37:23 +01:00
Keir Nellyer	c89b35f2f1	Remove redundant categories array	2016-07-18 14:36:21 +01:00
AlexTheCoder	4238a1c385	Implement rune system and main nether minibosses	2016-07-17 07:14:08 -04:00
xXVevzZXx	370b0693d9	fix the server thinking it's the next week	2016-07-17 05:20:21 -05:00
cnr	0ae4b0c5e0	Temporarily disable anti-xray in UHC	2016-07-16 23:08:18 -05:00
AlexTheCoder	98e88d1b77	Disable bosses not scheduled for initial releases	2016-07-16 22:00:38 -04:00
AlexTheCoder	08850d909f	Further work on brood mother boss and nether	2016-07-16 21:59:03 -04:00
LCastr0	7c300acaa3	No particles for vanished players!	2016-07-16 20:00:21 -03:00
Sam	e2af4df44b	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-07-16 21:22:57 +01:00
Shaun Bennett	34f718b2ec	Fix improper gem/shard reward handling	2016-07-16 06:27:16 -05:00
Sam	30111eb940	Duplicate enchantment fix	2016-07-16 11:16:57 +01:00
Sam	951e07488a	GI changes from testing session	2016-07-16 11:15:33 +01:00
Sam	f012e8d4ed	Merge from develop	2016-07-16 08:41:15 +01:00
Sam	8523d56bbf	Merge fix	2016-07-16 08:33:41 +01:00
Keir Nellyer	6756d04aa7	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-07-15 23:56:08 +01:00
Keir Nellyer	3a8722a1a2	Remove redundant files and variables	2016-07-15 23:54:20 +01:00
Sam	d901fce3ac	Experimental Skywars Kits	2016-07-15 23:07:17 +01:00
Keir Nellyer	0d9aad37f9	Optimise imports	2016-07-15 16:31:25 +01:00
xXVevzZXx	728a91da0f	adding damage outsid ethe loop	2016-07-15 04:57:44 +02:00
xXVevzZXx	3070835662	enable armor protection and fix shotguns	2016-07-15 04:39:53 +02:00
xXVevzZXx	6c7f2d8b0d	fix damage in DM prepare, eating grenades and no health regen	2016-07-15 02:28:22 +02: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	16f451efba	Add MySQL upgrade scripts	2016-07-14 22:59:56 +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	d54e47d8ea	Check for uptimes field	2016-07-14 11:22:10 -05:00
cnr	a0847b8d1a	Fix null ServerGroup uptimes value for MPSes	2016-07-14 08:08:24 -05:00
cnr	1a2e0df6ca	Only allow OPs to use minestrike debug commands	2016-07-14 07:28:33 -05:00
cnr	1d1c3ef1be	Merge branch 'thanos-mineware' into develop	2016-07-14 03:41:00 -05:00
Thanos Paravantis	40345bc93c	Fix Bawk Bawk Battles game start	2016-07-14 11:23:39 +03: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	7cc44c8bfc	Merge branch 'thanos-mineware' into develop	2016-07-14 00:22:01 -05:00
Thanos Paravantis	906762e9db	Remove debug commands	2016-07-14 08:17:36 +03: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
Shaun Bennett	a34ac42093	Amplifiers adjustment - shards only	2016-07-13 19:26:23 -05:00
LCastr0	6af04b5438	Fixes for winroom gadget disable messages	2016-07-13 18:21:08 -03:00
Thanos Paravantis	6082418fc7	Update game tags on the hub game compass	2016-07-13 23:59:37 +03:00
Thanos Paravantis	4e985b85e6	Make final challenge changes ... - Increase Color Change delay - Make Tag Master not count for players jumping into the void	2016-07-13 23:59:01 +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
Thanos Paravantis	3497a4c095	Remove unused debug messages	2016-07-13 19:29:48 +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
Thanos Paravantis	6c11b718af	Remove suppress warnings annotations	2016-07-13 19:03:39 +03:00
Thanos Paravantis	dab3e09837	Achievement fixes, minor challenge changes ... - Fishing Day was marked as deprecated. - Surf Up will no longer track waves in which players were killed. - Make Bouncing Shadow not count players that lost. - Tag Master will now select alive players only. - Removed debug messages.	2016-07-13 18:52:14 +03:00
Thanos Paravantis	ad32f4e2f1	Remove unnecessary new string declaration	2016-07-13 18:05:35 +03:00
Thanos Paravantis	839d9263fd	Prevent game crash if started with one player	2016-07-13 18:03:38 +03:00
Thanos Paravantis	efce89a7e7	Fix Color Change platforms not removed properly	2016-07-13 17:47:17 +03:00
Thanos Paravantis	2e5d7c023f	Fix Tag Master, show bouncing block full score	2016-07-13 17:13:02 +03:00
AlexTheCoder	2034b5536e	Update and enable Clans Freezing	2016-07-13 09:42:46 -04:00
cnr	7df228a8fa	Move WinEffectGadget schematics to update folder	2016-07-13 06:36:42 -05:00
Thanos Paravantis	6cef42d7a4	Fix merge issues	2016-07-13 13:36:59 +03:00
Thanos Paravantis	179b59af2c	Merge branch 'develop' into thanos-mineware	2016-07-13 13:28:03 +03:00
Thanos Paravantis	943dc88ca4	Modify challenge list, change display messages	2016-07-13 13:23:15 +03:00
cnr	e40abd4859	Merge branch 'thanos-mineware' into develop	2016-07-13 05:04:50 -05:00
Sam	2f6e140b34	Item in hand change (Devourer) ... Changes the item in the NPC's hand for Devourer from OBSIDIAN to a DIAMOND_CHESTPLATE	2016-07-12 21:57:37 +01:00
Sam	5382afedda	Sharpshooter arrow limit changed to 4	2016-07-12 21:56:25 +01: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
AlexTheCoder	f0db20dbc2	Fix some minor spelling and grammar issues and implement a requested player freezing system for Clans	2016-07-12 05:21:50 -04:00
AlexTheCoder	3acca23e7e	Remove emerald drops from Skeleton King minions and decrease the range EventCreatures can go from their spawn	2016-07-12 05:20:22 -04:00
xXVevzZXx	9cf5a6fb9e	Fix Absorption in OP MB, add more arrows to OP MB, fix not being able to purchase primary weapon in MS, fix skin bug in MS and fix helmet drop when scoping in Strike Games	2016-07-12 05:39:21 +02: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
Sam	5bf0ef545b	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-07-11 23:19:39 +01: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
AlexTheCoder	69c9ef8074	Implement small ability tweaks for Game Insights team	2016-07-11 14:45:54 -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
Thanos Paravantis	416b978c4f	Apply chicken attack and completion improvements ... - Chicken spectators will no longer receive the compass to prevent them from teleporting near players. - The winner of the game will not see the "You have completed the challenge." message as the game will end afterwards.	2016-07-10 15:16:17 +03:00
Thanos Paravantis	5a7e7c7623	Challenge bug fixes and improvements ... - Added crumble feature to Block Lobbers - Increased TNT height on Water Horror - Increased Lava Run difficulty - Fixed unclickable Bawk's Food Kit - Fixed chickens not attacking properly on chicken attack - Fixed dominant team not winning on team based challenges - Fixed spectators being able to break blocks on Treasure Digger	2016-07-10 13:32:24 +03:00
Keir Nellyer	3b38a0ab65	Make interval display seconds when interval is less than a minute	2016-07-09 23:51:48 -04:00
Keir Nellyer	e607960b6a	Fix time intervals on report site not displaying correctly ... Before this would display values such as "0 minute ago" and "1 minutes ago".	2016-07-09 23:48:14 -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	be8050a556	Make player ranks display better on report site	2016-07-09 22:47:38 -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
Thanos Paravantis	a9f41ab269	Refactor project classes	2016-07-09 12:00:06 +03: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
xGamingDudex	b8650d741d	Fixed PC-707 ... Fixed arrows damaging the shooter. Fixed all instances of arrows bouncing of targets.	2016-07-08 16:48:17 -05:00
xGamingDudex	96d16be5b7	Fixed PC-706 ... Tweaked settings to reasonable values in local testing.	2016-07-08 16:48:11 -05: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
Sam	d7f71f2d15	Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple	2016-07-08 22:10:20 +01:00
Sam	34565b2975	PC-699 ... /bc in MPS is now protected by the filter	2016-07-08 22:09:48 +01: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
Sam	07b65ad1c9	PC-621 ... Doors can now be opened in Block Hunt	2016-07-08 21:01:15 +01:00
Sam	af9611dcfd	Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple	2016-07-08 21:00:34 +01:00
Thanos Paravantis	331c1bcf91	Merge branch 'develop' into thanos-mineware	2016-07-08 22:29:59 +03:00
Thanos Paravantis	7887c96cc9	Decrease delay between challenges	2016-07-08 22:28:53 +03:00
TadahTech	1313db4071	Commit lost file.	2016-07-08 14:06:16 -05:00
Thanos Paravantis	7ba7414101	Improvements, refactoring and bug fixes ... - Fixed heights not being calculated correctly on Kangaroo Jump. - Fixed platform not being removed entirely on Color Change (needs confirmation). - Fixed death effect items not spawning on Treasure Digger. - Fixed TNT not reaching players on Water Horror. - Fixed Dogs Vs Cats hologram being displayed continuously (flashing) (needs confirmation). - Increased score hologram elevation rate. - Spawn locations are automatically centered. - Border is now far away from challenges. - Refactored main game class.	2016-07-08 21:30:43 +03: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
Sam	42c578be9d	PC-612 ... Fixes an issue that removing Co-host from someone would remove their creative mode in Master Builders.	2016-07-08 17:54:42 +01:00
Sam	c16f9ec9ec	PC-688 ... Changes the description in Draw My Thing so that it reflects changes made to the tip system.	2016-07-08 17:53:22 +01:00
Sam	c607654c51	PC-692 ... Fixes an issue that allowed staff spectators to damage the King in Castle Siege	2016-07-08 17:50:33 +01:00
Sam	7940eeb0ee	PC-633 ... Allows humans in Wither Assault to place blocks under the map, allowing them to no longer get stuck	2016-07-08 17:49:38 +01:00
Sam	aae24d862a	Revert "PC-692" ... This reverts commit 7865b1ef80.	2016-07-08 17:38:53 +01:00
Sam	7865b1ef80	PC-692 ... Allows humans in Wither Assault to place blocks anywhere so that players are not able to get stuck in the ground	2016-07-08 17:37:32 +01:00
Alex-The-Coder	e8a1c9bcba	Add damage check to the Enchantment Handler... ... ...to avoid performing calculations where it is not necessary	2016-07-08 07:42:00 -04:00
xGamingDudex	4aad663bec	Left over from merge	2016-07-08 03:59:16 +02: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
xGamingDudex	d276d8ca5d	Removed "Failure" feature and cleaned some code	2016-07-08 03:40:37 +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
xGamingDudex	2659e9be09	Removed failure and smaller updates	2016-07-08 02:06:34 +02: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	dc566c8fb3	Remove redundant ReportServer entry from Maven POM	2016-07-07 17:59:55 -04:00
Keir Nellyer	bc2b7884ee	Make this code a lot smarter	2016-07-07 17:57:19 -04:00
Keir Nellyer	e6de1ec13e	Renamed for easier understanding of the class's function	2016-07-07 17:51:05 -04:00
Keir Nellyer	aab5daa446	Remove old ReportServer and move site related files to ReportSite ... directory	2016-07-07 17:49:06 -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	4e0287ad03	Re-import report feature classes in Hub and Arcade	2016-07-07 14:01:18 -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
xXVevzZXx	783b20a0dc	Disable champions abilities in smash dom and disable supply chests, adjust peace announcement in Strike games, Absorbtion fix in OP MB, Countdown in CHanging Kits, more Arrows in OP MB, regen hunger in skysmash, scoped players drop helmets now, fix stuff with identifiers in GunModule	2016-07-07 15:08:57 +02: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
Thanos Paravantis	04f0ef199c	Make CustomFirework singleton class public	2016-07-06 20:47:28 +03:00
LCastr0	63500c19c9	Removed commented lines ... Added javadocs to GadgetChangeEvent	2016-07-06 14:45:05 -03:00
Thanos Paravantis	989dd98212	Fix players not losing on Pick a Side	2016-07-06 20:41:26 +03:00
Thanos Paravantis	6a66d6cc92	Lower barrier spawn chance on Cloud Fall	2016-07-06 20:40:51 +03:00
Thanos Paravantis	7319965c45	Temporarily fix challenge completion/lose issues	2016-07-06 20:40:15 +03:00
Thanos Paravantis	47f62e2c89	Make lava run a bit more difficult	2016-07-06 20:39:37 +03:00
xXVevzZXx	36285ee101	Improve GunModule with editable variables	2016-07-06 18:55:13 +02:00
xXVevzZXx	4dedd27227	finish up editing of arrays for gamemodes	2016-07-06 18:34:15 +02:00
Thanos Paravantis	185ba600ca	Merge branch 'develop' into thanos-mineware	2016-07-06 17:48:31 +03:00
Thanos Paravantis	e326fd322c	Update Pick a Side, refactor Reverse Tag	2016-07-06 17:45:51 +03:00
Thanos Paravantis	29434b786e	Apply completion/lost bug fixes	2016-07-06 17:45:22 +03:00
xXVevzZXx	3e77ce0f00	make arrays parseable by variables	2016-07-06 14:03:41 +02:00
xXVevzZXx	a430f7e94d	Add chat messages for Peace Phase, remove arrows from chests, disable crafting, fix dropped pumpkins and disable weapon enchantments	2016-07-06 13:45:31 +02:00
Thanos Paravantis	ab4174cfb9	Refactor Red Light, Green Light and Volley Pig	2016-07-06 12:04:04 +03:00
Thanos Paravantis	e0d133ab67	Broadcast a message when timer runs out	2016-07-06 11:10:57 +03:00
Thanos Paravantis	de74716abf	Refactor Treasure Digger and Volley Pig	2016-07-06 11:10:21 +03:00
Thanos Paravantis	ae60d05bbb	Refactor Wave Crush	2016-07-06 10:25:20 +03:00
Thanos Paravantis	b40346417a	Remove unused project files	2016-07-06 10:25:05 +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
AlexTheCoder	8c93f92a92	Tweak all Necromancer abilities so they function well together and give the Necromancer a semi-AI for movement	2016-07-05 17:08:38 -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
Thanos Paravantis	607b92984e	Fix hologram elevation speed	2016-07-05 23:18:29 +03: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
Thanos Paravantis	00c3584c0b	Make score holograms elevate faster	2016-07-05 21:14:13 +03:00
Thanos Paravantis	6a8c30d496	Refactor Mini OITQ and Water Horror	2016-07-05 21:13:49 +03:00
Thanos Paravantis	071f0c4de7	Refactor Ore Run and Rush Push	2016-07-05 19:39:30 +03:00
Thanos Paravantis	f36244efc6	Refactor Lava Run and Milk a Cow	2016-07-05 19:27:59 +03:00
Thanos Paravantis	108031acf1	Refactor Kangaroo Jump and King of the Ladder	2016-07-05 18:53:53 +03:00
Thanos Paravantis	f64234e4d1	Refactor Falling Blocks and Fast Food	2016-07-05 18:14:31 +03:00
Connor James	c0680b3511	Merge pull request #130 from Mineplex-LLC/bugfix/mopple-sprint ... Numerous Bug fixes	2016-07-05 10:01:58 -05:00
AlexTheCoder	b409009069	Create a way to remove siege weapons for testing	2016-07-05 10:05:53 -04:00
Thanos Paravantis	ba02c94e08	Refactor Dogs Vs Cats and Egg Smash	2016-07-05 17:00:38 +03:00
Thanos Paravantis	5d01bc2863	Refactor Deadly TNT and Diamond Hunt	2016-07-05 16:30:51 +03:00
Thanos Paravantis	fe89a0f094	Refactor Cloud Fall and Color Change	2016-07-05 16:17:19 +03:00
Thanos Paravantis	361e857bc7	Refactor Build Race and Chicken Shooting	2016-07-05 15:54:43 +03:00
Thanos Paravantis	3f13c5f518	Refactor Block Lobbers and Bouncing Block	2016-07-05 14:52:25 +03:00
AlexTheCoder	cc7fc164bb	Implement Necromancer boss and give it some beginning attacks	2016-07-05 07:52:21 -04:00
AlexTheCoder	b51ee4a066	Create an event for stronger control over Velocity changes	2016-07-05 07:51:41 -04:00
Thanos Paravantis	4789f640b2	Refactor Anvil Dance and Arrow Rampage challenges	2016-07-05 13:57:05 +03:00
Thanos Paravantis	ce3117ba4b	Fix anvils staying on map after challenge end	2016-07-05 13:03:42 +03:00
Thanos Paravantis	9f45c0a622	Use offset2d instead of offset	2016-07-05 13:03:02 +03:00
Thanos Paravantis	9cec81ee34	Define border after challenge is started. ... Previously, the border was defined in the challenge constructor, as a result the boundaries were not set correctly. That's because the map center on each challenge is defined in the constructor, and since the super one is called before the challenge constructor, the map center which defines part of the border was not correct.	2016-07-05 12:35:27 +03:00
Thanos Paravantis	dd55d96ccf	Delay glass removal when obsidian is far away ... On Lava Run, when obsidian is generated far away from the last created obsidian block, a delay of 1 second will be added to the total delay until the platform is removed, because normally glass is removed very quick.	2016-07-05 12:32:44 +03:00
Sam	295711d626	PC-632 ... Fixes an issue where going under the map in Wither Assault would cause you to have negative speed and not be able to move	2016-07-04 20:31:59 +01:00
Thanos Paravantis	d393ffcc51	Update debug commands for Sr.Mods	2016-07-04 22:06:01 +03:00
Thanos Paravantis	4397784f35	Add new challenge completion effect	2016-07-04 22:05:34 +03: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
Sam	5644589b10	PC-541 ... Covers all possible eventualities of redstone ore and glowing redstone ore	2016-07-03 20:57:58 +01:00
Sam	e96f7f1217	PC-508 ... Fixes a hit box issue with Rocket Slimes	2016-07-03 15:58:54 +01:00
Sam	bdc049efe1	PC-508 ... Fixed an NPE with Inferno	2016-07-03 15:58:19 +01:00
AlexTheCoder	5c37a6ceca	Repair spider boss death	2016-07-03 06:33:53 -04:00
AlexTheCoder	0a67d381a3	Prevent bosses from leaving their arena	2016-07-03 05:44:05 -04:00
AlexTheCoder	28853feb73	Update Iron Wizard mechanics	2016-07-03 05:43:50 -04:00
AlexTheCoder	f1733875eb	Change rupture animation	2016-07-03 05:43:05 -04:00
AlexTheCoder	e57910985c	Change earthquake animations	2016-07-03 05:42:44 -04:00
AlexTheCoder	37d11cdd60	Make Meridian Scepter stronger	2016-07-03 05:41:59 -04:00
AlexTheCoder	caf7e1086d	Completely revamp Iron Wizard boss, add spawn and despawn messages, and retire attacks that no longer fit the arena	2016-07-03 04:12:05 -04:00
AlexTheCoder	af9d91faa8	Further prevent nullpointer errors	2016-07-03 04:11:14 -04:00
AlexTheCoder	d0a8ee18c0	Fix concurrent modification error caused by poison looping every tick	2016-07-02 19:07:55 -04:00
samczsun	ceb62f8dc9	Fix lore	2016-07-02 18:41:20 -04:00
AlexTheCoder	b3c230082a	Allowed Meridian Scepter to damage non-player entities	2016-07-02 18:34:35 -04:00
AlexTheCoder	1ce6f3f65f	Stop webs from editing banners (PC-610)	2016-07-02 18:16:04 -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
AlexTheCoder	32c91e2e0c	Make start command more informative	2016-07-02 17:52:04 -04:00
AlexTheCoder	d4be749edc	Update Iron Wizard attack priority to use Earthquake when surrounded, lower blocks thrown during Cave In and implement Iron Skin arrow resistance	2016-07-02 17:47:19 -04:00
samczsun	1655811d43	Added help messages to WorldEvent command	2016-07-02 17:47:13 -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
Sam	26361eaee0	PC-508 ... Fixes certain abilities in Team SSM that could be used to damage/knockback other team members	2016-07-02 13:38:22 +01:00
Sam	8d8824446d	PC-519 ... Fixes an issue where grenades would not do damage after you die.	2016-07-02 12:12:15 +01:00
AlexTheCoder	2b74ec00b4	Change display menu for CUST-1 server to reflect recent updates	2016-07-02 01:32:47 -05:00
AlexTheCoder	e4c94f5421	Fix whitelist for Customer Support servers	2016-07-02 01:32:42 -05:00
AlexTheCoder	5e994e37da	Fix Monster Maze jumping mechanics (Fixes PC-711 and PC-634)	2016-07-01 16:37:03 -05:00
Thanos Paravantis	e2663d6448	Move spawn related methods to challenge classes	2016-07-01 17:18:03 +03:00
Thanos Paravantis	6fdbda0ed0	Refactor Dogs Vs Cats challenge	2016-07-01 17:04:06 +03:00
Thanos Paravantis	8101fced7b	Detect correct volley pig block and fix its spawn	2016-07-01 13:58:21 +03:00
Thanos Paravantis	568cbb2672	Prevent infinite spawn search loops by /mark cmd	2016-07-01 12:32:31 +03:00
Thanos Paravantis	7379b2069b	Make volley pig map size and spawns dynamic	2016-07-01 12:31:41 +03:00
Thanos Paravantis	baca63dcae	Merge branch 'develop' into thanos-mineware	2016-07-01 11:43:56 +03:00
samczsun	f6d882fcb4	Disallow placing throwing tnt	2016-06-30 21:12:12 -05:00
samczsun	c442376ccc	Oops	2016-06-30 22:04:34 -04:00
AlexTheCoder	005189c2d4	Edit kit items in OITQ to fix bow instant charge glitch (Fixes PC-203)	2016-06-30 17:41:09 -05:00
AlexTheCoder	b0303a8870	Create new equations for Protection Enchantment functionality to make it work properly (Further fix for PC-311)	2016-06-30 17:41:09 -05:00
AlexTheCoder	37e50df948	Make kits ensure association with players using them (Fixes PC-588)	2016-06-30 17:41:09 -05:00
AlexTheCoder	9c4b787436	Make protection enchantments actually protect wearer from damage (Fixes PC-311)	2016-06-30 17:41:09 -05:00
AlexTheCoder	36bb0b9ae8	Force player visibility to refresh in games over a steady rate (Fixes PC-497)	2016-06-30 17:41:09 -05:00
samczsun	3e1c44bfa3	UHC improvements ... Lots of hacky NMS stuff. Ask me if you're confused Basically, decorate the world async Keep spawn chunks loaded Make sure view distance is capped so no chunks are genned on teleport Add regeneration and resistance on spawn to prevent damage Set health objective score manually Teleport player two times to ensure no block glitching Disable kicking and NCP while teleporting	2016-06-30 17:15:01 -05:00
Keir Nellyer	fbc1724111	Rewrite this condition to make more sense	2016-06-30 17:51:16 -04:00
Keir Nellyer	82894eacaa	Remove todo as this is confirmed working	2016-06-30 17:43:06 -04:00
Keir Nellyer	164d1c580d	Check if date time is before correctly	2016-06-30 17:40:12 -04:00
Keir Nellyer	7db7c0914e	Get time since report has been created	2016-06-30 17:23:29 -04:00
xGamingDudex	0393e682c3	Merge clean up ... Every bloody time there are files who don't want to join the rest in the merge commit.... >.>	2016-06-30 23:10:28 +02: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	03511a7234	Updated values ... Updated teleport mav world value to fit new version of the map. Split themes of multiple words to new lines. Fixed bug where 16+ long lines on scoreboard would get random colors. Seem to have forgotten to include the MavWorldManager earlier... ups.	2016-06-30 22:56:26 +02:00
Sam	40124b2cdd	Updated changed method name (getThrower) ... In the ProjectileData class GetThrower was changed to getThrower, this fixes that in any of my classes	2016-06-30 17:19:53 +01:00
Sam	69bd4006d4	Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple-sprint	2016-06-30 17:14:38 +01:00
samczsun	045e1b3064	Fix various Clans bugs ... Viper destroying armor Legendaries not saving properly Combat log NPC for vanished players	2016-06-30 05:20:44 -05:00
Thanos Paravantis	e25a6e4327	Reset leap data when needed (death/quit/game end)	2016-06-30 05:18:39 -05:00
Thanos Paravantis	5c60819179	Prevent NPE on player interact event	2016-06-30 05:18:39 -05:00
Keir Nellyer	c076a46078	Show all involved users correctly	2016-06-29 22:13:13 -04:00
Keir Nellyer	1c73d2a793	Fix age of report not showing when no chat messages ... Use a dummy value for now until I get the system to calculate the age of the report.	2016-06-29 18:16:26 -04:00
Keir Nellyer	a3f4a4c185	Change message for when there are no chat messages for a report	2016-06-29 18:07:26 -04:00
Keir Nellyer	e1a32b6da0	Show error messages for reports which do not have any related chat ... messages	2016-06-29 18:06:30 -04:00
xGamingDudex	f9208b67ef	Added schematic support for ground in MB. ... Also fixed an NPE and moved a constructor to protected.	2016-06-29 15:19:46 +02:00
xXVevzZXx	880ac6b88f	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into bugfix/general-bugfixes	2016-06-29 06:21:18 +02:00
Keir Nellyer	d2b1a7b0c1	Add todo for handling invalid report number input	2016-06-28 21:50:33 -04: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
xGamingDudex	9d8eb1f044	ArcadeManager doing .zip check, but not acting upon it	2016-06-29 03:46:58 +02:00
LCastr0	671dcaf3aa	Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics	2016-06-28 18:14:05 -03:00
LCastr0	24186d9992	More fixes for gadget persistence	2016-06-28 18:11:00 -03:00
Thanos Paravantis	04cb0fb0b0	Use updated ProjectileUser method names	2016-06-28 23:09:52 +03:00
Thanos Paravantis	4436ba0710	Merge branch 'develop' into thanos-mineware	2016-06-28 23:05:11 +03:00
Thanos Paravantis	c5c08562c3	Merge branch 'master' into thanos-mineware	2016-06-28 23:01:42 +03:00
Thanos Paravantis	42ebb95db1	Fix NPE on zombie infection	2016-06-28 21:57:32 +03:00
Thanos Paravantis	973666a42f	Improve challenge selection system ... - Game will no longer end unexpectedly, when all challenges are played. - Challenges are now marked correctly as played.	2016-06-28 21:57:17 +03:00
Thanos Paravantis	5e9f16424c	Add shouldDie method, update zombie wrapper name	2016-06-28 20:38:32 +03:00
Thanos Paravantis	43f375fd86	Reset team data on team challenges	2016-06-28 20:37:26 +03:00
Thanos Paravantis	eea980b354	Apply smoother knockback on volley pig	2016-06-28 18:41:50 +03:00
Thanos Paravantis	c5367d4510	Remove double plants entire from spawn locations	2016-06-28 12:15:49 +03:00
Thanos Paravantis	cf434b92de	Modify punch the pig description	2016-06-28 11:47:47 +03:00
Thanos Paravantis	dc250d4bf2	Store locations after game start (fix NPE)	2016-06-28 11:47:25 +03:00
Thanos Paravantis	7218dc710f	Retrieve scoreboard data only when possible	2016-06-28 11:46:38 +03:00
xGamingDudex	8ad63ef7ea	Tweaked some code to better fitt schematics.	2016-06-28 06:29:44 +02:00
xGamingDudex	cd5555c3f9	Fixed invis entities after pasting blocks + removed debug code	2016-06-28 04:03:40 +02:00
Keir Nellyer	561734e7fe	Remove unused imports (accidentally added)	2016-06-27 21:18:40 -04:00
AlexTheCoder	beeddfedd4	Force the ball to drop if the carrier is AFK	2016-06-27 21:07:44 -04:00
xGamingDudex	a69101bef3	Cleaned out some debug messages and added some java-docs.	2016-06-28 01:35:37 +02:00
xGamingDudex	65e05b9d8c	Small polish on Mavericks Master Builders	2016-06-28 01:13:34 +02:00
AlexTheCoder	5b32eb4815	Update to Kit Progression system	2016-06-27 18:47:15 -04:00
AlexTheCoder	119931ac71	Remove unneeded Data Loc	2016-06-27 18:33:01 -04: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	128f6af83d	Show time of last report and time since	2016-06-27 18:15:41 +01: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
xGamingDudex	966eaf1616	Fixed some entity tracking bugs regarding chunk update packets	2016-06-27 00:16:04 +02:00
Keir Nellyer	dbf0bf35b4	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-06-26 23:00:19 +01: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
xXVevzZXx	c966620808	Change resourcepack links	2016-06-25 19:52:22 +02:00
xXVevzZXx	fbd9b17ba0	fix playeringametime being 0	2016-06-25 12:35:59 -05:00
xXVevzZXx	8d4f5f0f93	Modularize Minestrike and add Strike Games	2016-06-25 19:11:08 +02:00
Thanos Paravantis	a714144159	Implement new challenge selection system ... The new challenge selection system stores only one instance of each challenge, instead of creating new ones when the next challenge is selected. In addition to that, challenge data is now reset every time the challenge ends to be able to reuse the same resources. In a future commit, I might as well only generate the spawnpoints once in an attempt to make things as quick as possible. The new system may have some bugs, since it's not fully tested with QA yet.	2016-06-25 13:19:09 +03:00
Thanos Paravantis	bc229c44aa	Apply small changes to Zombie Infection	2016-06-25 11:56:55 +03:00
xXVevzZXx	7a55b131d4	Add SmasgDom, Smash Glags, Tiny Smash, Smash Sheep, Sky Smash, Changing Kits and OP Sheep	2016-06-25 09:11:42 +02: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
xXVevzZXx	b34d652617	Add Lucky Bridges, CookieFight and OP MB	2016-06-25 06:35:08 +02: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
xXVevzZXx	285d94a2ca	Fill hotbar editor with glass panes	2016-06-25 04:48:59 +02: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	6028bfb0d0	Make expanded pages work again	2016-06-24 18:06:33 +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	0cda8ab7a3	Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2	2016-06-24 04:11:59 -05: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
cnr	14542d7dac	Close open UIs except for Champions kits	2016-06-24 04:10:08 -05:00
Shaun Bennett	95f7c757cb	Fix booster group naming for the quick menu	2016-06-24 04:07:27 -05:00
cnr	c40e07695c	Only close open UIs when choosing SSM kits	2016-06-24 04:06:28 -05:00
TadahTech	e71fc291d1	Fix cross server invites / joining servers.	2016-06-24 04:01:51 -05:00
Shaun Bennett	560abc933c	Replace underscores with spaces in booster group	2016-06-24 03:16:42 -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	043f9576dd	Fix smash mobs booster group	2016-06-23 22:50:31 -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	eeaf9fa49a	Fix chat in arcade	2016-06-23 23:24:50 -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	e09df7ccfd	fix chests being opened by specs	2016-06-23 16:46:54 -05:00
xXVevzZXx	399ab5c363	fix supply chest protection, absorbtion effect, tnt and level bugs	2016-06-23 16:46:45 -05:00
Sam	f8080d2663	PC-574 ... Another fix for the minestrike vanish problem, this one fixes staff being assigned teams on join.	2016-06-23 22:40:15 +01:00
xXVevzZXx	dc57f7b4e6	add testrank command for SR.Mods	2016-06-23 22:05:26 +02:00
Keir Nellyer	7e33558e2d	Updates to the report system website, semi-works	2016-06-23 20:41:46 +01: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
samczsun	a33b070ae7	Deny placing skulls	2016-06-23 15:34:29 -04: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	7b184eab03	Fix various MySQL errors, further transition to fetching from db	2016-06-23 15:18:00 +01:00
Keir Nellyer	dbf0a79b95	Update deprecated constructors to new-style constructors	2016-06-23 14:48:57 +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	69c7c9edc8	Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2	2016-06-23 03:13:10 -05:00
TadahTech	a29b22b8be	Undo comments.	2016-06-23 03:12:49 -05: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	1ea680cd20	Return to an invisible armor stand name	2016-06-22 21:01:37 -07:00
Shaun Bennett	bcf82ad513	Remove debug messages	2016-06-22 21:00:50 -07:00
Shaun Bennett	761e550d6c	Add shards to announcement message	2016-06-22 20:55:27 -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
samczsun	956cfeac44	Don't recall if player is dead, show UUID for custom items	2016-06-22 21:14:50 -04:00
samczsun	14c6c4215c	Silent chest opening!	2016-06-22 21:12:24 -04:00
samczsun	032b6a77c0	Display UUID for CMod+	2016-06-22 21:12:24 -04:00
samczsun	2e1bb25b0b	Fix exceptions	2016-06-22 21:12:24 -04: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	a795ee3d0f	Fix feature initialisation code	2016-06-23 01:18:16 +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
xGamingDudex	31352a86d7	Added Mavericks module to Hub	2016-06-23 01:17:16 +02: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
AlexTheCoder	56205a2505	Change scoring behavior to increase accuracy, increase power of right click throw, solve players becoming stuck in webs and border, solve ball becoming stuck outside border, perform other small gameplay tweaks	2016-06-22 18:25:32 -04:00
Thanos Paravantis	4e9ea23db8	Fix spawn facing, separate scoreboard functions	2016-06-22 21:47:39 +03: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	ebff8f865b	Undid a little too much.	2016-06-22 00:58:30 -05:00
TadahTech	38a13d01f1	Open server menu properly	2016-06-22 00:56:44 -05:00
TadahTech	d9c5e6323a	Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2	2016-06-22 00:36:23 -05:00
TadahTech	4d31867e98	PC Party updates.	2016-06-22 00:35:57 -05:00
samczsun	d739df8623	UHC is faster now	2016-06-21 22:21:27 -05:00
Sam	0131850fc3	SSM fixes	2016-06-21 20:41:53 +01: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	73183af9bf	Fixing podium npc bug	2016-06-20 00:45:57 -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
Keir Nellyer	71a4b601e5	Some work on getting the chatsnap site to read from the database	2016-06-19 22:21:12 +01:00
Sam	a830b5b388	Removal of debug message and compilation error	2016-06-19 17:12:58 +01:00
Sam	e8b8a3cd66	PC-504 ... Fixes an issue where if players in SSM destroyed all of the spawn point locations, players would not be handled correctly	2016-06-19 17:10:22 +01:00
Shaun Bennett	38058bc670	Confirmation Paging	2016-06-19 05:49:32 -05:00
TadahTech	d572635e99	Fix spelling mistake	2016-06-19 02:19:33 -05:00
TadahTech	5316dfe0c6	Remove Spammy "Loaded default kit message". ... Fixed SSM kits not closing the GUI when the central item is clicked. Fixed Smash Crystals being carried over into the next game.	2016-06-19 02:09:17 -05:00
xXVevzZXx	95649a5f14	adjust amount of gems as win reward	2016-06-18 20:48:55 -05:00
Thanos Paravantis	cac0169827	Add last player to a random team	2016-06-18 23:51:51 +03:00
Thanos Paravantis	4c31e79e20	Allow team challenges with odd amount of players ... May apply more changes or improvements.	2016-06-18 23:18:11 +03:00
Shaun Bennett	a8e67eda88	Rename tip message PC-566	2016-06-18 14:45:39 -05:00
Shaun Bennett	2f0a559441	Add reload command, change podium to lime dye, change tip message	2016-06-18 14:41:32 -05:00
Shaun Bennett	690c6160b9	Green Armor	2016-06-18 14:27:53 -05:00
Thanos Paravantis	0b5e409ab8	Make /lose available for all to use on QA testing	2016-06-18 21:02:54 +03:00
Thanos Paravantis	fc50c90301	Update chicken attack ... - Remove unnecessary clone() method. - Change chat message when chicken attack is triggered. - Rename customizeChicken to setupChicken method. - Use Math.random() instead of UtilMath.random.nextDouble()*100. - Add hologram that displays "Chicken Minion" above every chicken. - Increase look at player radius to 4. - Use generic List instead of ArrayList.	2016-06-18 21:01:46 +03:00
Thanos Paravantis	0368500ad7	Replace QuickChangeBlockAt with resetBlock method	2016-06-18 20:56:59 +03:00
Thanos Paravantis	bccce7593f	Update second Lava Run to patch obsidian bugs	2016-06-18 20:56:33 +03:00
Sam	d167f93486	PC-507 ... Fixes an issue where Blaze's "Firefly" and "Phoenix" abilities did no damage or knockback.	2016-06-18 15:33:39 +01: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
Sam	c19af4e1c5	PC-505 ... Fixed an issue where players could hit team members with Bouncy Bacon and get the health bonus from it.	2016-06-18 00:04:03 +01:00
Sam	09957c203b	PC-506 ... Fixes an issue where the creeper's passive in SSM would activate when they took starvation damage.	2016-06-17 22:24:46 +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
Sam	35b00679e0	PC-516 ... When out of leaps in dragon escape there is no longer the "You can now use Leap" message.	2016-06-17 18:08:37 +01:00
xGamingDudex	d6afe986ea	Update and mavericks-review-hub plugin [stand alone] ... Added NBT Utils Added Format util for color Fixed bounding box calculations in UtilBlock Improved getPlugin in UtilServer Added BuildDataCylinder Added Particle support for saving builds Added Debug command to BuildMavericks Changed some backend DB stuff for saving builds Added mavericks-review-hub plugin: *	2016-06-17 14:14:39 +02:00
Sam	cbca7e9f7e	PC-540 ... Fixed unneeded messages	2016-06-17 12:06:56 +01:00
Sam	63c2f5c855	Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple-sprint	2016-06-17 12:06:17 +01:00
TadahTech	d16f83af00	Attempt to fix duplicate messages bug. I cannot reproduce in testing.	2016-06-16 21:12:17 -05:00
cnr	16f6d75dea	Revert kit name changes ... We can change this back whenever we've migrated to the new name in mssql	2016-06-16 20:36:33 -05:00
TadahTech	3dc93e5c8f	Fix rare GUI reported bug.	2016-06-16 19:46:31 -05:00
TadahTech	2e0965a064	Fix Infestor kit ... Fix rare occurrence of players getting a GUI they shouldn't (reported)	2016-06-16 19:45:36 -05:00
TadahTech	e28d411ee4	Fix evolution not progression. ... Fixed incorrect description in Gladiators Reformatted kits in Bridges	2016-06-16 18:39:37 -05:00
Sam	a20ae6b58d	PC-540 ... Fixes an issue where players could lose water blocks in Speed builders.	2016-06-17 00:31:32 +01:00
Sam	79085c1ecf	PC-541 ... Fixes an issue where glowing redstone ore would not be counted if the expected block was redstone ore.	2016-06-17 00:26:24 +01:00
Sam	3f62dd49ef	Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple-sprint	2016-06-16 23:40:19 +01: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
samczsun	01409af5bd	Fix misc bugs ... Change UtilServer to return proper plugin instance Remove /energyshop debug command Add warning for opening chests while in vanish Fix item maps being broken Fix tutorials possibly wiping inventory Make the project compile	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
Sam	ce23a94f3f	PC-550 ... Fixes an issue where players would be able to interact with blocks on other people's islands in Speed Builders	2016-06-16 12:25:21 +01:00
Sam	1d3e12dfb6	PC-574 ... Fixes an issue where staff in vanish would be placed in the game after each round.	2016-06-16 12:10:39 +01:00
Sam	c3a18813ee	PC-555 ... Fixes an issue where vanished players would show up in the "Give Co-Host" and "Remove player" menus in MPS.	2016-06-16 11:39:51 +01:00
Sam	9e75cc6224	Fixes incorrect item in OITQ ... Players should now get the stone sword that is intended with the leaper kit, assuming it was some merge or pushing error.	2016-06-16 11:12:16 +01:00
Thanos Paravantis	ce7bb82d67	Update blockBreakEffect and replace old methods	2016-06-16 12:48:28 +03:00
Thanos Paravantis	49fa3377fc	Update Lava Run challenge ... This update includes bug fixes and improvements for Lava Run. - Fixed obsidian staying in the map after the challenge has ended. - Obsidian block now appears after the challenge has started, so players cannot spot it before the challenge starts. - Added block break particle when the obsidian changes position. - Players can no longer be damaged from the lava (damage is now disabled on all challenges when they end). - Minor performance update.	2016-06-16 12:37:31 +03:00
TadahTech	e7d76e2ef4	Hot fixes.	2016-06-16 03:56:32 -05:00
samczsun	d6d8d288ca	Prevent TNT duping in Bridges. Fixes PC-132	2016-06-15 22:10:43 -04:00
samczsun	5c2a9d5807	Prefixes are too long or something	2016-06-15 21:52:25 -04:00
samczsun	2d8b7f4ecd	Cleanse lore	2016-06-15 21:52:25 -04:00
samczsun	18d7eba9db	Let's not eagerly delete clans	2016-06-15 21:52:25 -04:00
samczsun	5564b07a36	Remove unnecessary serializations	2016-06-15 21:52:25 -04:00
samczsun	9933345a7b	Remove debug messages	2016-06-15 21:52:25 -04:00
samczsun	67f4361959	Cleanup CustomItems after a while	2016-06-15 21:52:25 -04:00
samczsun	1e5d91e392	Make porting from old legendaries work, fix null commandcenter	2016-06-15 21:52:25 -04:00
samczsun	d49ce27a1b	Make GearShop work again	2016-06-15 21:52:25 -04:00
samczsun	808e506911	Revert "Revert "Clans optimizations"" ... This reverts commit 25a315ac05.	2016-06-15 21:52:25 -04:00
samczsun	45e6cb902f	Save changes	2016-06-15 21:52:25 -04:00
samczsun	a753a3ab07	Clean up legendary code	2016-06-15 21:52:25 -04:00
Shaun Bennett	2f1954e41c	Rename to booster group	2016-06-15 18:18:09 -05: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
Thanos Paravantis	e5cec9c976	Change min players on Treasure Digger back to 4	2016-06-14 14:44:43 +03:00
Thanos Paravantis	47a4e5d9a9	Make chickens attack with more accuracy	2016-06-14 14:41:56 +03: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
xXVevzZXx	bf4de4471a	fix permanent item removal and battle items in inventory	2016-06-11 17:33:12 +02:00
xXVevzZXx	bc77605dcd	make crafted weapons in SG unbreakable	2016-06-11 16:43:56 +02:00
xXVevzZXx	a461e9cf1c	fix inventory being editable while voting phase	2016-06-11 16:27:31 +02:00
xXVevzZXx	75e36d0e08	fix pickup of dropped tnt	2016-06-11 16:13:07 +02:00
xXVevzZXx	5e551a2ba6	fix waller only being able to make two walls	2016-06-11 15:49:31 +02: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
xXVevzZXx	73d8aec494	fix breakable Armor in Wizards	2016-06-11 00:21:04 +02:00
xXVevzZXx	b13b354ce7	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into bugfix/general-bugfixes ... # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java	2016-06-11 00:20:38 +02: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
cnr	06cee364fc	Merge branch 'mopple' into develop	2016-06-10 14:12:07 -05:00
Shaun Bennett	0a204a3b90	Use redis pub/sub to send booster updates	2016-06-10 12:44:27 -05:00
Sam	739fcdc649	Fixes the problem where players could not fire a bow in OITQ ... Users with high latency were not able to fire bows.	2016-06-10 16:29:27 +01:00
Keir Nellyer	a73e1c24b5	Properly calculate user reputation	2016-06-10 15:47:59 +01:00
Thanos Paravantis	f47d2abd87	Hide map quicker from players	2016-06-10 16:44:51 +03:00
Thanos Paravantis	f277e5ca9a	Fix diamond hunt map creation	2016-06-10 16:44:11 +03:00
Thanos Paravantis	1ed27e72a6	Use resetBlock method to set air blocks	2016-06-10 16:08:06 +03:00
Thanos Paravantis	5b021d3ecc	Update all challenges to use new set block method	2016-06-10 16:03:33 +03:00
Thanos Paravantis	00f14131df	Update treasure digger to use new set block method and apply minor improvements on chicken attack	2016-06-10 15:11:48 +03: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	47c4e57ce4	Fix unexpected challenge end	2016-06-10 13:33:20 +03:00
Thanos Paravantis	52ce640391	Merge branch 'develop' into thanos-mineware	2016-06-10 12:15:54 +03:00
Thanos Paravantis	b08abf9a73	Apply zombie infection improvements (wip)	2016-06-10 12:13:01 +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
Shaun Bennett	8bf26dbc11	Use a better podium for NPC, reenable boosters	2016-06-09 18:57:48 -05:00
Keir Nellyer	4503f12738	Implement report caching	2016-06-10 00:28:07 +01:00
Shaun Bennett	35e1c2af65	Use rewardCoinsLater for giving shards	2016-06-09 18:19:22 -05: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
xXVevzZXx	f6b60ad956	fix idle manager to persist teleports and make xp rewards depending on playtime	2016-06-09 15:51:27 -05: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	83be0d7efe	Disable game boosters in arcade	2016-06-09 00:28:48 -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
xXVevzZXx	ce8c8543f6	fix game class not beeing added to modable classes	2016-06-09 01:11:19 +02:00
xXVevzZXx	b66b459e05	implement xp multiplier	2016-06-08 23:40:48 +02:00
cnr	d54bed150e	Merge branch 'mopple' into develop	2016-06-08 12:59:06 -05:00
xXVevzZXx	1aba217c55	slowly increase spider energy	2016-06-08 12:51:07 -05:00
xXVevzZXx	aa1c599b5e	Disable particles in DMT, disable Monster Damage in OITQ, fix teleport out minion despawning, horsman description, ice melting in master builders and energy draining for spider leap in SSM	2016-06-08 12:51:07 -05:00
Shaun Bennett	37a412f1bf	Starting to merge boosters into arcade code	2016-06-07 17:24:24 -05:00
AlexTheCoder	4f00c72d8c	Fix bad autocomplete	2016-06-07 03:58:58 -04:00
xXVevzZXx	9e88174c36	slowly increase spider energy	2016-06-07 00:19:56 +02:00
Sam	7da009d133	Revert "Space in front of disguised player's names when rank = all" ... This reverts commit 3bcfe22835.	2016-06-06 21:10:51 +01:00
Sam	3bcfe22835	Space in front of disguised player's names when rank = all ... Fixes a small problem where there would be a space in front of a user's name if they were disguised as a player with a rank of ALL.	2016-06-06 21:06:40 +01: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
Sam	8066eb939a	PC-500 ... Fixes an issue where players were able to open beacon inventories can give themselves the buffs from it.	2016-06-06 18:14:06 +01:00
Thanos Paravantis	7288c4f131	Fix landing detection on cloud fall and improve clouds	2016-06-06 19:40:54 +03: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
Sam	4b576dbf3c	PC-164 ... Fixes an issue where players would be able to duplicate items in Bridges	2016-06-05 23:03:04 +01: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
Thanos Paravantis	b9a6fdee24	Fix dragon eggs not disappearing after challenge end	2016-06-05 20:13:32 +03:00
Sam	64ff9f193a	PC-403 ... Fixes an issue where if a player was in the respawning state in MCL and their tower was destroyed they would not receive their gold armor	2016-06-05 15:34:20 +01: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
TadahTech	d1fb547d09	Files changed that need to be edited later on with the new Party System. ... Memory commit	2016-06-04 23:02:02 -05:00
TadahTech	e7f4f00433	Files changed that need to be edited later on with the new Party System. ... Memory commit	2016-06-04 22:56:30 -05:00
cnr	8de5280241	Disable /allowCmd	2016-06-04 22:55:15 -05:00
samczsun	fdf500b090	Allow opening chest in incognito... silently!	2016-06-04 23:54:13 -04:00
samczsun	3444c9c7d7	Remove anti-fly-kick	2016-06-04 23:54:13 -04:00
samczsun	dc419cb53c	Add /speed command	2016-06-04 23:54:13 -04:00
samczsun	15a1a63c15	Add try/catch to render map just in case	2016-06-04 23:54:13 -04:00
samczsun	64e1288ba2	Add nullcheck to WarPointEvasion	2016-06-04 23:54:13 -04:00
samczsun	f9826abc1e	Make field in MeridianScepter transient	2016-06-04 23:54:13 -04:00
samczsun	dbf61c5652	Set walk speed on join	2016-06-04 23:54:13 -04: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
AlexTheCoder	f658506e41	Make freezing smoother, implement simple debugging, fix scoring, make bounds smoother, fix 3 pointer determination, and fix description of kit	2016-06-04 20:57:17 -04:00
Ben	1778bd4c28	Final little tweaks to Champions	2016-06-04 18:28:38 +01:00
Sam	05e85523b1	PC-405 ... Fixes an issue where players would be able to fill buckets of water in Bridges and get to the centre before the Bridges has fallen.	2016-06-04 17:42:30 +01:00
Sam	78c5b8a0a3	PC-402 ... Fixes a typo with the BeastMaster kit.	2016-06-04 17:00:09 +01:00
TadahTech	22a438d5c1	Party system rewrite init. Barebones frame work: Total time - 2hrs.	2016-06-04 01:54:17 -05:00
Sam	981943b38b	PC-413 ... Fixes an issue where /vanish could be abused during GameState.Prepare	2016-06-04 00:14:12 +01:00
Sam	f99d4bc14d	PC-164 ... Fixes an issue where players would be able to duplicate kit items by giving them to another player then using their "Early game revive"	2016-06-03 23:29:46 +01:00
xXVevzZXx	5a5a25a799	make "and" bold	2016-06-03 14:15:46 +02: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
Sam	1ff06adf18	Rewrite of how /vanish is handled in game servers (PC-Bug-413) ... Fixes all /vanish based issues where players would be not correctly handled while toggling /vanish in game servers.	2016-06-03 13:13:19 +01:00
xXVevzZXx	f517954064	edit gem/shard display layout	2016-06-03 14:12:55 +02: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	ee10751e23	Players could flip trap doors (PC-Bugs-440) ... Fixes an issue where players would be able to flip trap doors in Dragon Escape to either troll players or give them an advantage.	2016-06-02 22:30:18 +01: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
xXVevzZXx	719ac114d8	change text color	2016-06-02 21:19:54 +02:00
xXVevzZXx	231b55d018	add shards depending on rank	2016-06-02 21:13:12 +02: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
Thanos Paravantis	f86a430266	Use disguisePlayers() and remove clone() method	2016-06-02 22:04:52 +03:00
Thanos Paravantis	daf0247d2d	Add brackets to statements	2016-06-02 22:04:00 +03:00
Thanos Paravantis	656c713132	Elevate egg smash score hologram	2016-06-02 22:03:15 +03:00
xXVevzZXx	aa1ea63337	adding shard reward to games	2016-06-02 20:16:36 +02:00
cnr	894b7db18e	Remove remaining fake ultra tag artifacts	2016-06-02 02:25:15 -05:00
Sam	eaada4acaf	PC-400 ... Fixes an issue where items could be placed in item frames and then would not be able to be retrieved.	2016-06-01 23:40:03 +01:00
Sam	6a423b571a	PC-379 ... Fixes an issue where the map selector for Paintball and Snow Fight did not work in MPS.	2016-06-01 22:40:07 +01:00
Sam	e6ab50c5b3	Merge remote-tracking branch 'refs/remotes/origin/develop' into mopple	2016-06-01 22:04:13 +01:00
Sam	146f878e62	PC-422 ... Fixes a not well constructed kit description. (Medic)	2016-06-01 22:03:13 +01:00
Sam	d83a6cd95c	PC-421 ... Fixes a typo when a user was reported for an inappropriate build. "Buildres" to "Builders"	2016-06-01 21:57:34 +01:00
samczsun	f7adf731a9	Delete query command	2016-06-01 16:17:17 -04: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
Sam	b08c2c9467	PC-149 ... Fixes an issue where entities wouldn't be removed when a build got a "Failure" score.	2016-06-01 15:41:02 +01:00
Sam	4c4363ffaa	PC-409 - 2 ... Not sure why but it missed out an if statement in the previous commit	2016-06-01 14:54:23 +01:00
Sam	df9fe45d7e	PC-409 ... Fixes an issue where the game lobby scoreboard would not account for players in /vanish.	2016-06-01 14:51:22 +01:00
cnr	25a315ac05	Revert "Clans optimizations" ... This reverts commit 89da8790bf.	2016-06-01 00:58:58 -05: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	1a9f58451b	PC-383 ... Fixes the issue where players would not be able to move when joining a game in Mine-Strike as the GetSpectatorLocation() method would be outside the map borders.	2016-05-31 22:35:52 +01:00
xGamingDudex	1141a05310	Add setReviewed method to build repository	2016-05-31 22:18:40 +02:00
xGamingDudex	99027258ee	Added selection method for review queue.	2016-05-31 21:49:56 +02:00
xGamingDudex	22bf3bfd03	Removed create table on startup to follow DB policies	2016-05-31 21:19:34 +02:00
Sam	6b70292837	PC-124 ... Fixes an issue where if a user did /spec pre-game they would not be given a Spell-Book in game.	2016-05-31 20:04:03 +01:00
Sam	d98afaf829	PC-125 ... Fixes a small grammatical error where "effect" was used instead of "affect".	2016-05-31 19:44:29 +01: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
Sam	6a2b43f32d	PC-130 ... Fixes an issue where you could right click the UHC item in the set game page which would allow you to have a golden apple in game.	2016-05-31 14:15:19 +01:00
Sam	c7757117fc	PC-148 ... Fixes a very trivial issue with Ocelots being named incorrectly	2016-05-31 13:40:20 +01:00
Sam	3bdc541c9d	Debug message removal	2016-05-31 11:12:55 +01:00
AlexTheCoder	25da5fc132	Format the game to work with the map	2016-05-30 23:58:22 -04:00
Sam	6db4c3acc7	PC-203 ... Fixes the issue of "auto-bowing" in OITQ	2016-05-31 01:46:50 +01:00
Sam	55317730fa	Merge remote-tracking branch 'refs/remotes/origin/develop' into mopple	2016-05-30 23:21:38 +01:00
Sam	cb2dd508bd	PC-413 (Fixed) ... Fixed some aggressive auto-formatting	2016-05-30 23:21:20 +01:00
Sam	4a0558d5c8	PC-413 ... If staff join any game normally with /vanish disabled, then vanish before the game starts, you still participate in the game except you're invisible to everyone.	2016-05-30 23:11:19 +01:00
Alex-The-Coder	abb2729c0e	Remove arcade logitech advertisement	2016-05-30 14:46:29 -04:00
Alex-The-Coder	ff415a4569	Remove hub logitech advertisement	2016-05-30 14:44:07 -04:00
Shaun Bennett	4e9a48ab4f	Finish off the tip system	2016-05-30 12:02:12 -05:00
xXVevzZXx	365dd0e561	Disable particles in DMT, disable Monster Damage in OITQ, fix teleport out minion despawning, horsman description, ice melting in master builders and energy draining for spider leap in SSM	2016-05-30 14:44:42 +02:00
Thanos Paravantis	b258ec69ac	Update Deadly TNT and remove Fishing Day ... Deadly TNT was updated in order to display a cooldown bar until the next TNT throw, just above the player's inventory. Fishing Day was removed from rotation as requested.	2016-05-30 14:54:10 +03: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
Thanos Paravantis	76f161f9ed	Update Zombie Infection and Zombie Wrapper	2016-05-30 12:48:07 +03:00
Thanos Paravantis	a918f9067d	Add double plant generation and fix life reduction bug	2016-05-30 12:46:04 +03:00
Thanos Paravantis	8ee53c935b	Use getPlayersWithRemainingLives() on map creation ... The getPlayersAlive().size() has been replaced with getPlayersWithRemainingLives(), since during map generation players have not been reset yet. With that, all players are selected properly.	2016-05-30 12:43:35 +03:00
Thanos Paravantis	d11c3c76eb	Add chicken attack info message ... Every time chicken attack is triggered for a player, a chat message will be displayed that explains why the player is being attacked by chickens. Also, two debug messages were removed, since they were no longer used.	2016-05-30 12:39:17 +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
Shaun Bennett	4bbf39ca1c	Update JOOQ files	2016-05-28 08:59:03 -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
xGamingDudex	31a941e1c0	Changed repository to upload schematic data instead of test data	2016-05-28 01:32:32 +02:00
xGamingDudex	02863d4a6a	Updated some of the Mavericks reposetory to use place instead of won ... This also implements a small schematic tester inside the Mavericks Game. Converted some NautHashMaps into regular HashMaps	2016-05-28 01:23:14 +02:00
xGamingDudex	1d20e84107	Fixed support for Entities and TileEntities for schematics ... Fixed some NBT tools Added and tested schematic support for entities and tile entities All conversion and creations for schematics should now also be fixed. So creating schematics from two points inside a world. Converting schematics to bytes and converting bytes to schematics.	2016-05-28 01:21:11 +02:00
cnr	dfbb4dca11	Update chat-spam message with coupon link	2016-05-27 13:18:07 -05:00
Sam Sun	59c26bdcd7	Undo leap change	2016-05-27 13:41:49 -04:00
Ben	5899933d8d	[Mage/LifeBonds] Make health be taken from your own rather than the nearest player with highest health. [PC-350]	2016-05-27 13:46:06 +01: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	84276f68a0	Change help message rank	2016-05-26 14:29:13 -05:00
samczsun	f7e0bc7d16	Don't log if culled is 0	2016-05-26 14:29:13 -05:00
samczsun	0794761435	Forgot a nullcheck	2016-05-26 14:29:13 -05:00
samczsun	f1f464f3a4	Change listener priority again. Fixes PC-209	2016-05-26 14:29:13 -05:00
samczsun	daf1d1a9ba	Fix duplication glitch using fissure	2016-05-26 14:29:12 -05:00
Sam Sun	ef0dcdb0df	Bump invsee required rank too	2016-05-26 10:24:50 -05:00
Sam Sun	1bf8ccfc43	Bump worldevent required rank	2016-05-26 10:24:50 -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
xGamingDudex	806fa7fca4	Added MavericksRepository (+ forgot schematic data in last commit) ... +Tweaked some MasterBuilders code	2016-05-26 01:19:05 +02:00
xGamingDudex	7a0eea7aa0	Added better saving and loading methods to Schematics ... Added some extra NBT utils Added support for TileEntities and Entities to schematics	2016-05-26 01:17:19 +02: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
AlexTheCoder	ba1eeedf93	Implement scoreboard display and handle parsing of map information	2016-05-25 01:59:48 -04:00
AlexTheCoder	e0960c8705	Finish fleshing out api methods and game structure, and implement dynamic scoring manager	2016-05-24 18:30:20 -04:00
samczsun	9da9dce398	Fix mimic, allow chests and invite. Fixes PC-375	2016-05-24 16:40:25 -04:00
samczsun	2991bec44d	Fix listener priorities (again). Fixes PC-370	2016-05-24 16:04:15 -04:00
samczsun	2680c2b244	Don't apply attributes on friendlies. Fixes PC-369	2016-05-24 15:58:44 -04:00
samczsun	9af2c7e9f4	Restore hunger after Hold. Fixes PC-334	2016-05-24 15:38:18 -04:00
samczsun	9acdbd7cbe	Don't allow placing banners and string. Fixes PC-333	2016-05-24 15:38:03 -04:00
Sam Sun	9853ef824e	QA Pass #2 - Comment WorldManager, optimize searching	2016-05-24 12:24:14 -05:00