Mineplex2018-withcommit

JarvisBigBalls/Mineplex2018-withcommit

Author	SHA1	Message	Date
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
AlexTheCoder	b952de856e	Add a description for the Magnetic Maul and switch ConcurrentHashMap to HashMap in the Meridian Scepter	2016-05-24 13:15:29 -04:00
samczsun	f32e648691	QA Pass #1 Remove potential main thread IO in ItemMapManager Don't construct search string if limit is reached Also cleaned up WorldManager to be more efficient	2016-05-24 13:15:29 -04:00
samczsun	2f993dbe66	Fix Wind Blade, Hyper Axe	2016-05-24 13:15:29 -04:00
samczsun	4ba3148df7	Finish invsee	2016-05-24 13:15:29 -04:00
samczsun	ec0e1b9849	New invsee implementation	2016-05-24 13:15:29 -04:00
samczsun	63e3cc8e12	Add nullcheck	2016-05-24 13:15:29 -04:00
samczsun	d8b5dba3fc	Fix Meridian Scepter	2016-05-24 13:15:29 -04:00
AlexTheCoder	1dc5a0d712	Revamped Meridian Scepter attack	2016-05-24 13:15:29 -04:00
samczsun	516ad5a640	Check cancellation before continuing Takedown. Fixes PC-277	2016-05-24 13:15:29 -04:00
samczsun	72a2aa926f	Change event priority again. Fixes PC-216	2016-05-24 13:15:29 -04:00
samczsun	981bed5e37	Limit clan searching. Fixes PC-331	2016-05-24 13:15:29 -04:00
samczsun	e0f4c9cbc8	Update Broadsword regen	2016-05-24 13:15:29 -04:00
samczsun	14c60ec3ba	Delay recall by one tick. Fixes PC-328	2016-05-24 13:15:29 -04:00
samczsun	51c9301799	Consider leap level. Fixes PC-330	2016-05-24 13:15:29 -04:00
samczsun	41846f835d	Bump listener priority, change wording. Fixes PC-308	2016-05-24 13:15:29 -04:00
samczsun	c172d226c4	Add bypass for testing servers to skip tutorials	2016-05-24 13:15:29 -04:00
samczsun	08784d3f0a	Ignore float kick for Wind Blade. Fixes PC-314	2016-05-24 13:15:29 -04:00
samczsun	786c60537e	Remove /c trust from help. Fixes PC-280	2016-05-24 13:15:29 -04:00
Sam Sun	cd0e59087a	Don't drop items from hidden slimes. Fixes PC-276	2016-05-24 13:15:29 -04:00
samczsun	9141ed645a	Fix fissure anvil repair exploit. Fixes PC-312	2016-05-24 13:15:29 -04:00
samczsun	ea43dca9af	Don't allow placing TNT in tutorial. Fixes PC-307	2016-05-24 13:15:29 -04:00
samczsun	d29d5dd5e4	Actually fix PC-279	2016-05-24 13:15:29 -04:00
samczsun	89da8790bf	Clans optimizations Key notes: * RAM usage decreased on startup * Startup speed much quicker * Map is entirely rendered on startup Details: Changed TutorialWorldManager Stack -> LinkedList because no need for synchronization Documented map methods and magic numbers Remove loading all chunks on startup Render map on startup Optimize map rendering by replacing ArrayList with LinkedList Optimize map rendering by reading chunk directly from disk and caching to prevent entity ticking Optimize map rendering by using a global BlockPosition Save results for showing zoom	2016-05-24 13:15:29 -04:00
samczsun	7c66c98338	Clean up Farming	2016-05-24 13:15:29 -04:00
samczsun	173a6bb143	Delete IncognitoHidePlayerEvent	2016-05-24 13:15:29 -04:00
samczsun	2675789f59	Compare commands with equals. Fixes PC-116	2016-05-24 13:15:29 -04:00
xGamingDudex	f550df5a4b	Initial game commit.	2016-05-24 13:31:59 +02:00
Ben	1e0b94d870	[BlockHunt,Wizards,Champions] Disable particle effects [PC-156]	2016-05-24 12:08:18 +01:00
Ben	bad9077144	[Ranger/VitalitySpores] Change to if you take damage and then go 10 Seconds without taking more damage, you will receive Regen 2 for 6(+1 pl) Seconds; if you take damage during that regen you lose it [PC-354]	2016-05-24 11:09:05 +01:00
Shaun Bennett	434ada2e86	Fix merge issues	2016-05-24 19:14:52 +10:00
Shaun Bennett	1377e6724f	Merge with develop	2016-05-24 19:10:55 +10:00
Shaun Bennett	b6376cae2f	Remove googles http api (no longer needed) and add apache http to core.common	2016-05-24 17:23:17 +10:00
Shaun Bennett	12c5ba80b7	API Endpoints, Web calls, Gem Fountain Schematics, Game Menu Update, Booster implementation	2016-05-24 17:13:33 +10:00
Ben	bc3ec4088a	[Ranger/Sharpshooter] Missing two shots causes the damage bonus to reset. [PC-352]	2016-05-24 01:16:11 +01:00
Ben	5791cc5dec	[Assassin/Evade] Buff the skill in multiple ways [PC-355]	2016-05-24 01:15:29 +01:00
Ben	8bb9811a80	[Assassin/Blink] When de-blinking set the rotation of the player to the rotation that was present at the time of the de-blinking rather than the rotation of the player when they blinked. [PC-359]	2016-05-24 00:28:48 +01:00
Ben	243044b921	[Skill/Assassin] Remove Rest & Fitness from. [PC-358 AND PC-357]	2016-05-24 00:25:32 +01:00
Ben	5448c42e45	[Assassin/Recall] Don't allow use when in water [PC-360]	2016-05-23 23:46:33 +01:00
Ben	609aa5177a	[Ranger/WolfsPounce] Lower damage [PC-353]	2016-05-23 23:45:42 +01:00
Ben	8da4ac3135	[Brute/FleshHook] Deal more damage/pull velocity when charging up more [PC-340]	2016-05-23 23:42:12 +01:00
cnr	494eafb97f	Use file.mineplex.com for resource packs	2016-05-23 07:52:22 -05:00
LCastr0	3ad7fc5f21	Adds old Mr.Punchman name Adds another fix for winroom speed	2016-05-22 21:46:22 -03:00
Ben	e5b8636298	[Mage/Immolate] Do not allow use whilst in water [PC-351]	2016-05-23 01:23:08 +01:00
Ben	d019d27d23	[Mage/Blizzard] Increase energy usage. [PC-347]	2016-05-23 01:22:39 +01:00
Ben	af2eef5afe	[Mage/Inferno] Increase energy usage [PC-348]	2016-05-23 01:22:15 +01:00
Ben	02dc9ca3f9	[Brute/DwarfToss] Fix the water check being in the wrong location [PC-336]	2016-05-23 01:21:47 +01:00
LCastr0	ed68ef332b	Fixes for Win Room (Players were able to see other players) Added command to allow other players to run ranked commands Fixes code styles	2016-05-22 21:05:48 -03:00
Ben	48e998f630	[Knight/HiltSmash] Lower damage (previous commit for this ticket for some reason did not contain the lowered damage) [PC-343]	2016-05-23 01:01:27 +01:00
Ben	d8a3ebc704	[Knight/AxeThrow] Lower damage and increase recharge time. [PC-345]	2016-05-23 00:59:11 +01:00
Ben	2138330c70	[Brute/DwarfToss] Move Invulnerability condition appliance outside of the 5 tick delay as that allowed players to get attacked right after being thrown. [PC-336]	2016-05-23 00:57:46 +01:00
Ben	be007cd62f	[Knight/Swordsmanship] Change my previous commit for this skill a little bit, as it was clarified to be slightly different than I understood it to be. [PC-341]	2016-05-22 20:52:34 +01:00
Ben	ceab00f979	[Brute/BlockToss] Change recharge time and remove redundant null check. [PC-338]	2016-05-22 20:51:22 +01:00
xXVevzZXx	c984bbfc8a	make it possible to add stats to the brawl games	2016-05-22 00:29:58 +02:00
LCastr0	92b6abc884	Fixes merging bugs	2016-05-20 23:53:27 -03:00
LCastr0	0109e2f2dd	Fixes for Illuminated chest Fixes for /check command (Support)	2016-05-20 23:33:58 -03:00
Ben	e701e0c0db	[Mage/IcePrison] Lower the per level lasting time of ice. [PC-349]	2016-05-21 00:46:57 +01:00
Ben	383f9005e1	[Mage/MagmaBlade] Lower damage [PC-346]	2016-05-21 00:44:16 +01:00
Ben	b1933eddc7	[Brute/BlockToss] Increase recharge time and fix the held block hitbox blocking the holder from getting attacked. [PC-338]	2016-05-21 00:22:57 +01:00
xXVevzZXx	f5d0f5209e	decrease bridge fall time and instant kill on map leave in op bridges and disable health regain in gladiators champions after poison is active	2016-05-21 00:29:04 +02:00
xXVevzZXx	28901f378a	fix up speed bridges item give out	2016-05-20 23:27:49 +02:00
xXVevzZXx	0fb84e57c1	Merge branch 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java	2016-05-20 23:26:54 +02:00
Thanos Paravantis	d1f94bcba5	Apply minor changes to block lobbers challenge	2016-05-20 23:12:23 +03:00
Thanos Paravantis	e45134f8d5	Fix treasure digger map creation	2016-05-20 20:39:14 +03:00
Ben	55b0ed8eb5	[Knight/HiltSmash] Change base damage from 3 to 2 [PC-343]	2016-05-20 15:50:33 +01:00
Ben	8ba2132f81	[Knight/Swordsmanship] Buff base from 1 charge to 2 charges. [PC-341]	2016-05-20 15:49:57 +01:00
Ben	07c5e16e44	[Brute/Intimidation] Update lore to match the new damage distance [PC-337]	2016-05-20 15:07:57 +01:00
Thanos Paravantis	c828d37189	Rename InfestationZombie to ZombieWrapper	2016-05-20 13:34:21 +03:00
Thanos Paravantis	1dffc9b78e	Modify hologram height gain	2016-05-20 13:26:38 +03:00
Thanos Paravantis	745198d59e	Refactor punch the pig challenge	2016-05-20 13:25:30 +03:00
Ben	0883937316	[Knight/Riposte] Change base recharge from 10s to 14s [PC-342]	2016-05-20 11:06:23 +01:00
Ben	6020881af2	[Brute/CripplingBlow] Change knockback modifier from -50% to -25% [PC-339]	2016-05-20 11:03:15 +01:00
Ben	9154848ed9	[Brute/FleshHook] Lower base damage. [PC-340]	2016-05-20 10:23:45 +01:00
Ben	53fcab596a	[Brute/Intimidation] Lower range boost per level. [PC-337]	2016-05-20 10:17:59 +01:00
cnr	6b7cfd3eaa	Merge branch 'develop' into project-cosmetics	2016-05-20 03:23:46 -05:00
cnr	d6750c7d91	Disable /unlockCosmetics on production servers	2016-05-20 03:23:27 -05:00
LCastr0	22fb507871	Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics	2016-05-20 05:14:29 -03:00
LCastr0	c58e0f3e30	Fixes for the 1 Shard thing (Next time, for testing, use /unlockCosmetics)	2016-05-20 05:11:59 -03:00
Shaun Bennett	efb264dd75	Hook into Booster API	2016-05-20 16:58:58 +10:00
xXVevzZXx	ef164091b8	make small Adjustments to gamemodes, make a fix for Absorbtion hearts and fix format	2016-05-20 02:39:19 +02:00
Ben	d52262c3fc	(Dwarf Toss) Add short invincibility for thrown players. Don't allow use in water. [PC-336]	2016-05-20 01:25:02 +01:00
Ben	dc7ea4e9c7	Brute Takedown skill nerf [PC-335]	2016-05-20 01:09:46 +01:00
cnr	f76b3f7d70	Freeze players when preparing for Master Builders. Fixes PC-127 This prevents players from quickly flying to other players' areas before the game starts.	2016-05-19 18:02:46 -05:00
cnr	4351f6f1f0	Prevent muted MPS (co-)hosts from using /bc. Fixes PC-113	2016-05-19 18:02:46 -05:00
cnr	2ae6859e65	Apply slowness to Infiltrators in enemy spawn area. Fixes PC-185	2016-05-19 18:01:44 -05:00
cnr	419bf2a755	Fix mining drops in Bridges. Fixes PC-133 This change prevents players from using inadequate tools to mine ores, e.g., using a stone pickaxe or fists to mine diamond ore.	2016-05-19 18:01:27 -05:00
AlexTheCoder	14a0ff8334	Add in data loc system	2016-05-19 16:28:14 -04:00
Thanos Paravantis	28f1d45b1c	Update achievement category game enum	2016-05-19 20:55:22 +03:00
Thanos Paravantis	472d3881a0	Merge branch 'develop' into thanos-mineware	2016-05-19 20:49:45 +03:00
Thanos Paravantis	87c8c7efa4	Merge branch 'master' into thanos-mineware	2016-05-19 20:42:43 +03:00
Thanos Paravantis	7e40141794	Fix spectators being teleported to map center	2016-05-19 20:40:13 +03:00
cnr	7f44281441	Merge branch 'develop' into project-cosmetics	2016-05-19 10:04:19 -05:00
cnr	18daf45298	Prevent wither assault spectators from reviving teammates. This is a fix in the same vein as PC-103 (`c7970d1`), but applied to the Wither Assault game	2016-05-19 09:51:21 -05:00
Shaun Bennett	012edfed45	Use loaded schematics to display fountain progress	2016-05-18 18:04:21 +10:00
Shaun Bennett	8d7ef7cc9a	Fix UtilBlock setting ghost blocks	2016-05-18 18:03:54 +10:00
LCastr0	11db05b6bf	Fixes spelling of MineStrike gun Fixes spectators not being sent to the winroom	2016-05-18 03:58:50 -03:00
Shaun Bennett	e3833b95ad	Update Gem Fountain purchase gui	2016-05-18 15:59:04 +10:00
TadahTech	3479d6e318	Fix incognito.	2016-05-17 18:12:05 -05:00
TadahTech	38a0b593ee	Fix height for 1.9 and 1.8 users. Thanks QA for not fully testing....	2016-05-17 18:11:28 -05:00
TadahTech	51fd23ff84	Patch Bomber dupe glitch in Bridges in a better fashion. Fix MCL Head Hunter achievement.	2016-05-17 18:11:11 -05:00
Ben	35c7b9a2bd	Incognito Updates: -ADD: Prompt in Tab to identify who is in vanish (Can be a * or [Vanish]) -ADD: Make it so /stats don't work on vanished staff. -ADD: Make sure it can be toggled off on /vanish again or network leave. Staff get stuck with it when resigning. Should stay on in-between lobbies.	2016-05-17 18:10:07 -05:00
Ben	8a75a5098c	Remove hub invisibility preference for all but Admins and higher.	2016-05-17 18:08:01 -05:00
Ben	014ce137fc	If a player uses /a regardless of if staff are online, offline, or vanished, making it always yield a response telling the player that if there are staff currently online, they will receive a reply soon - removing the "there are no staff online" message. Also a 60s Recharge for this.	2016-05-17 18:03:18 -05:00
Ben	6760c07e6c	Fix staff members getting stuck in both Incognito mode and the Hub Invisibility preference, and not being able to toggle either off them off because Incognito would stop Hub Invisibility from getting toggled (on OR off), and vice versa.	2016-05-17 18:00:20 -05:00
AlexTheCoder	141cafcf28	Implement initial game code and add skeleton for full play	2016-05-17 17:29:23 -04:00
xXVevzZXx	6e9b0e4fa5	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java	2016-05-17 14:41:17 +02:00
cnr	6042be2d2f	Refactor clans ban functionality and remove UtilStreams	2016-05-17 05:57:27 -05:00
cnr	f5cf751622	Revert "Temporarily disable clans ban functionality" This reverts commit `b47c49d93b`.	2016-05-17 05:51:18 -05:00
TadahTech	43cadf564e	Fix Carl the Creeper. Fix Bridges TNT exploit.	2016-05-16 22:03:27 -05:00
samczsun	1fc4239b89	Determine whether Ice Prison target is valid. Fixes PC-281	2016-05-16 15:44:22 -05:00
Alex-The-Coder	1497662b2e	Restrict help display for main Game Command	2016-05-16 03:16:26 -04:00
William Burns	4633b99ad4	Don't block QA from testing, whoops.	2016-05-16 08:07:42 +01:00
LCastr0	fb63b3a1a4	Fixes for winroom command, and illuminated chest	2016-05-15 22:49:10 -03:00
LCastr0	42eef838b3	Fixes podium not being enabled by default	2016-05-15 21:33:36 -03:00
xGamingDudex	a27a618b2f	Made debugging tools only available on test servers	2016-05-16 02:04:15 +02:00
xGamingDudex	816a7ca232	Re-Activated chest buttons	2016-05-16 01:57:58 +02:00
xGamingDudex	d92ad9c53f	Made illuminated chest purchasable and added appropriate lore	2016-05-16 01:51:40 +02:00
LCastr0	511726f72a	Treasure chest coin checker for test servers	2016-05-15 20:43:46 -03:00
xGamingDudex	4ebf48bd45	Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics	2016-05-16 01:34:08 +02:00
xGamingDudex	8ad7646128	Edits to treasure chests	2016-05-16 01:33:54 +02:00
xGamingDudex	f8d5bd3c11	Fixed treasure chests Items would sometimes pop out of chest blocks You could open illuminated chests before they were converted to real chests	2016-05-16 00:51:33 +02:00
LCastr0	09b7fbdbbe	Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics	2016-05-15 18:48:00 -03:00
LCastr0	4f79ec6551	Pinata fixes	2016-05-15 18:47:09 -03:00
xGamingDudex	b4aad690e5	Fixed some rewards and added party trail to chests	2016-05-15 23:31:10 +02:00
xGamingDudex	fdf167953f	Fixed emerald set order	2016-05-15 23:30:17 +02:00
xGamingDudex	ca556f7846	Fixed win room would not sort player properly for solo games	2016-05-15 23:29:58 +02:00
xGamingDudex	7073ba4e6a	Fixed gadgets in the win room	2016-05-15 23:29:24 +02:00
xGamingDudex	1e6dda2d7d	Cleaned up some win effect backend code & fixed kits working in winroom	2016-05-15 23:28:12 +02:00
xGamingDudex	14f7e64a77	Fixed Animator and removed duplicate test call in Game.java	2016-05-15 21:05:37 +02:00
xGamingDudex	d850bed725	Minor code tweaking * Made reward manager ammo multiplier private final field * Removed old commented code from WinEffectPodium, WinEffectLavaTrap, ParticleMusic, ParticleEmerald, ParticleBlood * Cleaned up the GameModifierMineStrikeSkin filter * Removed unused Math#isBetween(double, double, double) method * Changed Animator to use PriorityQueue	2016-05-15 19:43:07 +02:00
xGamingDudex	29a0ba565b	Added better hollow calculations to ShapeBox and UtilBlock	2016-05-15 17:05:11 +02:00
xGamingDudex	296f304d29	Changed the way UtilItem.dropItem handles despawning	2016-05-15 17:04:50 +02:00
xGamingDudex	a8db293bcf	Moved JavaDocs from ICosmeticShape (now removed) to CosmeticShape	2016-05-15 17:04:25 +02:00
xGamingDudex	97f82e422d	Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/animation/Animator.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/animation/AnimatorEntity.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ICosmeticShape.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ShapeWings.java	2016-05-15 16:03:36 +02:00
xGamingDudex	aa36097729	Made Animator abstract and added final modifiers	2016-05-15 15:58:05 +02:00
xGamingDudex	22e54557d8	Fixed cleaning method for WineffectRiseOfTheElderGuardian The class contained commented code, removed when debugging	2016-05-15 15:33:42 +02:00
xGamingDudex	abddc446fd	Added java docs and tweaked code * Fixed possible duplication bug in MulitBlockUpdaterAgent * Tweaked some of the factor methods for Shape.java * Cleaned some code in ShapeWings.java	2016-05-15 15:32:44 +02:00
xXVevzZXx	44e52f4b5b	Add javadoc to added files	2016-05-15 10:24:29 +02:00
phobia	a67fec95fc	Remove ultra tag	2016-05-15 03:21:58 -05:00
xXVevzZXx	a1a6abc1ca	Add champions gladiators and fix tiny winners typo	2016-05-15 10:13:06 +02:00
LCastr0	1cc44d1b3e	Fixes for the following classes: KitGameModifier KitModifierType MultiBlockUpdaterAgent Shape GadgetManager KitModifierType HatLovestruck HatSecretPackage SetLove Animator AnimatorEntity AnimationPoint ICosmeticShape UtilText KitGameModifier KitModifierType Removed build.xml and org.eclipse.jdt.ui.prefs	2016-05-15 00:20:07 -03:00
xGamingDudex	24f7a4b409	Added "(Minestrike Weapon Skin)" suffix to MS skins in treasure rewards	2016-05-14 18:53:09 +02:00
samczsun	b2e92fdf15	Don't pass on INTERACT_AT as INTERACT. Fixes PC-114	2016-05-14 09:42:28 -05:00
LCastr0	20b9f428b4	Fixes Illuminated Chest's Lore Fixes Pinata Burst not being saved Fixes AWP Asiimov and XM1014 Tranquility materials Removes Fireworks WinRoom Changes prices of things from 1 shard to Treasure Chest More unused imports removed Fixed ANGLE_WING_PATTERN -> ANGEL_WING_PATTERN Adds javadoc to UtilColor.applyColor() Adds javadoc to UtilColor.getNextColor() defaultLeatherColor -> DEFAULT_LEATHER_COLOR Adds suggestions for UtilColor Adds final modifier to _worldBorders (UtilPlayer) Changed _worldBorders key from String to UUID Adds suggestion for UtilPlayer Adds final modifier to _type (GameModifierSubPage) Adds final modifier to _type and _kitType (KitGameModifierPage) DefaultDencity -> DefaultDensity (Shape) Changed <Vector> to <> (Shape) dencity -> density (ShapeBox, ShapeGrid, ShapeSphere) Using speed and count in constructor (ShapeWings) Removed empty constructor (WorldGenCleanRoom, MultiBlockUpdaterAgent) Adds final modifier to all fields (AnimationPoint)	2016-05-14 01:18:37 -03:00
Shaun Bennett	b802cdec6d	Rename shop to "Fountain Keeper"	2016-05-14 14:01:28 +10:00
xXVevzZXx	63c44afa10	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants	2016-05-13 22:05:27 +02:00
xXVevzZXx	df5c628c35	add new gamemodes Tiny Winners, Random Kit SSM, UHC SW, UHC SG and improve OP SG, OP SW, OP Bridges, Dukes of decoration, OP Gladiators, Faster than Light, Bunny Hopper and Countdown	2016-05-13 20:23:04 +02:00
xGamingDudex	0544e86cb1	Started fixing the stat tracking for MS knife	2016-05-13 02:39:43 +02:00
xGamingDudex	2cc609b67e	Moved some rewards from normal to valentines	2016-05-13 01:28:26 +02:00
xGamingDudex	35ab155756	Removed unnecessary lore from minestrike game modifiers	2016-05-13 01:20:06 +02:00
xGamingDudex	d34f77a381	Moved some rewards from normal to winter chest	2016-05-13 01:19:06 +02:00
xGamingDudex	9c2c415eb2	Fixed the emerald trail leaving from idle to moving	2016-05-13 01:14:00 +02:00
xGamingDudex	3bb3821fa9	WinEffect gadget disable and MineStrike name and data update	2016-05-13 01:04:35 +02:00
xGamingDudex	4958ab8149	Bug Fixes * Fixed Menu page adding glow to win effects if game modifiers were active * MineStrike skins were not properly applying material and data * Skinned knife was not dealing damage	2016-05-13 00:38:56 +02:00
xGamingDudex	06e583c05e	Added flat podium to Firework and Punchman	2016-05-12 23:50:41 +02:00
xGamingDudex	956d64d750	Git Merge Import Fix	2016-05-12 23:46:39 +02:00
xGamingDudex	29d4db0bfd	Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics Conflicts: Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java	2016-05-12 23:46:17 +02:00
xGamingDudex	2db98613ab	Cosmetic Update * Redid the Reward manager Added new rewards to the chest and changed some values * Fixed some MineStrike skin bugs * Removed particles/death effects from Minestrike * Removed old test minestrike skins * Moved minestrike skins to correct package * Changed the illuminated chest animation a bit * Fixed other minor bugs	2016-05-12 23:42:37 +02:00
AlexTheCoder	fab24e2139	Allow admins to be opped on testing servers	2016-05-12 17:24:37 -04:00
LCastr0	6f4c6bc545	Fixes counter on WindUp suit Removes kit modifier categories	2016-05-12 15:00:43 -03:00
Sam Sun	2ae072f5b7	Rename modules to correct name	2016-05-12 11:44:35 -04:00
Keir Nellyer	13ff2e5263	Fix query for pulling report profiles Previously we didn't check that the user actually reported an issue so in effect we were creating a report from every single logged incident (regardless of whether the user in question was involved).	2016-05-12 14:38:04 +01:00
Keir Nellyer	814f3516de	Make the chat abuse color easier on the eyes Dark blue [bold] is hard to read, dark aqua [bold] should be easier to read.	2016-05-12 14:22:19 +01:00
Alex-The-Coder	05312a9bef	Update where players spawn upon first join... ...to avoid flight kick upon login	2016-05-11 21:57:42 -04:00
xGamingDudex	276f572009	Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics Conflicts: Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathPinataBurst.java	2016-05-10 20:21:37 +02:00
xGamingDudex	1b0b9a894b	Tweaked some cosmetics * Changed Party Death to firework icon * Removed idle spark from Emerald Trail * Changed wing style to pixie from angle on infernal wings * Added black dots to YinYang Started some work on the RewardManager	2016-05-10 20:20:44 +02:00
LCastr0	4fada6de49	Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics	2016-05-10 12:45:22 -03:00
LCastr0	5b8ff933b1	Removed more unused imports Fixed some lores and names for cosmetics Renamed some classes to match Set name Commented out the Lovely set (Duplicate of Cupid's Love) Fixed set descriptions Added 'Comming soon...' to set bonuses	2016-05-10 12:44:45 -03:00
Conrad	8eba2c9ccb	Merge pull request #59 from Mineplex-LLC/feature/logitech-brand Move billboard up 1	2016-05-09 11:55:22 -04:00
AlexTheCoder	7932258579	Move billboard up 1	2016-05-09 03:44:16 -04:00
AlexTheCoder	de1fabf53d	Disable report system as it is not ready to go live	2016-05-09 02:10:51 -04:00
cnr	4aa44cd796	Merge branch 'develop' into clans/beta	2016-05-08 16:53:48 -05:00
Keir Nellyer	7c80c3826b	Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report	2016-05-08 21:49:16 +01:00
Conrad	ac86f3ac8c	Merge pull request #55 from Mineplex-LLC/alex-mcl Change the visuals of the Billboards and of ELO's display in the stat…	2016-05-08 13:29:23 -04:00
AlexTheCoder	34e8d65f4d	Change the visuals of the Billboards and of ELO's display in the stats menu to be more user friendly	2016-05-07 21:16:12 -04:00
cnr	b47c49d93b	Temporarily disable clans ban functionality This can be reverted when clans bans are properly audited/fixed/tested.	2016-05-07 19:02:19 -05:00
Keir Nellyer	b68127b111	Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report	2016-05-08 00:37:59 +01:00
Keir Nellyer	b1a41c3cb3	Make chat abuse colour easier on the eyes Dark blue [bold] is hard to read, dark aqua [bold] should be easier to read.	2016-05-07 22:48:49 +01:00
xXVevzZXx	d75ba9d4c0	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants	2016-05-07 22:26:15 +02:00
phobia	38f22b1577	Disable obsidian dropping after breaking THE BLOCK	2016-05-07 19:51:19 +10:00
xGamingDudex	5649939f8c	Removed some old disabled code.	2016-05-06 21:59:18 +02:00
xGamingDudex	e04a897488	Added some pre-animation to chicken win effect. Removed some comments.	2016-05-06 21:58:31 +02:00
xGamingDudex	0fea90516b	Alternative emerald trail for full set	2016-05-06 13:24:06 +02:00
xGamingDudex	f58db6ee3b	Removed firework from party death Replaced the death effect with item drops instead	2016-05-06 13:12:28 +02:00
xGamingDudex	d60fea4f76	Added chicken and guardian win room schematic handlers	2016-05-06 13:00:45 +02:00
Shaun Bennett	60dce9ef1b	Change LT, Owner, Developer, Admin to DARK_RED	2016-05-06 13:43:30 +10:00
LCastr0	97ef801e3d	Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics	2016-05-06 00:40:55 -03:00
LCastr0	49c45628a2	Removed more unused imports Fixed some lores and names for cosmetics Renamed some classes to match Set name Commented out the Lovely set (Duplicate of Cupid's Love)	2016-05-06 00:40:22 -03:00
Shaun Bennett	93c2886601	Add boosters to inventory menu	2016-05-06 13:31:59 +10:00
xXVevzZXx	9f2189d173	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java	2016-05-06 03:40:00 +02:00
Conrad	55d40a1a6b	Merge pull request #53 from Mineplex-LLC/feature/logitech-brand Changed design of billboard and fixed its centering in hubs	2016-05-05 18:33:15 -04:00
AlexTheCoder	f329051399	Changed design of billboard and fixed its centering in hubs	2016-05-05 18:25:51 -04:00
xGamingDudex	17a4517e71	Merge remote-tracking branch 'origin/develop' into project-cosmetics Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java	2016-05-05 21:03:15 +02:00
xGamingDudex	1a96ea3c18	Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics	2016-05-05 20:29:28 +02:00
xGamingDudex	db21c7dd22	EGit FTW! Git, you are the greates, randomly deciding not to include everything when I spesify you to do so.... This should have been part of prev commit.	2016-05-05 20:26:00 +02:00
xGamingDudex	875fb4eccd	The big bug fix batch + Added some text utils + Added angel wing shape * Tweaked the wing particle effects. * Fixed item tool not despawning items in arcade servers * Removed strange gadget disable * Updated some death/win effects and particles * Added Illuminated chest * Added MS skin name to death message	2016-05-05 20:07:29 +02:00
xGamingDudex	9fca9283e2	Fixed skin layers for Player/Human disguises	2016-05-05 10:39:00 +02:00
Keir Nellyer	e1f2bb9740	Use all-man style braces here to be compliant with the coding standards (cherry picked from commit `e553ac5`)	2016-05-04 16:02:39 +01:00
Keir Nellyer	a663cb3e01	Revert "Revert "Report system (version 1)"" This reverts commit `d0d2de1e21`. # Conflicts: # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java	2016-05-04 15:24:29 +01:00
Conrad	d7d00e1614	Merge pull request #52 from Mineplex-LLC/alex-mcl Add a method for simply checking if a player has been participating i…	2016-05-04 09:30:00 -04:00
Thanos Paravantis	e7f97fa5b8	Move life related methods to challenge class	2016-05-04 16:21:14 +03:00
Thanos Paravantis	9d53eddabd	Fix lives amount display and remove disguises	2016-05-04 15:40:43 +03:00
Thanos Paravantis	703e957156	Fix volley pig health and knockback message	2016-05-04 15:38:18 +03:00
Thanos Paravantis	2b362ee4f1	Fix egg smash eggs sometimes stay on the map	2016-05-04 15:37:16 +03:00
AlexTheCoder	0e509898ec	Add a method for simply checking if a player has been participating in the current game, and implement it in the ranked bans system	2016-05-03 21:07:50 -04:00
Conrad	145ea9221a	Merge pull request #40 from Mineplex-LLC/clans/beta Clans/beta	2016-05-03 16:57:07 -04:00
LCastr0	cfc6f3703d	Merge pull request #50 from Mineplex-LLC/develop Merge from develop	2016-05-03 13:24:32 -03:00
cnr	57fca2a8d0	Temporarily(?) mitigate spigot CME During a PlayerVelocityEvent in an unloaded chunk (usually as result of a teleport), if one calls Location#getChunk() on the player's location, and the chunk contains persistent entities, the server crashes with a ConcurrentModificationException.	2016-05-03 04:56:31 -05:00
xXVevzZXx	838cc2ce31	fix enchantments and increase arrow amount in gladiators	2016-05-02 23:01:59 +02:00
Conrad	3c482e38cc	Merge pull request #47 from Mineplex-LLC/feature/logitech-brand Convert over to System.out.println() for error messaging and add prot…	2016-05-02 16:34:58 -04:00
Conrad	2cd76fbf72	Merge pull request #48 from Mineplex-LLC/alex-mcl Add catch for rare occurrence where players have no stored data	2016-05-02 16:34:50 -04:00
AlexTheCoder	3d98c08a67	Add in missing file	2016-05-02 16:33:11 -04:00
AlexTheCoder	ccd5b47d75	Convert over to System.out.println() for error messaging and add protection for billboards in Hub via a new manager	2016-05-02 16:20:41 -04:00
xXVevzZXx	8dd89d9dea	fix minor bugs and improve minor things in bridges, sg, uhc, quiver, runner and skywars	2016-05-02 20:27:43 +02:00
Ben	cd2bd8ac1d	Fix the TNT Cannon in the tutorial not exploding correctly when fired at the enemy base's doors, as that would cause the tnt entity to just slightly be out of the wall bound and that made the tutorial think that the player missed the wall, making that part of the tutorial near-impossible to pass unless known where to fire exactly. Along with this I also made the cannon rotation lock to a specific range so that people can't miss. Ever.	2016-05-02 11:49:56 +01:00
Ben	8a1b5572a8	Fix players in tutorial receiving messages from the real game whenever the message sender is not in a clan.	2016-05-02 10:31:45 +01:00
LCastr0	055b8684c2	- Added action bar message when booster is ready (Wind Up Suit) - Moved each suit to an individual package, to make it easier to work with - Removed some unused imports - Added util to get entity egg data - Added kit modifiers: Beastmaster, Horseman and Necromancer (SG), Apple (Bridges) - Added specific kit pages to game modifier menu	2016-05-02 00:13:06 -03:00
xXVevzZXx	71f8640189	implement Dukes of decoration, OP Gladiators, Countdown, Heroes of the ewe, OP Skywars, Ultra spleef, Assassins and Blood diamonds	2016-05-02 01:06:00 +02:00
Ben	026ab15099	Fix multiple leaving messages being broadcasted to the server when a player is kicked from the server after getting cbanned.	2016-05-01 23:20:55 +01:00
Ben	1e18707fd7	Include the missing PlayerMessageEvent, as I had also forgotten to add documentation about the class.	2016-05-01 23:06:30 +01:00
Ben	480cc0f9be	Fix NullPointerException when a player leaves the server without their Clans Ban client being loaded into memory beforehand.	2016-05-01 23:04:30 +01:00
Ben	e139bea465	Fix kill messages inserting a space below them in chat.	2016-05-01 23:03:18 +01:00
Keir Nellyer	fa017c185d	Add method to load ReportProfile from database	2016-05-01 22:48:02 +01:00
Keir Nellyer	41bc9672ab	Remove un-needed imports	2016-05-01 21:49:08 +01:00
Keir Nellyer	ccf14d0d2a	Declare final variables in ReportCategory	2016-05-01 21:12:01 +01:00
Keir Nellyer	132f431a94	Map each ReportResult to its id in the database We no longer use the statistic system to store the results of reports but rather store the result of each ticket in a database table.	2016-05-01 21:10:55 +01:00
Keir Nellyer	1d36d4c4b9	Map each ReportCategory to it's id in the database	2016-05-01 21:04:20 +01:00
AlexTheCoder	7e97bd346e	Change an internal method to private and add missing class JavaDoc	2016-05-01 15:16:42 -04:00
AlexTheCoder	335c5a4510	Clean up billboard generation and clearing, rewrite MapRender for logos, and add JavaDocs to comply with code standard	2016-05-01 14:58:40 -04:00
xXVevzZXx	6c2caac800	fix some format issues and implement God battles	2016-05-01 19:43:42 +02:00
xXVevzZXx	7bd6cdb93c	Implement Lists and Maps into the variable system and finish more gamemodes	2016-05-01 18:48:07 +02:00
Ben	eae972a3e6	Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta	2016-05-01 10:11:28 +01:00
Ben	9d97ea8d1e	Missing Clans ban cache class (to do with the commit previously by me)	2016-05-01 10:11:17 +01:00
cnr	4cffb39941	Delay dismount teleport by one tick This mitigates a stack overflow caused by a teleport before a dismount event processes fully.	2016-05-01 01:30:42 -05:00
AlexTheCoder	48c8a5a630	Force structure to spawn correctly, complete with maps on item frames	2016-05-01 01:56:07 -04:00
Ben	189f9ad524	Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta	2016-05-01 01:42:32 +01:00
Ben	2337e89a93	Improvements to the Clans ban system in general as it was performing more operations than required, and accessing the database more than was necessary. Polished up the Clans ban GUI as well.	2016-05-01 01:42:11 +01:00
cnr	8ca38b2598	Prepend http:// to resource pack locations	2016-04-30 18:54:17 -05:00
AlexTheCoder	070326e72d	Create systems to automatically create and destroy branding boards, as well as implement the Logitech branding	2016-04-30 19:26:16 -04:00
Keir Nellyer	e553ac5aab	Use all-man style braces here to be compliant with the coding standards	2016-04-30 23:12:25 +01:00
Keir Nellyer	bce218a65e	Merge branch 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-04-30 23:11:35 +01:00
cnr	10166f063b	Merge branch 'develop' into clans/beta	2016-04-30 16:16:57 -05:00
phobia	14204fba5c	Changed resource packs to home hosted ones	2016-04-30 16:02:26 -05:00
phobia	890ab9f67e	Uncommented ClansBanManager's instances	2016-04-30 16:02:26 -05:00
phobia	f1c2e71d56	Some changes to error handlng for clans regions	2016-04-30 16:02:26 -05:00
cnr	634a34dd52	Reintroduce non-Air constraint to cannon explosion	2016-04-30 16:02:26 -05:00
cnr	2eb7b892e0	Refactor cannon explosion effect for clarity	2016-04-30 16:02:26 -05:00
cnr	f2f627116a	Correctly count cannon explosion effect attempts Previously, cannon explosions effects could lock up the main thread if: - The effect location selection RNG was sufficiently unlucky - The explosion occured sufficiently deep into a larger claimed territory	2016-04-30 16:02:26 -05:00
AlexTheCoder	39c105f0cf	Add catch for rare occurrence where players have no stored data	2016-04-30 15:34:04 -04:00
Conrad	d0d2de1e21	Revert "Report system (version 1)"	2016-04-30 14:53:59 -04:00
Conrad	e0e30a8b7f	Merge pull request #43 from Mineplex-LLC/alex-mcl Fix Async Elo Ranked Bans	2016-04-30 14:46:49 -04:00
AlexTheCoder	37a815d52a	Update JavaDocs to fit Mineplex standard	2016-04-30 14:41:28 -04:00
AlexTheCoder	2e4bae6915	Merge branch 'feature/top-elo' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla	2016-04-30 14:14:14 -04:00
AlexTheCoder	2dc5c46624	Fix naming convention on checkRankBannedAsync	2016-04-30 14:13:21 -04:00
AlexTheCoder	41e26f283c	Fix all async elo ranked ban methods and switch to callback system for API hooks	2016-04-30 14:10:09 -04:00
TadahTech	6e35bc0989	Stop spamming the chat.	2016-04-30 00:55:59 -05:00
Keir Nellyer	2490e3df82	Previous git merge cause this single line to be deleted I literally have no idea why or how this happened.	2016-04-29 23:47:01 +01:00
Keir Nellyer	6a00f26d5f	Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java # Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java	2016-04-29 23:42:27 +01:00
Keir Nellyer	81cebc4ce7	Swap static helpers for a much better solution This allows for easier refactoring in the future when we move away from retrieving the CoreClientManager from a static instance. Mineplex coding standards are also against the use of static helpers in scenarios such as this, therefore this commit brings this branch to be in-line with the coding standards.	2016-04-29 23:37:40 +01:00
Thanos Paravantis	89bd325c81	Fix continuous milking sound on milk a cow	2016-04-29 14:35:48 +03:00
Thanos Paravantis	aff5396384	Prevent death effect armor stand modification	2016-04-29 13:41:16 +03:00
Shaun Bennett	184d247fc9	Start adding BoosterPage. Move Boosters to core to support UI's	2016-04-29 17:37:34 +10:00
phobia	f63a872bd4	Changed resource packs to home hosted ones	2016-04-29 14:46:14 +10:00
AlexTheCoder	a8d9745320	- Fixed order of Top Elo	2016-04-29 00:12:25 -04:00
phobia	c814fc73f7	Uncommented ClansBanManager's instances	2016-04-29 12:53:20 +10:00
TadahTech	26f6a1189f	Prettyfy EloCommand	2016-04-28 21:34:43 -05:00
TadahTech	e83e4b270c	Prettyfy EloCommand	2016-04-28 21:34:07 -05:00
TadahTech	00efb7d72e	Fix ELO query	2016-04-28 21:20:48 -05:00
TadahTech	84ca13c0d3	Fix ELO query	2016-04-28 21:09:28 -05:00
TadahTech	80ea7b7a4c	Fix ELO query	2016-04-28 21:09:07 -05:00
TadahTech	5a4f89b484	Fix ELO query	2016-04-28 21:04:07 -05:00
AlexTheCoder	7c279998ec	- Changed top elo queries	2016-04-28 21:55:51 -04:00
AlexTheCoder	8e68d62356	- Added documentation for new EloManager methods	2016-04-28 21:16:18 -04:00
AlexTheCoder	2887630cf8	- Added javadoc headers	2016-04-28 21:11:38 -04:00
AlexTheCoder	4b7684da4c	Merge branch 'feature/top-elo' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla	2016-04-28 21:05:56 -04:00
AlexTheCoder	e032b81842	- Made SQL calls async	2016-04-28 20:59:49 -04:00
TadahTech	562e950361	Remove File headers.	2016-04-28 19:46:13 -05:00
TadahTech	680e579223	Merge Alex's branch into mine. Convert to Java 8 Remove unneeded comments.	2016-04-28 19:39:24 -05:00
TadahTech	168483a9fc	Communities work	2016-04-28 19:30:05 -05:00
TadahTech	725481f310	Top Elo data for Webpage	2016-04-28 19:23:57 -05:00
TadahTech	84c0b1b389	Top Elo data for Webpage	2016-04-28 19:22:45 -05:00
AlexTheCoder	156982460f	- Fixed water permanently [MCL] - Fixed team balancing [MCL] - Fixed overjoining [MCL] - Changed bans for quitting ranked matches [MCL]	2016-04-28 20:03:09 -04:00
Keir Nellyer	5dbb3744d1	Improve reputation map initialization logic	2016-04-28 23:52:26 +01:00
Keir Nellyer	c82dd27b64	Make getValueOf method more robust	2016-04-28 23:36:41 +01:00
AlexTheCoder	b105ccb5f1	- Change event priority	2016-04-28 17:48:16 -04:00
AlexTheCoder	b13528ed66	- Further blockage of creating source blocks [MCL]	2016-04-28 17:46:57 -04:00
AlexTheCoder	3f9ef24235	- Removed debug message	2016-04-28 17:44:37 -04:00
William Burns	5d1194192d	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/jobs-site	2016-04-28 18:19:45 +01:00
Thanos Paravantis	8874b52b39	Merge branch 'develop' into thanos-mineware	2016-04-28 19:27:56 +03:00
Thanos Paravantis	6084d04a0f	Commit before pulling from develop	2016-04-28 19:23:21 +03:00
Thanos Paravantis	992e150608	Refactor and comment classes New javadoc comments have been added to describe class functionality and variable usage on specific places.	2016-04-28 16:54:46 +03:00
Keir Nellyer	bff5751691	Remove very last @author tag	2016-04-28 14:41:44 +01:00
Thanos Paravantis	3a5ec7dc5d	Continue refactoring and comment main class	2016-04-28 13:11:27 +03:00
Thanos Paravantis	6cc8f854c4	Refactor main game class	2016-04-28 13:02:44 +03:00
Thanos Paravantis	3161cd53e9	Apply new format on floating holograms	2016-04-28 12:31:09 +03:00
AlexTheCoder	dcd376b837	- Improved graphics for Elo display in /stats	2016-04-28 01:01:14 -04:00
AlexTheCoder	189296a586	- Fixed using water in restricted zones in MCL - Implemented Elo in /stats menu	2016-04-28 00:53:04 -04:00
AlexTheCoder	46f873634e	- Decrease time till Overtime in MCL - Block ability to flood in MCL	2016-04-28 00:33:36 -04:00
AlexTheCoder	b4c5be81f3	- Fixed random weather in MCL - Added Elo Division display to /stats for applicable games - Made fishing rods kept on death in MCL	2016-04-27 23:12:38 -04:00
William Burns	d90e9e7dff	Add a system for allowing all players to use game commands when in the correct mode.	2016-04-27 20:54:52 +01:00
Thanos Paravantis	aff4b6b270	Fix minecart dance double life loss	2016-04-27 22:09:06 +03:00
William Burns	b8d12c0c9d	Small wording changes.	2016-04-27 20:04:36 +01:00
xXVevzZXx	1b5b18c9b2	Prevent exception while adding variables to gamemodes	2016-04-27 17:50:01 +02:00
xXVevzZXx	aa219ec3e5	Implement gamemode feature with modifiable variables and working on first moded games	2016-04-27 17:42:50 +02:00
Thanos Paravantis	ddad17855f	Improve chicken spawning on chicken shooting	2016-04-27 18:37:42 +03:00
Thanos Paravantis	f8ff99fc58	Increase hologram height gain and expire time	2016-04-27 18:37:09 +03:00
Thanos Paravantis	e3a6a0a50a	Fix spawns and map generation on smash off	2016-04-27 18:36:16 +03:00
Thanos Paravantis	c6b1065c4e	Fix scoreboard player team after death	2016-04-27 18:35:39 +03:00
Thanos Paravantis	9407265c73	Display predefined items on diamond hunt	2016-04-27 14:02:43 +03:00
Thanos Paravantis	ba5d06db88	Fix tag master and achievement progress	2016-04-27 13:14:20 +03:00
AlexTheCoder	a16145479e	- Disabled picking up lava - Leaving ranked matches temp bans players from rejoining them	2016-04-27 03:18:44 -04:00
Thanos Paravantis	ccebeb75f1	Implement challenge team spawning Team based challenges are now handled differently from the normal ones. When the game or challenge starts, instead of spawning all players with the default team spawn method, they are teleported according to their team. For example, if a player is on the blue team, he will be teleported on the blue side of the map. Moreover, teams are now generated properly, by diving the total number of players by two. One drawback, that will be fixed in a next commit, is that team challenges require an even amount of players.	2016-04-27 09:41:02 +03:00
LCastr0	d0e7590b2a	Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics	2016-04-26 23:23:45 -03:00
LCastr0	a7ef8bec49	Adds new constructor to NotePlayer, to be able to send the song to specific players Some WindUp costume fixes Added actionbar and song to WindUp suit Created new booster manager	2016-04-26 23:21:59 -03:00
xGamingDudex	38d03b8468	Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics	2016-04-27 00:03:29 +02:00
xGamingDudex	79f210e242	Schematic and WinEffect update +Added better schematic support +Fixed schematics not sending block updates to nearby players +Added win room schematics *Tweaked some of the win rooms +Added sounds to the Lava Trap win effect.	2016-04-27 00:01:30 +02:00
Shaun Bennett	41e2ea6490	Fix off by one error in GoalCounter	2016-04-26 16:20:14 +10:00
Shaun Bennett	714000163b	Add messages when fountain is complete and resets	2016-04-26 16:19:27 +10:00
Shaun Bennett	4a8c38e1c8	Add fountain reset command	2016-04-26 15:33:52 +10:00
Shaun Bennett	cabf4c4c8b	Add BlockProgressBar for Gem Fountain	2016-04-26 15:26:07 +10:00
Shaun Bennett	e8370579c0	Counter refactoring	2016-04-26 13:55:06 +10:00
Thanos Paravantis	38769d9616	Add missing tracker classes	2016-04-25 23:01:41 +03:00
Thanos Paravantis	d945bfa17a	Fix array out of bounds on veteran tracker	2016-04-25 23:01:17 +03:00
Thanos Paravantis	d0336be7b7	Add new achievements and modify current ones	2016-04-25 22:59:24 +03:00
Thanos Paravantis	41ef1a757c	Prevent null winner on veteran tracker	2016-04-25 18:03:25 +03:00
Thanos Paravantis	7c92971346	Remove new thread and use bukkit runnable only Previously, a new thread was created to display the description of a challenge. Instead of creating a new one, only a single bukkit runnable is now created. With that change, when the challenge is skipped, the correct description will show up instantaneously.	2016-04-25 18:00:37 +03:00
Thanos paravantis	a6bf059e6c	Modify challenge names and challenge intro titles	2016-04-25 12:47:55 +03:00
LCastr0	f0cfac8e73	Merge pull request #31 from Mineplex-LLC/develop Merge from develop	2016-04-24 23:15:36 -03:00
LCastr0	28de514d1a	Adds some utils for UtilColor Small changes in Wind Up suit	2016-04-24 21:39:35 -03:00
Thanos paravantis	c214431cbf	Move and rename stat trackers	2016-04-24 22:44:42 +03:00
Thanos paravantis	856eb6059b	Update statistics and implement data tracker	2016-04-24 22:39:56 +03:00
Keir Nellyer	8969ec172b	Merge branch 'feature/report' into feature/report-v2	2016-04-24 18:26:10 +01:00
Keir Nellyer	949f9ca712	Don't allow players to report themselves I left this to last minute to make testing easier, as with this check in place it means at least two players are required to test the report mechanism.	2016-04-24 18:10:01 +01:00
Keir Nellyer	96aa5d1c4b	Removed duplicate code Somehow this got duplicated and so therefore was causing compile time errors, might have been something to do with my git merge.	2016-04-24 17:22:21 +01:00
Keir Nellyer	dab1f9485c	Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report	2016-04-24 17:17:17 +01:00
Keir Nellyer	9df4dac023	Remove dead code This was left over from before I took over development of the report feature.	2016-04-24 17:16:36 +01:00
Keir Nellyer	713263214f	Run ReportPurgeTask asynchronously This prevents the task from hanging the server which may be an issue when a large amount of reports exist.	2016-04-24 17:15:12 +01:00
Keir Nellyer	57e9cd6e19	Add class headers and remove @author tags This makes the PR compliant with with the Mineplex coding style. Class headers are used to describe the function of a class and git history will be used to determine the author of a class.	2016-04-24 17:10:29 +01:00
Keir Nellyer	84f5bd2f31	Handle abusive report types	2016-04-24 16:51:01 +01:00
Thanos paravantis	e2a6500bce	Update game achievements	2016-04-24 13:37:39 +03:00
Shaun Bennett	a0fd852537	Move field to top of class in Game	2016-04-24 13:38:58 +10:00
Shaun Bennett	b21dfad12e	Merge remote-tracking branch 'remotes/origin/develop' into feature/gems # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java	2016-04-24 13:37:45 +10:00
Shaun Bennett	c60beec68c	Implement Fountain GUI	2016-04-24 12:40:38 +10:00
LCastr0	491c509317	Added UnlockCosmetics command (/unlockCosmetics <type>) Added Ammo command (/ammo <gadget> <ammo> [player]) Added util for red world border screen (UtilPlayer.sendRedScreen) Added new costume -> Wind Up Removed test gadget (ItemBouncyBall)	2016-04-23 22:16:02 -03:00
Thanos paravantis	bfabfab2d1	Fix circle spawn locations	2016-04-24 00:27:39 +03:00
phobia	b21939444c	Some changes to error handlng for clans regions	2016-04-23 16:40:39 +10:00
cnr	c7970d1bd0	Prevent super paintball spectators from reviving teammates. Fixes PC-103	2016-04-22 19:48:03 -05:00
xGamingDudex	ccd630e2ae	Leftovers from merge	2016-04-23 00:56:19 +02:00
xGamingDudex	b7099088a9	Merge remote-tracking branch 'origin/develop' into project-cosmetics Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/block/schematic/Schematic.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguisePlayer.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/data/TNTGenerator.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/MiscManager.java	2016-04-23 00:55:48 +02:00
Thanos paravantis	c526c86813	Add notes to fix recent bugs	2016-04-22 23:26:53 +03:00
Thanos paravantis	fa75bc15ad	Merge branch 'develop' into thanos-mineware Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java	2016-04-22 22:03:15 +03:00
Jonathan Williams	fe0cee65e8	Added gem and coin rewards back into bonus.	2016-04-22 05:33:25 -05:00
Jonathan Williams	260c617007	Merge remote-tracking branch 'remotes/origin/alex-mcl' into develop	2016-04-22 05:12:30 -05:00
Jonathan Williams	e28621ae26	Set oldElo equal to new elo on new row.	2016-04-22 05:04:13 -05:00
AlexTheCoder	2a4c3209b4	- Enable ELO	2016-04-22 05:44:56 -04:00
AlexTheCoder	70541fd6f2	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla	2016-04-22 05:41:24 -04:00
Jonathan Williams	d73b720323	Merge branch 'features/elo' into develop	2016-04-22 04:34:35 -05:00
Jonathan Williams	477acf044e	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop	2016-04-22 04:34:21 -05:00
Jonathan Williams	6db7e648f5	Don't insert new row if the update doesn't succeed because of elo mismatch on loss.	2016-04-22 04:20:59 -05:00
Jonathan Williams	7b18efa7b0	Prevent farming elo up with multiple games by dc and joining new game.	2016-04-22 04:05:07 -05:00
Jonathan Williams	ddd1c5af9b	Removed EloSettings and fixed scoreboard.	2016-04-22 03:10:09 -05:00
Jonathan Williams	34f94c0381	Reverted scoreboard because of MC maxlines turd nugget.	2016-04-22 02:55:27 -05:00
Jonathan Williams	a31eccc15b	Multiply new rating by team size. MIssed that undo!	2016-04-22 02:53:02 -05:00
Jonathan Williams	4577cf0398	Fixed scoreboard :D	2016-04-22 02:47:48 -05:00
Jonathan Williams	7cc4811ede	Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into features/elo	2016-04-22 02:39:35 -05:00
Jonathan Williams	f922be51fe	Scoreboard tweak.	2016-04-22 02:39:08 -05:00
AlexTheCoder	04fe30df43	- Fix sb	2016-04-22 03:38:20 -04:00
AlexTheCoder	5e255fc4ed	Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix	2016-04-22 03:36:21 -04:00
Jonathan Williams	757c945320	Added in kFactor ratio application to rating delta.	2016-04-22 02:35:37 -05:00
AlexTheCoder	03bdc8d2db	Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix	2016-04-22 03:17:54 -04:00
Jonathan Williams	b69a75355c	Fixed scoreboard alignment.	2016-04-22 02:17:40 -05:00
Jonathan Williams	aa6d25139f	Tweaked elo for team games.	2016-04-22 02:04:57 -05:00
AlexTheCoder	b1c05e2ed0	Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix	2016-04-22 02:12:02 -04:00
Jonathan Williams	776093288a	Fixed rating not setting in EloPlayer constructor.	2016-04-22 01:11:48 -05:00
AlexTheCoder	2d2c8858e6	Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix	2016-04-22 02:06:55 -04:00
AlexTheCoder	1d3ad3c5fd	- Enabled ELO for testing	2016-04-22 02:06:37 -04:00
Jonathan Williams	977fbe684a	Fixed elo query.	2016-04-22 01:06:33 -05:00
Jonathan Williams	44d4255628	Added endElo in the appropriate spots.	2016-04-22 00:58:07 -05:00
Jonathan Williams	6d00e8b41f	Refactored Elo to work correctly.	2016-04-22 00:21:11 -05:00
Shaun Bennett	8a5fdccb60	Add to fountain button	2016-04-22 11:26:05 +10:00
AlexTheCoder	d0e3b094c1	- cleaned up and prepped for live update	2016-04-21 20:57:35 -04:00
Shaun Bennett	86df07123c	Merge pull request #28 from Mineplex-LLC/bugfix/admin-command-npe Fix NPE in AdminCommand from IncognitoManager being null	2016-04-22 10:54:20 +10:00
Shaun Bennett	e46798f20e	Fix NPE in AdminCommand from IncognitoManager being null	2016-04-22 10:49:34 +10:00
AlexTheCoder	e55bec505b	- Fix players ending up teleported back to arena due to broken respawn engine	2016-04-21 20:13:39 -04:00
Shaun Bennett	435d3968a2	Fix Fountain string being changed to Counter from refactor	2016-04-21 19:46:20 +10:00
AlexTheCoder	df55d48ab8	- Looks better	2016-04-21 01:03:14 -04:00
AlexTheCoder	d57cc48f0f	- Added new features!	2016-04-20 22:31:54 -04:00
Joseph Prezioso Jr.	f86b18b603	Elo Works Now Ready to move on to MCL implementation	2016-04-20 22:09:18 -04:00
Shaun Bennett	54f0b99756	Add fountain gui command	2016-04-21 11:41:16 +10:00
cnr	2d02d79cec	Fix survival games' Beastmaster wolf spawning Beastmaster wolf spawning suffered from the same issue as the Wizards "Summon Wolves" spell: spigot has an issue when setting an owner to a wolf or ocelot without a previous owner. See SpigotUtil for details.	2016-04-20 18:45:54 -05:00
Joseph Prezioso Jr.	2d45ab61cc	Elo re-calculated Elo is now being incremented more consistently (and not multiple times)	2016-04-20 15:48:27 -04:00
Joseph Prezioso Jr.	6a5c8336cf	Elo and Division fixed Elo and Division should be displaying properly Cleaned the code up a bit Added endElo() to Game.java to handle team Elo code Added event listener to check for GameState.End in TDM to call endElo()	2016-04-20 14:52:06 -04:00
AlexTheCoder	588e6f08c2	- Removed TypeWars achievements to make room	2016-04-19 18:07:20 -04:00
Thanos paravantis	6e011b3a89	Add missing SpawnDefinition interface	2016-04-19 21:52:45 +03:00
LCastr0	793f5b3f41	Test gadget added by LCastr0, to get used to the code	2016-04-19 15:20:31 -03:00
LCastr0	2b80ebabf7	Test gadget added by LCastr0, to get used to the code	2016-04-19 15:14:22 -03:00
Thanos paravantis	cb4561c561	Implement team check on challenge selection system	2016-04-19 18:25:36 +03:00
Thanos paravantis	11aef273ba	Fix NPE on Volley Pig	2016-04-19 18:25:04 +03:00
Thanos paravantis	50175f9453	Spawn players with equal distance from ladder on KOTL	2016-04-19 14:27:48 +03:00
Thanos paravantis	17c51f03ad	Remove grass only from used spawns	2016-04-19 14:17:32 +03:00
Thanos paravantis	20fdb1f21c	Restructure methods on Mini OITQ challenge	2016-04-19 13:59:09 +03:00
Thanos paravantis	816abad8de	Fix Mini OITQ barriers enclosing players at spawn	2016-04-19 13:57:39 +03:00
cnr	ef8474ae9d	Set default CustomExplosion maxFallingBlocks to 0 This fixes an exception thrown when the trap rune in Wizards is activated.	2016-04-19 02:59:31 -05:00
cnr	bda9772ba6	Mitigate spigot issue when setting wolf owner This fixes the Summon Wolves spell in Wizards. Explanation: - Wolves keep track of their most recent owner. - When a wolf is assigned a new owner, it updates the data watcher with the new owner's UUID - During this process, the old owner's UUID is checked against the new one - If the wolf didn't have a previous owner, the old owner's UUID is the empty string. - UUID.fromString() is called on the empty string, and throws an exception.	2016-04-19 02:46:38 -05:00
Thanos paravantis	09fb1842b6	Apply improvements and bug fixes	2016-04-19 10:00:06 +03:00
Shaun Bennett	cb48df6a3d	Update fountain count every 5 seconds. Display Hologram	2016-04-19 14:30:38 +10:00
Shaun Bennett	6dc2559dd1	Merge remote-tracking branch 'remotes/origin/md_5/boosters' into feature/gems	2016-04-19 13:57:33 +10:00
Shaun Bennett	5a667a7d31	Add /fountain command. Fountain implementation	2016-04-19 13:57:19 +10:00
AlexTheCoder	e08965aa25	- Fixed TowerDefender being too difficult to obtain - Fixed wither attacking own towers by accident	2016-04-18 22:58:55 -04:00
AlexTheCoder	6c20427395	- Fixed some bugs and added final achievements	2016-04-18 22:32:15 -04:00
AlexTheCoder	17ac3cb597	- Fix armor checking - Edit wither death message	2016-04-18 20:29:53 -04:00
AlexTheCoder	10aba533f3	- Remove all dependence on UtilShapes	2016-04-18 19:59:55 -04:00
AlexTheCoder	34399db6e8	- Fixed missing GameType	2016-04-18 18:42:56 -04:00
xGamingDudex	d9b6434bad	Typo in description	2016-04-18 23:24:59 +02:00
xGamingDudex	534a5dee4e	Forgot to remove debug message	2016-04-18 22:18:42 +02:00
xGamingDudex	591d3cadc9	Cleaned up some GUI stuff, mostly lores on items	2016-04-18 22:16:10 +02:00
xGamingDudex	e45f800519	Fixed damage calculator error	2016-04-18 20:36:22 +02:00
md_5	9de990744d	Stage	2016-04-18 17:46:38 +10:00
AlexTheCoder	44263beb87	- Make elo store/recover properly	2016-04-17 17:34:18 -04:00
cnr	4227e24ae0	Reintroduce non-Air constraint to cannon explosion	2016-04-17 16:29:23 -05:00
cnr	e375db5aec	Refactor cannon explosion effect for clarity	2016-04-17 13:33:44 -05:00
AlexTheCoder	ee30012011	Merge branch 'feature/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix	2016-04-17 12:27:23 -04:00
AlexTheCoder	d623d0982b	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla-merge	2016-04-17 12:02:08 -04:00
AlexTheCoder	4c35e35fc0	- More polish and bugfixes	2016-04-16 23:59:44 -04:00
Shaun Bennett	4477a215f4	Update to Redis 2.8.1 and clean up repositories (#26 )	2016-04-16 22:51:20 -05:00
Shaun Bennett	fed9f675d3	Implementation for basic Fountains	2016-04-17 13:51:15 +10:00
Shaun Bennett	9c2cd6a883	Merge branch 'feature/redis-update' into feature/gems	2016-04-17 13:08:11 +10:00
Shaun Bennett	16dacbe3b3	Update to Redis 2.8.1 and clean up repositories	2016-04-17 12:58:44 +10:00
AlexTheCoder	35d7dd8b44	- Fixed stuff	2016-04-16 20:36:19 -04:00
AlexTheCoder	b0d30a4ff4	- cleaned everything up - renamed game	2016-04-16 20:32:14 -04:00
AlexTheCoder	d8f5ac66fc	- More chiss	2016-04-16 14:05:46 -04:00
xGamingDudex	696088b57e	Fixed gun stats between games	2016-04-16 18:16:53 +02:00
cnr	9c6d23f11e	Correctly count cannon explosion effect attempts Previously, cannon explosions effects could lock up the main thread if: - The effect location selection RNG was sufficiently unlucky - The explosion occured sufficiently deep into a larger claimed territory	2016-04-16 07:31:00 -05:00
Thanos paravantis	cb4e25fb0a	Implement new challenge selection system The new challenge selection system, picks a random challenge from the list as a starting point. Once the challenge is ended, the next one in the list will be selected. That process continues, until the index is out of bounds, and from that point, a new starting point will be selected. During that process, any challenge that is picked, is also reviewed to make sure it's suitable according to the player count. If that's not the case, the selection process will continue until one challenge is found. If there is no appropriate challenge, the game will be ended. In addition to those changes, there are a couple of bug fixes and changes. At first, some methods that keep track of player lists were renamed and secondly, the enchantment lore is now hidden on challenges that use items.	2016-04-16 15:13:52 +03:00
Joseph Prezioso Jr.	bbb81dd663	Elo calls migrated to Game.java Consequently, elo code is actually being called now Bukkit.broadcastMessage calls have shown where things are breaking handleElo() added to EloManager to facilitate movement of team elo code preparing to use EloManager's getNewRatings() method to calculate team elos	2016-04-15 20:48:56 -04:00
xGamingDudex	ffc0459e5a	Cosmetic Update + Support for relative copy position from with //copy from worledit in schematics + Better block selection in bounding box in UtilBlock + Goal selector utils for entities + Global hide and show methods for players + Win effects and game modifiers + Tweaked player disguises + Added clean room generator to arcade games, previously normal flat world + Animation utils * Edited some particles, hats and death animations	2016-04-16 02:24:41 +02:00
Jonathan Williams	2b2b251548	Merge branch 'clans/beta' into develop	2016-04-15 12:41:14 -05:00
Jonathan Williams	019cfe41cc	Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta	2016-04-15 12:40:54 -05:00
Jonathan Williams	609eb562e9	Merge branch 'clans/beta' into develop	2016-04-15 12:40:26 -05:00
Jonathan Williams	a730b81feb	Commented out TournamentManager, moving off develop.	2016-04-15 12:38:25 -05:00
Jonathan Williams	b43953439e	Properly store teamId locally after registering for tournament. Use team id when unregistering for the tournament.	2016-04-15 12:36:28 -05:00
Jonathan Williams	cf3141ddc0	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop	2016-04-15 12:30:32 -05:00
cnr	77b6515387	Don't break the repair anvil more than twice	2016-04-15 12:21:25 -05:00
cnr	91d5851628	Don't set a clan's lastOnline time to Timestamp(0) Partially reverts `f011fdad5f`	2016-04-15 12:21:25 -05:00
AlexTheCoder	09f9ae3b7a	- Update for playability	2016-04-14 23:05:14 -04:00
AlexTheCoder	33b557eb10	- Huuuuuuuge amount of changes for chiss	2016-04-14 22:45:21 -04:00
Joseph Prezioso Jr.	4a4e64a3ff	EloRepository overhaul started Tinkering with EloRepository, using AccountRepository as a base	2016-04-14 20:09:09 -04:00
Jonathan Williams	64d5f91e8f	Remove TeamInvite table.	2016-04-14 18:49:20 -05:00
Ben	0a32eed15d	Fix Cannon TNT firing in the wrong direction and clean up the projectile code, making it more modular.	2016-04-15 00:43:55 +01:00
Joseph Prezioso Jr.	742807d80e	Added generatePlayerElos and updated saveDivision Added method to fill EloManager's playerElos hashmap with values --This may not work as intended --Currently only implemented in Team Death Match	2016-04-14 17:17:26 -04:00
Joseph Prezioso Jr.	eb67c12108	Added getRepoElo to EloRepository Added Bukkit.broadcastMessage() calls to test code Methods that needed to throw SQLExceptions now throw SQLExceptions	2016-04-14 15:21:28 -04:00
Jonathan Williams	3a26225ce2	Finished main tournament calendar UI. Added registration for tournaments.	2016-04-14 12:21:24 -05:00
phobia	29b3f03abf	Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta	2016-04-14 21:38:48 +10:00
phobia	cbc6689782	Disable /kill in tutorial and reset food level after hold position	2016-04-14 21:38:37 +10:00
Ben	eab76fefa2	Fix Cannons sometimes glitching out when the owner's clan is deleted.	2016-04-14 12:09:42 +01:00
Ben	3bf3eba005	Completely cancel the explosion falling block for claimed territories.	2016-04-14 12:08:54 +01:00
Ben	a295cade1c	Fix Cannon TNT sometimes breaking blocks in protected regions	2016-04-14 11:35:12 +01:00
cnr	ab21efd2ca	Give the correct amount of old/ancient chests for bonuses	2016-04-13 18:51:52 -05:00
cnr	6b2f601c7a	Prevent a spectator race condition in arcade games Previously, a player would erratically become a spectator if s/he spammed the "spectate next player" action between rounds (i.e. left-click while spectating a player).	2016-04-13 18:20:39 -05:00
Joseph Prezioso Jr.	9e8a7b582b	Elo updates EloRanking turned on for Domination, Team Deathmatch, Turf Wars, CTF Database QoL changes made to EloManager and EloRepository --Unfortunately, Database still seems to not be updating properly --Something on my end, or something to do with the queries? Unsure.	2016-04-13 18:35:56 -04:00
cnr	6d01e235fd	Fix online friends list Previously, it was incorrectly asserting that all players were incognito. If we want to exclude incognito players, we'll have to find a different way.	2016-04-13 17:24:46 -05:00
Jonathan Williams	85f4ff1299	Starting on Tournaments.	2016-04-13 17:14:48 -05:00
cnr	91c97e38b8	Prevent players from naming their pets "ULTRA" This was being used to fool support into thinking the player had won Ultra from a chest	2016-04-13 16:37:13 -05:00
William Burns	b54da22dd8	Create a basic site design for potential job applicants.	2016-04-13 21:06:47 +01:00
Ben	7cc0583d8e	Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta	2016-04-13 19:52:49 +01:00
Ben	355ab06e6c	Fix the Conquering attribute working for player attacks as well	2016-04-13 13:08:04 +01:00
Ben	a26403f006	Fix Recall & Smokebomb not working regularly	2016-04-13 13:04:43 +01:00
cnr	6428dfd723	Run clan-load callbacks on the main thread This prevents potential CMEs from occurring when a player transfers his/her clan to another server	2016-04-12 22:54:20 -05:00
Ben	e9d05474f8	Prevent cannons from changing bedrock into charred blocks	2016-04-12 17:14:48 +01:00
Ben	c0ebae4175	Ender chest blocker not actually canceling the opening event.	2016-04-12 17:13:03 +01:00
phobia	11d92c49ec	Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta	2016-04-12 09:48:59 +10:00
Ben	eefed175ec	Add the random world event command.	2016-04-11 18:07:11 +01:00
Ben	b313bc5308	Make undead chests not show the 'you are not permitted to use ender chest' messages.	2016-04-10 16:52:54 +01:00
Ben	313b59d1d6	Fix the terrain finder miscalculating the size of undead camps	2016-04-10 16:51:42 +01:00
Ben	e014f4fff9	Fix null pointer in the tutorial when using /tutorial finish	2016-04-10 16:51:12 +01:00
Ben	159a5403ac	Fix rare item duplication bug with Smoke Bomb (was told that it's just like the Recall duplication bug)	2016-04-10 16:47:46 +01:00
Ben	db8ca31567	Fix Meridian Scepter not being perfectly accurate.	2016-04-10 16:16:53 +01:00
Ben	0ac9747df1	Modifying how the Meridian Scepter picks a target, as the previous logic was a bit flawed.	2016-04-10 15:27:20 +01:00
Ben	9a2f4a8936	Fix Meridian Scepter not damaging the victim (would just give the wither effect)	2016-04-10 15:23:43 +01:00
Ben	fe89a5b68e	Fix the Recall rare item duplication bug	2016-04-10 14:50:00 +01:00
Ben	67a36dc7e4	Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta	2016-04-10 12:56:30 +01:00
Ben	66274188c8	Add a /we random command to spawn a random world event	2016-04-10 12:56:00 +01:00
Ben	37bb64bffd	Fix Undead Camps from spawning outside of the World Border.	2016-04-10 12:47:56 +01:00
Ben	3ee1f86841	Fix Null Pointers in the ender chest blocker and regular chest blocker for incognito staff.	2016-04-10 12:36:31 +01:00
Ben	8ee2c02dd9	Disable the use of Ender Chests	2016-04-10 11:20:51 +01:00
Ben	e8e73306be	Change the Giant's Broadswords regeneration effect level from 41 to 3	2016-04-10 11:15:43 +01:00
Ben	dd3e009413	Remove silent chest opening mechanism (which was completely broken), and instead don't allow incognito staff to open chests	2016-04-10 10:53:07 +01:00
Conrad S	ccf9d4a4c2	Merge remote-tracking branch 'origin/clans/beta' into clans/beta Conflicts: Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/repository/SiegeWeaponRepository.java	2016-04-09 13:01:04 -04:00
Thanos paravantis	ea6219984a	Add missing Spleef challenge to removed package	2016-04-09 11:06:46 +03:00
Thanos paravantis	0b780c8e99	Fix teleport delay and incorrect win placement. Players that die during a challenge have the ability to fly around as spectators. Although, once the challenge was ended their fly mode was removed and they would fall for a very short amount of time, which was noticeable. With that fix, players now get reset once they are teleported to the spawn locations of the next challenge. That happened because during the player reset and spawn teleportation, the map would be generated, as a result, causing a very small notable delay. Moreover, win placement was fixed. In the previous version, the third player would appear as second and the second player would appear as the third one. The cause of this issue was that, after the second and the third player is added to the winner list, the last player that is remaining alive is added as first. To fix that, I've implemented a swap method that changes the location of the second with the third player.	2016-04-09 11:04:23 +03:00
Keir Nellyer	eb01cd41f1	Move display item responsibility over to ReportResultButton Previously ReportResultPage handled this.	2016-04-09 00:51:05 +01:00
Keir Nellyer	51b5e50c20	Use pre-existing util method for item building Removes util method added in previous commit.	2016-04-09 00:44:00 +01:00
Ben	4bf19eebad	Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta	2016-04-09 00:37:40 +01:00
Ben	92195a12d2	Completely rework Cannon explosions to use the vanilla Minecraft explosions, as those seem to look much more visually appealing, and have less issues. Fixed a loading and saving bug with Cannons, they seem to be a lot more stable now than before.	2016-04-09 00:37:20 +01:00
Keir Nellyer	56b0a886bf	Add helper method for setting common item meta values	2016-04-09 00:36:04 +01:00
Ben	6e9ae04118	Cut Gem to Gold conversion rate down to 16 Gems per Gold, instead of 32	2016-04-09 00:27:24 +01:00
Keir Nellyer	8b6b3db412	Remove old pre-mavenisation files	2016-04-09 00:17:58 +01:00
Keir Nellyer	6efb8d806d	Re-enable category threshold check This was disabled for testing reasons.	2016-04-09 00:02:59 +01:00
Keir Nellyer	cb434b7518	We no longer need to store IDs or notify thresholds (new system will work differently)	2016-04-09 00:00:11 +01:00
Keir Nellyer	bd7e26ef08	Fix error causing enum readable names to fail to generate correctly	2016-04-08 23:49:07 +01:00
Conrad S	05b31725a8	Fix initialization NPE.	2016-04-08 18:48:16 -04:00
Ben	a04f7c23c6	Disable incognito for staff in hub invisibility, and vice-versa	2016-04-08 20:18:56 +01:00
Conrad S	8a2efa2f0b	Make sure a user has enough gold to make a purchase.	2016-04-08 10:48:55 -04:00
Keir Nellyer	95507a740c	Move button specific values from ReportCategory to ReportCategoryButton This is done to separate the code out so that we can add a GLOBAL value to the enum for handling of ABUSIVE reports (these types of reports do not have a specific category). In its current state it's is very closely inter-twined.	2016-04-08 00:33:29 +01:00
Keir Nellyer	c1354081ea	Implement ReportProfile This class is used to hold report-specific data about a user, such as the amount of successful or failed reports the user has filed. It also contains the total amount of abusive reports a user has filed, all this data will be used to calculate the user's reputation.	2016-04-07 22:45:15 +01:00
Ben	79a2ef3608	Fix staff members getting unhidden when in incognito whenever players are shown to the player (can happen when a regular player toggles player vision, and the staff member gets shown to all other players.)	2016-04-07 22:24:47 +01:00
Joseph Prezioso Jr.	59001bdef6	Fix merge-related errors Fix, polish, and re-implement Elo code.	2016-04-07 16:40:30 -04:00
Ben	2c05743f62	Stop using static with Siege Manager	2016-04-07 21:01:25 +01:00
Keir Nellyer	36e79a1504	Add header to every class as per new coding standards.	2016-04-07 14:44:27 +01:00
Keir Nellyer	390b2878dc	Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report # Conflicts: # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java	2016-04-07 14:28:30 +01:00
Ben	c484a80a14	Remove incorrect import	2016-04-07 08:12:05 +01:00
Ben	b70ff03185	Fix siege weapon crater being spawned at the lowest block at the current collision location. This was causing issues when Cannons were fired at a vertical wall, and would not do any damage to the wall as it would just do damage to the blocks at the nearest ground block.	2016-04-07 08:11:37 +01:00
Ben	f2ac2d87bf	Remove debug command, that could be very abused	2016-04-07 08:07:18 +01:00
Ben	9ccec50fd0	Remove unnecessary database calls that checked for siege weapons remaining in the database, which is not possible, as siege weapons clean themselves up.	2016-04-07 08:06:16 +01:00
Ben	eed3df720a	Disable incognito mode for staff members that have been demoted whilst using it. Also fixes a bug that caused IncognitoHidePlayerEvent fire even if the player logging in does not have incognito mode enabled.	2016-04-07 07:00:46 +01:00
Ben	3a8ab581dd	Add JavaDoc to new classes to comply with the new standards	2016-04-07 06:52:52 +01:00
Joseph Prezioso Jr	91e550bdcc	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop Conflicts: Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/outpost/Outpost.java Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/SiegeWeapon.java Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/command/FinishCommand.java Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/command/TutorialCommand.java Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/BlowUpWallGoal.java	2016-04-06 19:40:01 -04:00
Joseph Prezioso Jr	a07e71ba08	GameOption takes a generic value to eliminate the need for more than the one GameOption class. Remove the--now unnecessary--classes that inherited from GameOption. Consequently, the creation and implementation of GameOptions should be much more efficient. Note: it may be necessary to add decimal points to doubles and to cast 'long' data types as 'long'. The above note generally applies to numerical values, but may apply to other values, as well.	2016-04-06 18:10:31 -04:00
Joseph Prezioso Jr	f030f78f08	Add headers to new classes, so as to comply with coding standards. To that end, change methods to camel case and refactor them, so that the newly-renamed methods do not result in errors.	2016-04-06 16:20:26 -04:00
Ben	d75d63a81a	some missing files and blacklist barrier block from block toss	2016-04-06 18:26:56 +01:00
Jonathan Williams	8b42de03cb	Debug messages for PoisonShock	2016-04-06 10:39:00 -05:00
Ben	d25f1abfbf	stop iron door from being opened by players not in clan (outpost)	2016-04-05 23:49:16 +01:00
Ben	738825ea9d	perms for tutoirial command	2016-04-05 23:37:08 +01:00
Ben	4bdd33c87b	blowing holes in the ground and interacting with cannon sometimes not working	2016-04-05 23:15:38 +01:00
Ben	744d8891b4	import	2016-04-05 22:58:03 +01:00
Joseph Prezioso Jr	09db5a8131	I'm committing this so I can checkout to a different branch	2016-04-05 16:41:50 -04:00
Joseph Prezioso Jr	c6c52885a9	Fixed commit	2016-04-05 15:16:40 -04:00
Ben	be63012d18	make trainees+ not count to kicked player count	2016-04-05 12:43:19 +01:00
Ben	876a7a8eb6	Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta	2016-04-05 12:37:23 +01:00
Ben	cfac41f216	full server trainee+ fix	2016-04-05 12:37:04 +01:00
Jonathan Williams	dd5b2d5e3f	Fixed NPE with poison condition effect.	2016-04-05 00:36:18 -05:00
Jonathan Williams	e23362bd6f	Fixed NPE in OrderedObjective	2016-04-05 00:36:00 -05:00
Jonathan Williams	b34a175a2b	Fixed error in Outpost throwing NPE.	2016-04-05 00:35:44 -05:00
Shaun Bennett	ae87db1742	Fix TNT generator timings	2016-04-05 13:04:52 +10:00
Shaun Bennett	23232efd63	Merge remote-tracking branch 'remotes/origin/develop' into clans/beta # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java # Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResourcePackManager.java	2016-04-05 13:04:39 +10:00
phobia	b0dd51843b	Ride horse delay	2016-04-05 10:58:31 +10:00
Ben	7f92a3c048	incognito changes	2016-04-05 00:38:27 +01:00
Jonathan Williams	cd5ad89f51	Made clans sort by server number.	2016-04-04 17:46:51 -05:00
Jonathan Williams	53b25e6ee0	Fixed diamonds not selling in shops.	2016-04-04 17:46:35 -05:00
Jonathan Williams	6558b16004	Fixed endless loop crash bug with Gear attributes.	2016-04-04 17:46:22 -05:00
Jonathan Williams	8ea0051181	Fixed customer support menu not showing if monthly bonus hasn't been claimed.	2016-04-04 17:46:03 -05:00
Jonathan Williams	2d296d9226	Removed debug ResourcePack Message	2016-04-04 17:45:34 -05:00
Jonathan Williams	efa18d394b	Fixed Incognito not saving status.	2016-04-04 17:45:10 -05:00
Jonathan Williams	2fa0787792	Clans now load, added connection property to null zero date timestamps.	2016-04-04 16:31:37 -05:00
Jonathan Williams	2b3e466469	Removed pesky '?' causing login query to stall.	2016-04-04 16:30:57 -05:00
Ben	7de23216f6	Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta	2016-04-04 20:41:10 +01:00
Ben	b3b72f1ca0	commenting out clans bans	2016-04-04 20:40:58 +01:00
Jonathan Williams	02459c6a10	Fixed bad implementation of IncognitoManager that was locking up threads. Temporarily disabled MessageManager's handling of Incognito.	2016-04-04 13:48:26 -05:00
Jonathan Williams	60010f90b4	Load simple clan token on player login to reduce overhead. Increased dbpool connections to 4	2016-04-04 13:47:45 -05:00
Jonathan Williams	a91ef68978	Fixed CCM in WarPointEvasion. Removed debug message; NOT RIDER	2016-04-04 13:46:39 -05:00
Jonathan Williams	e2baf2b56c	Updated Clans to use the new ResourcePackManager.setResourcePack method.	2016-04-04 13:46:00 -05:00
Jonathan Williams	1b1e6f6ef5	Moved the redis operation before asking for a mysql connection	2016-04-04 13:45:20 -05:00
Jonathan Williams	781c4bfdbd	Removed db call off main thread for ClanServerPage	2016-04-04 10:31:13 -05:00
Jonathan Williams	91ddac9643	Added world checking for boundary stuff.	2016-04-04 10:30:59 -05:00
Jonathan Williams	e8da5ca0f2	Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta	2016-04-04 10:02:01 -05:00
Jonathan Williams	228a001696	Added Shift Left clicking to the ban list for Cannon :D	2016-04-04 10:01:50 -05:00
Shaun Bennett	ff929a8515	Merge remote-tracking branch 'remotes/origin/develop' into clans/beta # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java # Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResourcePackManager.java	2016-04-05 00:57:28 +10:00
Ben	14207c2073	clansbans	2016-04-04 14:56:20 +01:00
Ben	8330ef560d	not rider spam	2016-04-04 14:55:47 +01:00
Shaun Bennett	fecd3c1eaa	Final changes	2016-04-04 23:28:38 +10:00
Ben	02cb0e1f7e	Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta Conflicts: Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java	2016-04-04 13:52:44 +01:00
Ben	1dde17b9cc	shooters still shotting fix	2016-04-04 13:51:05 +01:00
phobia	e85a1e6a3b	fixes to breakingand placing in claim	2016-04-04 22:22:07 +10:00
phobia	4262a4d4b7	Increase radius + delete iron doors after done	2016-04-04 22:07:58 +10:00
phobia	963bba06f7	fix for displaying territorial movements	2016-04-04 17:47:58 +10:00
phobia	2e0c9d3965	Remove potatoe message	2016-04-04 17:34:39 +10:00
phobia	aaccb6fd48	Join/leave/death messages	2016-04-04 17:20:21 +10:00
Shaun Bennett	15c4b2dd58	Merge remote-tracking branch 'origin/clans/beta' into clans/beta	2016-04-04 17:11:15 +10:00
Shaun Bennett	23e116f9b5	Region fixes	2016-04-04 17:10:52 +10:00
phobia	56a087612b	Changes to explain energy goal	2016-04-04 16:58:16 +10:00
Shaun Bennett	be8ed78caa	Merge remote-tracking branch 'origin/clans/beta' into clans/beta	2016-04-04 16:46:17 +10:00
Shaun Bennett	02f774ce94	A lot of bug fixes	2016-04-04 16:45:20 +10:00
Jonathan Williams	85fabd525a	Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta	2016-04-04 00:59:25 -05:00
Jonathan Williams	400d2f0cca	Added bonus log view for customer support.	2016-04-04 00:59:13 -05:00
Shaun Bennett	543719b95d	More tutorial fixes	2016-04-04 14:47:33 +10:00
Cheese	040026724b	renamed tutorials	2016-04-04 14:10:26 +10:00
Cheese	29bcd6aeea	more text cahnges	2016-04-04 13:30:15 +10:00
Cheese	88e56f2ffb	Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta Conflicts: Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/FieldsObjective.java	2016-04-04 13:03:24 +10:00
Cheese	6c92b42335	text changes	2016-04-04 13:01:54 +10:00
Shaun Bennett	29f2442be8	Merge remote-tracking branch 'origin/clans/beta' into clans/beta	2016-04-04 12:53:07 +10:00
Shaun Bennett	8dee8eab0a	Bug fixes	2016-04-04 12:52:52 +10:00
phobia	3173adca53	Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta	2016-04-04 12:49:00 +10:00
phobia	5ad877f864	So many fixes <3	2016-04-04 12:47:23 +10:00
Shaun Bennett	0a39b7b756	Fix objective ordering	2016-04-04 12:36:47 +10:00
Shaun Bennett	e11a9379b9	More tutorial tweaking	2016-04-04 12:32:22 +10:00
phobia	5195e4a13d	Message fixes	2016-04-04 10:15:15 +10:00
phobia	c3a119cfe4	Display completion only to player who completes	2016-04-04 10:11:26 +10:00
Ben	a1f284670a	make zombie npcs actually look at the player	2016-04-03 23:49:22 +01:00
Ben	3ff5e6d337	npc fixes	2016-04-03 18:47:31 +01:00
Ben	7558bd01b7	ensure zombies don't burn to death, by losing equipment	2016-04-03 18:29:13 +01:00
Ben	40361acc9b	fixed cannon becoming off-center	2016-04-03 17:51:56 +01:00
Ben	ccdd1f901f	cannon 1.9 fixes	2016-04-03 17:23:55 +01:00
Thanos paravantis	cc68b7087a	Change wool color on Wave Crush challenge During map generation, the wool color is now predetermined and not random.	2016-04-03 17:15:20 +03:00
Thanos paravantis	18ff9c23f7	Modify block removal from Wave Crush challenge The removeExtraBlocks() method was changed, in order to include all arena blocks. The previous version did not remove all extra blocks, as it was using the getArenaSize() method inside the for-loop, which returns a different integer depending on the challengers. To fix that, I've implemented the '_arenaStartSize' field to store the starting arena size value that is used in the map generation method.	2016-04-03 16:53:14 +03:00
Thanos paravantis	114fac2655	Refactor Red Light Green Light challenge Separated functionality into different methods in order to improve readability and maintainability. All four abstract methods were updated, in order to make sure they work as intended without any second thoughts. Moreover, a PlayerQuitEvent listener was added to remove players from the '_cooldown' array list and a null check in the onEnd method, to prevent any null pointer exceptions. Also, there were some minor display changes, regarding titles and chat messages on the moveTextAndSound() and cannotMoveTextAndSound() methods. Lastly, the bedrock layer was removed from map generation.	2016-04-03 16:49:31 +03:00
Ben	f4d4b5c5df	siege weapon interaction fix	2016-04-03 14:08:40 +01:00
Ben	66a18dcc87	Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta Conflicts: Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/ClansMainTutorial.java Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java	2016-04-03 13:55:17 +01:00
Ben	c1b659e738	npcs on enemy base	2016-04-03 13:50:11 +01:00
Ben	f5623f00f9	blacklist npe fix	2016-04-03 13:47:57 +01:00
phobia	3ae347653a	Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta	2016-04-03 21:33:13 +10:00
phobia	c92d291e96	Shift clicking TNT into the cannon + iron doors fixed	2016-04-03 21:32:56 +10:00
Jonathan Williams	8f58a456b1	Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta	2016-04-03 01:37:40 -05:00
Jonathan Williams	401127caa9	Reworked Monthly bonuses so they always succeed and it logs them.	2016-04-03 01:36:30 -05:00
phobia	759911396a	More clans bug fixes + message tweaks	2016-04-03 16:11:47 +10:00
phobia	5e41c22fc7	- The "WARNING: Clan energy is running very low" message should appear after I get the Buy Energy objective - Need a congrats message/title when tutorial is completed - Force user to claim via gui	2016-04-03 13:39:32 +10:00
phobia	45cbeef83d	- /c sethome shows the wrong message when the bed can't be placed	2016-04-03 13:32:49 +10:00
phobia	9f4a2ff7ce	- Shift clicking TNT into the cannon does not work - /c map doesn't work in tutorial (could just remove /c map completely)	2016-04-03 13:31:13 +10:00
phobia	664d8b1a4e	Fixes for clans tutorial	2016-04-03 11:04:57 +10:00
Thanos paravantis	f454a6de81	Comment game classes and remove unnecessary checks Added comments on game classes, except challenges and statistics trackers. Removed challenge validity checks from onCollide method in Anvil Dance and Falling Blocks, since that is now handled on the Collide method located in the main game class.	2016-04-02 22:49:56 +03:00
Thanos paravantis	12b90501e2	Refactor Wave Crush challenge Separated functionality into different methods in order to improve readability and maintainability. All four abstract methods were updated, in order to make sure they work as intended without any second thoughts. Also, a new PlayerQuitEvent listener is added, in order to remove players from the '_survivedWaves' hash map, which keeps track of the waves every player survived. Lastly, onCollide if-statement logic was reversed to reduce and simplify the lines of code inside the method.	2016-04-02 22:10:43 +03:00
phobia	b4cfbebf3f	Fix issue with seeling potatoes	2016-04-02 22:53:41 +11:00
phobia	d4e9f638da	Fixed a crash bug with title message being too long + other fixes	2016-04-02 22:26:21 +11:00
phobia	cc09bf6b51	Fixes to Bull Charge + Adding more instructins to purchasing	2016-04-02 21:43:33 +11:00
William Burns	15cf7f574d	Fix join/quit messages.	2016-04-02 11:08:40 +01:00
William Burns	6072753624	Fix shop objective description.	2016-04-02 10:50:46 +01:00
Shaun Bennett	b960925522	Fixes	2016-04-02 20:42:41 +11:00
phobia	5a31be1138	Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta	2016-04-02 20:33:09 +11:00
phobia	673dd327ff	Push for shaun Fireworks	2016-04-02 20:29:56 +11:00
Jonathan Williams	e4b2492b35	Fixed ObjectiveGoal's finish from creating CCMs.	2016-04-02 03:03:17 -05:00
Jonathan Williams	ff41ad248a	Removed PvpTimer Fixed issue where StatManager and FriendManager were created twice.	2016-04-02 02:47:17 -05:00
Jonathan Williams	a6710280fb	Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta	2016-04-02 00:45:10 -05:00
Jonathan Williams	01d9c1cd09	Finished the <?> for Objective and ObjectiveGoal.	2016-04-02 00:45:01 -05:00
Shaun Bennett	d161d83d12	Maps and other various fixes	2016-04-02 15:43:03 +11:00
Shaun Bennett	5739b1b87b	Merge remote-tracking branch 'origin/clans/beta' into clans/beta	2016-04-02 15:13:16 +11:00
Jonathan Williams	3bc1908b57	Fix player quit staying in _active list for Objectives.	2016-04-01 23:10:15 -05:00
Shaun Bennett	758004f207	Merge remote-tracking branch 'origin/clans/beta' into clans/beta	2016-04-02 14:55:14 +11:00
Jonathan Williams	fa6d18b0fa	Fix sync db call inside sendMessage	2016-04-01 22:43:09 -05:00
Cheese	8f959a73eb	debug	2016-04-02 12:46:25 +11:00
Cheese	9969b7d783	support for resource packs for different MC versions	2016-04-02 11:39:40 +11:00
Shaun Bennett	0abcd0044b	Merge remote-tracking branch 'origin/clans/beta' into clans/beta	2016-04-02 10:53:28 +11:00
Joseph Prezioso Jr	6e23a17acb	Removed unnecessary code.	2016-04-01 16:01:57 -04:00
phobia	90e336b18e	Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta	2016-04-01 21:51:51 +11:00
phobia	42fd210b20	PC-56	2016-04-01 21:51:31 +11:00
Jonathan Williams	fe41e79e8a	Fixes: 10 minute timer for creating clan after tutorial. CCM with LeaveSpawnGoal Synchronous database calls.	2016-04-01 01:55:08 -05:00
phobia	9a1e5099a4	Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta	2016-04-01 14:04:12 +11:00
phobia	d0bc40b991	PC-56 and PC-65	2016-04-01 14:01:38 +11:00
Shaun Bennett	49441cfaf4	PC-63 and PC-64	2016-04-01 10:47:21 +11:00
Ben	3412082f37	PC-61 - Remove all diamonds from inventory after sell diamonds objective	2016-04-01 00:33:42 +01:00
Ben	da99a12b23	Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta	2016-03-31 20:03:50 +01:00
Ben	d353c53524	remove hard-coded access to certain commands for my uuid/name	2016-03-31 20:03:25 +01:00
Joseph Prezioso Jr	5e1003cccb	Missed a minus sign in my previous commit.	2016-03-31 14:06:45 -04:00
Joseph Prezioso Jr	6ccc6df6aa	Elo calculations now account for player's Elo, relative to the average Elo among players	2016-03-31 13:57:21 -04:00
William Burns	4ec833727f	PC-20 - Detailed Objective Text	2016-03-31 18:45:17 +01:00
Joseph Prezioso Jr	cbb9798c35	Added AdjustPlayertElo method to increment/decrement the Elo's of individual players at the end of a game. Currently calling the new method in AnnounceEnd.	2016-03-31 12:49:22 -04:00
phobia	19b2b00a13	Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta	2016-03-31 20:35:40 +11:00
phobia	86bdbbb8bc	PC-46 + adding in events for buttons	2016-03-31 20:35:21 +11:00
Shaun Bennett	682c365bc6	Merge remote-tracking branch 'origin/clans/beta' into clans/beta	2016-03-31 20:09:16 +11:00
Shaun Bennett	b3392e78f5	PC-28 - Improve Flow of Tutorials	2016-03-31 20:08:45 +11:00
AlexTheCoder	4ae4f056ea	- Map Polish	2016-03-31 03:46:43 -04:00

... 20 21 22 23 24 ...

9197 Commits