3544 Commits

Author	SHA1	Message	Date
AlexTheCoder	ab315627ad	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game	2016-06-27 17:45:36 -04:00
Keir Nellyer	48a2d0d304	Remove old completed todo	2016-06-27 18:06:01 +01:00
Keir Nellyer	42bd2148e5	Don't allow a user to handle more than one report simultaneously	2016-06-27 17:56:01 +01:00
xGamingDudex	d6672c44f4	Finalized the hub module and finished local testing ... Cleaned up some source. Applied some small updates. Finished local testing.	2016-06-27 00:34:17 +02:00
Keir Nellyer	90df695624	Merge branches 'feature/report-v2' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-06-26 00:18:07 +01:00
LCastr0	30f413d04e	Fixes for persistence: ... No longer save items after they are disabled No longer keep the particle effect after a staff vanishes	2016-06-25 02:22:20 -03:00
TadahTech	50759661cf	Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2	2016-06-24 23:52:27 -05:00
LCastr0	d75abe3aea	Persistence fixes	2016-06-25 00:36:00 -03:00
LCastr0	83f4b25887	Testing persistence fixes	2016-06-25 00:33:36 -03:00
cnr	c430566c6d	Never reset a player's YouTube click time locally	2016-06-24 16:59:27 -05:00
Shaun Bennett	94fe9f57d2	Add missing imports	2016-06-24 12:36:56 -07:00
Kenny Goodin	dc9145c707	Hotfix, disable youtube and twitter buttons in BonusGUI	2016-06-24 15:33:07 -04:00
Keir Nellyer	323d865b57	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 ... # Conflicts: # Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java	2016-06-24 18:13:51 +01:00
Keir Nellyer	c5319dbe1d	Switch identifier system for id system (no need for tokens any more)	2016-06-24 18:08:47 +01:00
Keir Nellyer	52873d5618	Do away with tokens	2016-06-24 17:59:26 +01:00
Keir Nellyer	45418b3a4d	Add todo	2016-06-24 17:56:01 +01:00
Keir Nellyer	daae2f7a3a	Shorten method name	2016-06-24 17:54:54 +01:00
Keir Nellyer	871bb04451	Fix /reporthandle command	2016-06-24 17:45:56 +01:00
Keir Nellyer	d178e9112b	Temporarily base priority on report age	2016-06-24 15:39:48 +01:00
Keir Nellyer	fd64753ba0	New /reporthandle command	2016-06-24 12:14:58 +01:00
TadahTech	8fbb06ae3d	Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 ... # Conflicts: # Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java	2016-06-24 04:11:38 -05:00
TadahTech	e71fc291d1	Fix cross server invites / joining servers.	2016-06-24 04:01:51 -05:00
Shaun Bennett	b4caf5125b	Adjust tip amounts	2016-06-24 03:16:42 -05:00
Shaun Bennett	d708c478d7	Dont display other boosters, fix typo	2016-06-24 03:16:42 -05:00
Shaun Bennett	348cb9efba	Fix remaining booster message	2016-06-24 02:23:09 -05:00
cnr	b58ff8c066	Add YouTube and Twitter buttons to UI	2016-06-24 01:30:10 -05:00
Shaun Bennett	def57e2c0b	Fix HubManager, add failsafe for BoosterManager	2016-06-23 23:19:02 -07:00
Shaun Bennett	fd843b88cb	Merge remote-tracking branch 'remotes/origin/develop' into feature/boosters-final ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/inventory/GemBooster.java # Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java # Plugins/Mineplex.StaffServer/src/mineplex/staffServer/customerSupport/CustomerSupport.java	2016-06-23 23:02:26 -07:00
Shaun Bennett	a9f291338f	Amplifiers GM Candidate	2016-06-23 22:49:12 -07:00
TadahTech	c204562eb3	Fix cross server invites / joining servers.	2016-06-23 23:25:26 -05:00
TadahTech	ce1aab5e11	Fixes and changes	2016-06-23 21:53:12 -05:00
cnr	3433e0e3bc	Merge branch 'project-cosmetics' into develop	2016-06-23 18:42:47 -05:00
Keir Nellyer	d67082bca2	Ran a code inspection and implemented some suggested changes	2016-06-23 23:31:51 +01:00
xXVevzZXx	dc57f7b4e6	add testrank command for SR.Mods	2016-06-23 22:05:26 +02:00
Keir Nellyer	7f75a7ff50	Unfortunately we can't batch these SQL commands as we have to retrieve the snapshot id after inserting	2016-06-23 20:36:34 +01:00
LCastr0	c1b7be6363	Fix merge problems	2016-06-23 16:33:20 -03:00
LCastr0	7749314e64	Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics	2016-06-23 16:11:49 -03:00
LCastr0	a441727e09	Freedom update: ... Freedom chests Freedom Aura Shock and Awe Leap of Freedom Price of Freedom Uncle Sam Morph Freedom Mount Uncle Sam Hat Persistence update: Items will still be enabled after player leaves the server	2016-06-23 16:09:31 -03:00
Keir Nellyer	e6989cd8da	Output errors caused by inserting snapshots into database	2016-06-23 20:06:16 +01:00
Keir Nellyer	4606f27408	Switch report ids to use data type 'long' ... This is because in the database we store them as an unsigned integer, which means the Java integer type will not be able to hold values after a certain point.	2016-06-23 14:11:58 +01:00
TadahTech	33cce620be	Update UI and fix typos	2016-06-23 03:11:45 -05:00
TadahTech	df53021f7c	Fix Party Redis. Improve Party UI. General testing and fixing. (Funny enough, again.	2016-06-23 02:56:42 -05:00
TadahTech	fb6a772eb0	Fix Party Redis. Improve Party UI. General testing and fixing.	2016-06-23 02:39:05 -05:00
Shaun Bennett	6e2c751be1	Adjust amplifiers queue message	2016-06-22 21:09:09 -07:00
Shaun Bennett	0873efd876	Update more lore text	2016-06-22 20:54:29 -07:00
Shaun Bennett	621d72f541	Fix merge issues, update lore text	2016-06-22 20:51:58 -07:00
Shaun Bennett	249a5c70aa	Merge remote-tracking branch 'remotes/origin/develop' into feature/boosters-final ... # Conflicts: # Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java	2016-06-22 20:35:40 -07:00
Shaun Bennett	906e0e0044	Allow API error messages from HTTP 503	2016-06-22 20:31:18 -07:00
Keir Nellyer	addbd4dd88	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-06-23 01:21:12 +01:00
Keir Nellyer	4fc5e036fa	Remove old redundant chat cache command ... Fix broken code in SnapshotPlugin	2016-06-23 01:13:18 +01:00
Keir Nellyer	8bbeb3292f	Removed old code resulting in compiler error and replaced with a todo for the future	2016-06-23 01:03:25 +01:00
Keir Nellyer	2931826916	Improve readability by separating these functions out	2016-06-23 01:01:20 +01:00
Keir Nellyer	352ecc6ad6	Improve database performance by executing queries in batch	2016-06-23 00:57:41 +01:00
Keir Nellyer	09a74e3772	Work on pushing chat snapshots to db	2016-06-23 00:38:24 +01:00
Alex-The-Coder	2453f82061	Rename Filterbutton.java to FilterButton.java	2016-06-22 18:40:12 -04:00
TadahTech	50534c3af9	UI And server manager changes	2016-06-22 17:28:43 -05:00
Shaun Bennett	e855a866c7	Fix more thanks and booster occurrences	2016-06-22 08:58:27 -07:00
xGamingDudex	318c137aba	Moved mavericks repository resources to core, merging review and game	2016-06-22 17:08:34 +02:00
TadahTech	e53b474f3f	Fix typo.	2016-06-22 00:59:22 -05:00
TadahTech	38a13d01f1	Open server menu properly	2016-06-22 00:56:44 -05:00
TadahTech	4d31867e98	PC Party updates.	2016-06-22 00:35:57 -05:00
Keir Nellyer	ef0c3721d8	Micro-optimisation since this ArrayList will only ever hold a maximum of 2 items	2016-06-21 17:47:44 +01:00
Keir Nellyer	b46f08938e	Implement age decay algorithm as supplied by @alexthecoder	2016-06-21 17:46:52 +01:00
TadahTech	e39326b592	Help Command UI.	2016-06-21 00:11:33 -05:00
TadahTech	b75e87753d	Party UI work.	2016-06-20 22:45:53 -05:00
TadahTech	a49e815765	Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2	2016-06-20 16:40:33 -05:00
TadahTech	2211cf4dec	Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 ... # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java	2016-06-20 16:37:07 -05:00
Shaun Bennett	1c1912b92a	Update fountain goals again	2016-06-20 00:52:33 -05:00
Shaun Bennett	afc636b7c5	Fix amplifier reward message	2016-06-19 20:16:33 -05:00
Shaun Bennett	bb8d94f38a	Fix a lot more Booster cases	2016-06-19 19:48:17 -05:00
Shaun Bennett	63b7648608	Amplifier rename, move podium backwards	2016-06-19 19:05:04 -05:00
Keir Nellyer	b4f10531cb	Merge branch 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-06-19 22:46:19 +01:00
Keir Nellyer	2cfb84eece	Shorten some code	2016-06-19 22:46:06 +01:00
Keir Nellyer	ec2ec878e8	Message type id mapping in preparation for storing chat messages in database	2016-06-19 22:28:56 +01:00
Shaun Bennett	38058bc670	Confirmation Paging	2016-06-19 05:49:32 -05:00
Shaun Bennett	2f0a559441	Add reload command, change podium to lime dye, change tip message	2016-06-18 14:41:32 -05:00
Keir Nellyer	f34c65111b	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-06-18 00:48:00 +01:00
Shaun Bennett	5f9a57b7e2	Lower booster tip cooldown to 1 minute	2016-06-17 16:10:01 -05:00
Shaun Bennett	4e3062f413	Swap Cosmetic and Booster interface slot	2016-06-17 15:23:53 -05:00
Shaun Bennett	0873ee0116	Show entire booster queue in booster gui	2016-06-16 16:54:54 -05:00
samczsun	1893e98036	Don't run chat filtering on the main thread	2016-06-16 16:39:43 -04:00
TadahTech	5ac6249684	Fix Bridges Kits not getting their items. ... Fix Kits breaking at Level 5	2016-06-16 15:34:23 -05:00
Shaun Bennett	ea551182b6	Make booster gui smaller	2016-06-16 15:29:05 -05:00
TadahTech	e7d76e2ef4	Hot fixes.	2016-06-16 03:56:32 -05:00
samczsun	1e5d91e392	Make porting from old legendaries work, fix null commandcenter	2016-06-15 21:52:25 -04:00
Shaun Bennett	cbfbd6fe1c	Booster GUI update	2016-06-15 17:40:20 -05:00
TadahTech	27afd3d96c	Kit progression update	2016-06-15 15:54:53 -05:00
Shaun Bennett	aa785ed3d5	Code clean-up and documentation	2016-06-12 21:18:11 -05:00
TadahTech	22e22ff508	Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/party/Party.java # Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java	2016-06-12 00:42:22 -05:00
Keir Nellyer	6bc8039dbd	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-06-11 14:04:43 +01:00
Keir Nellyer	ed50e09a6e	Fix issue an old un-closed but expired report may be re-opened and cause issues	2016-06-11 13:59:53 +01:00
Keir Nellyer	197acee4ae	Implement server weighting	2016-06-11 13:47:45 +01:00
Shaun Bennett	cf87469400	Fix a possible NPE, use proper IP and port for api	2016-06-10 20:24:22 -05:00
Shaun Bennett	2421fd1cfe	Update booster page, proper booster rewards	2016-06-10 19:40:27 -05:00
Shaun Bennett	42c35063b3	Display all the boosters you have activated	2016-06-10 17:40:59 -05:00
Shaun Bennett	6964b1f266	Booster gui command	2016-06-10 17:20:23 -05:00
Shaun Bennett	e6920b4549	Work on booster gui, display wait time	2016-06-10 17:17:43 -05:00
Shaun Bennett	ceb4de8b35	Load booster groups for arcade	2016-06-10 16:33:53 -05:00
Thanos Paravantis	6d380c6c6f	Rename building champion to Speedy Builders	2016-06-10 22:44:13 +03:00
Shaun Bennett	0a204a3b90	Use redis pub/sub to send booster updates	2016-06-10 12:44:27 -05:00
Keir Nellyer	a73e1c24b5	Properly calculate user reputation	2016-06-10 15:47:59 +01:00
Keir Nellyer	380139477c	Reduce expiry time for reports	2016-06-10 12:59:50 +01:00
Keir Nellyer	36f47b7067	Clear report cache when report is closed	2016-06-10 12:41:02 +01:00
Keir Nellyer	09009c352b	Remove new-line in query	2016-06-10 12:34:23 +01:00
Keir Nellyer	2cacdbae34	Use more robust Guava Cache class for caching	2016-06-10 12:33:46 +01:00
Thanos Paravantis	52ce640391	Merge branch 'develop' into thanos-mineware	2016-06-10 12:15:54 +03:00
Shaun Bennett	e30cd6747b	Increase goal 10 million, probably need to change later	2016-06-09 23:40:58 -05:00
Shaun Bennett	1d365d726c	brawl fountain now displays proper info on the weekend	2016-06-09 23:40:58 -05:00
Shaun Bennett	08e47b4b1b	Enable tips in bonus gui	2016-06-09 22:41:41 -05:00
Keir Nellyer	4503f12738	Implement report caching	2016-06-10 00:28:07 +01:00
Keir Nellyer	22dbcbf90d	Move util method to sequence CompletableFuture's to new class 'UtilFuture'	2016-06-09 23:41:17 +01:00
Alex-The-Coder	77e9de0f8f	Update required rank in ... fountain add help message	2016-06-09 17:02:00 -05:00
Alex-The-Coder	0306f1d703	Update required rank in ... booster command help message	2016-06-09 17:02:00 -05:00
Alex-The-Coder	dbe8f39eeb	Update required rank in ... add booster help message	2016-06-09 17:02:00 -05:00
Keir Nellyer	fe06fba406	Re-word from "hacking" to "guilty" so that button is applicable for both types of reports	2016-06-09 22:49:04 +01:00
Keir Nellyer	ad17c620b7	Fix sql query for fetching report result counts	2016-06-09 22:48:18 +01:00
Keir Nellyer	e24d67ecd3	Report errors when fetching a ReportProfile and attempt to recover from it	2016-06-09 18:11:38 +01:00
Keir Nellyer	f0da319f46	Inventories must be handled on the main thread	2016-06-09 18:00:15 +01:00
Keir Nellyer	1db1257a05	Report message task for handler now checks if the report is still active ... Due to recent changes, this no longer needs to run asynchronously as the CompletableFuture class already makes thing asynchronous for us.	2016-06-09 17:45:08 +01:00
Keir Nellyer	5d9a317f2a	Fix sql queries which use reserved words	2016-06-09 17:06:44 +01:00
Keir Nellyer	e113b0744d	Fix incorrect column name when getting report reasons	2016-06-09 17:06:09 +01:00
Keir Nellyer	9dbef26b92	Fix small typo in comment	2016-06-09 16:34:18 +01:00
Keir Nellyer	8e48b00264	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-06-09 15:16:38 +01:00
cnr	ba319599ba	Fix fountain schematic file paths	2016-06-09 01:18:09 -05:00
Shaun Bennett	91f6ddce55	Add some minor documentation	2016-06-09 00:48:44 -05:00
Shaun Bennett	611cb28d1a	Fix a typo	2016-06-09 00:47:03 -05:00
Shaun Bennett	cade7b4081	Remove got boosters message	2016-06-09 00:43:59 -05:00
Shaun Bennett	d6bce63967	Use schematics from update folder	2016-06-09 00:43:03 -05:00
Shaun Bennett	ece08c23a9	Fix merge issues	2016-06-09 00:40:05 -05:00
Shaun Bennett	699b35995f	Merge remote-tracking branch 'remotes/origin/develop' into feature/gems ... # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java	2016-06-09 00:39:39 -05:00
Shaun Bennett	d4ac309daa	Merge remote-tracking branch 'remotes/origin/master' into feature/gems	2016-06-09 00:29:27 -05:00
Shaun Bennett	85829d355d	Fix command permissions	2016-06-09 00:25:54 -05:00
Shaun Bennett	22bb56dfda	Remove game booster button	2016-06-09 00:22:54 -05:00
Shaun Bennett	09d2c00f66	Proper display of extra gem fountain rewards	2016-06-09 00:14:01 -05:00
cnr	cf6e3cf05d	Merge branch 'feature/game-variants' into develop	2016-06-08 22:47:16 -05:00
Shaun Bennett	c9d5b91c52	Proper booster activation events	2016-06-08 19:22:25 -05:00
Shaun Bennett	37a412f1bf	Starting to merge boosters into arcade code	2016-06-07 17:24:24 -05:00
Sam	298c09ab82	Lowercase rank prefixes in tablist when in party ... When in a party the rank prefix in the tablist of every user is now uppercase.	2016-06-06 20:45:07 +01:00
TadahTech	474a9dc975	Heavy UI and Command work. Begin testing ... Time: 2hrs	2016-06-05 23:37:08 -05:00
TadahTech	c577e5827c	Heavy UI and Command progress. ... Time: 4hrs	2016-06-05 22:55:06 -05:00
TadahTech	a9c086172f	Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2	2016-06-05 19:06:15 -05:00
TadahTech	ee35dd3442	Redis system implementation and code refactoring. ... Total time: 13hr	2016-06-05 19:05:29 -05:00
LCastr0	2410151371	Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics	2016-06-05 17:46:27 -03:00
LCastr0	cb71bf4ba5	Removes morphs from gadget persistence (PC-429)	2016-06-05 17:44:34 -03:00
Sam	2755543686	Merge remote-tracking branch 'refs/remotes/origin/develop' into mopple	2016-06-05 15:32:06 +01:00
TadahTech	502111ef4e	Redis system needs a shit ton of work. Need to design it better.	2016-06-05 00:42:22 -05:00
TadahTech	4ce9c90839	Party Redis init. ... Wrap for 6/4/2016. Total time: 9.3 hrs.	2016-06-05 00:32:04 -05:00
TadahTech	8c3d5f66a2	UI work.	2016-06-05 00:03:01 -05:00
cnr	8de5280241	Disable /allowCmd	2016-06-04 22:55:15 -05:00
TadahTech	bccc11eeaf	Files changed that need to be edited later on with the new Party System. ... Memory commit	2016-06-04 22:41:01 -05:00
TadahTech	84f428fa99	Redis work: Command work: UI work: ... Total Time: 2.5hrs	2016-06-04 21:13:19 -05:00
TadahTech	22a438d5c1	Party system rewrite init. Barebones frame work: Total time - 2hrs.	2016-06-04 01:54:17 -05:00
Sam	c01b6da390	Staff is incognito could be found using /stats (PC-Bugs-407) ... Fixes an issue where players could do /stats <name> to find out if vanished players were on their server.	2016-06-03 13:14:54 +01:00
LCastr0	c5cbca3ed0	Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics	2016-06-02 18:30:22 -03:00
Sam	b51007da91	Merge remote-tracking branch 'refs/remotes/origin/develop' into mopple	2016-06-02 22:28:35 +01:00
LCastr0	b3291476cb	Changed method names ... Changed kit modifiers to be in an enum instead of creating a new class for each modifier Implemented kit modifiers in the games Removed renaming from Widder, Christmas Elf and Pumpling Changed the persistence to have the system that Connor added	2016-06-02 18:25:16 -03:00
Thanos Paravantis	c1bd25cdbe	Merge branch 'develop' into thanos-mineware ... Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java	2016-06-02 22:06:59 +03:00
cnr	894b7db18e	Remove remaining fake ultra tag artifacts	2016-06-02 02:25:15 -05:00
Keir Nellyer	9465ab40ab	Fix sql query for fetching name of user account	2016-06-01 16:51:22 +01:00
Sam	936eb1b978	Merge remote-tracking branch 'refs/remotes/origin/develop' into mopple	2016-06-01 15:41:22 +01:00
cnr	750120c106	Prevent developers from using /punish	2016-06-01 00:47:22 -05:00
cnr	84853a1f9a	Revert "Update chat-spam message with coupon link" ... This reverts commit dfbb4dca11.	2016-06-01 00:39:44 -05:00
cnr	825839d853	Fix PlayerKeyValueRepository's exception and return types	2016-06-01 00:38:29 -05:00
Sam	6cb275e036	PC-121 ... Changed 'a' to 'an' in the text component of the friend menu	2016-05-31 14:44:18 +01:00
Shaun Bennett	4e9a48ab4f	Finish off the tip system	2016-05-30 12:02:12 -05:00
Thanos Paravantis	e77bee5cd8	Implement building champion, remove quick climber and enhance chicken attack ... Building Champion achievement was implemented as a replacement for quick climber achievement, since quick climber is almost impossible to complete in public games. Build Champion is based on Build Race challenge, and it requires players to place all blocks in their inventory, within 15 seconds. Moreover, chicken minions can now attack players, even if they are stuck in the water.	2016-05-30 12:51:58 +03:00
Shaun Bennett	e380354bad	Refactor CurrencyType	2016-05-29 16:34:21 -05:00
Keir Nellyer	01855ba1ce	Some small changes to the reporting system after some very shallow ... initial testing has been done Improve exception handling (so we actually get a stacktrace if something goes wrong). Check if users can report before showing the category gui. Tell user if the report failed (due to some sort of internal error). Correctly get the id of a report when inserting into the database for the first time. Shorten some lambdas by using method references. Remove some unused imports. Small variable name changes.	2016-05-29 02:45:24 +01:00
Keir Nellyer	55392eae97	No need for 'this' keyword here	2016-05-29 01:10:42 +01:00
Keir Nellyer	075c2d21e9	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-05-29 00:27:48 +01:00
Keir Nellyer	20038f9e64	Massive changes made to how the report feature functions ... Re-enabled report feature (merge from develop disabled it). Moved reports from Redis to MySQL. Made everything asynchronous. Many many other miscellaneous changes. Bugs will now be worked out and then this should be ready for QA testing	2016-05-29 00:25:26 +01:00
Shaun Bennett	a1437a3044	Starting to add gui logic	2016-05-28 11:23:26 -07:00
Shaun Bennett	aebcfc2727	Booster tip system	2016-05-28 09:21:10 -07:00
Shaun Bennett	e00009a6d1	Fix CustomTagFix applying to holograms under certain conditions	2016-05-28 09:20:33 -07:00
xGamingDudex	4fc3c491f8	Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into feature/mavericks-master-builders	2016-05-28 02:04:27 +02:00
cnr	dfbb4dca11	Update chat-spam message with coupon link	2016-05-27 13:18:07 -05:00
LCastr0	255191f01a	Changed gadget persistence to use Player Key/Value system (Thanks to Connor) ... Changed the method names for some classes	2016-05-26 23:58:36 -03:00
samczsun	f1f464f3a4	Change listener priority again. Fixes PC-209	2016-05-26 14:29:13 -05:00
Keir Nellyer	ad486a7e22	Merge remote-tracking branch 'origin/develop' into feature/report-v2 ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/report/ReportCategory.java	2016-05-26 13:24:24 +01:00
cnr	1c66c10293	Don't create backing tables on startup	2016-05-25 17:59:21 -05:00
cnr	5331e2bec9	Allow PlayerKeyValueRepository Exceptions to propagate	2016-05-25 17:59:20 -05:00
xGamingDudex	8a2c30fa84	Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into feature/mavericks-master-builders	2016-05-26 00:06:23 +02:00
LCastr0	e52ff13712	Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics	2016-05-25 12:20:18 -03:00
LCastr0	460cb08f54	Adds old gadget names ... Adds another fix for winroom speed Moves gadgets to individual packages, easier to manage in a future update Adds gadget persistence (Or maybe not) Changed mount locked item data to 8 instead of 7	2016-05-25 12:19:06 -03:00
cnr	857cf6ad30	Add PlayerKeyValueRepository and BukkitFuture ... PlayerKeyValueRepository<V> is a key/value store whose keys are Strings and whose value type is parameterized by V. Each repository is backed by a MySQL table in the Accounts database. Access to PlayerKeyValueRepository's values is restricted via CompletableFuture to enforce async database access. BukkitFuture contains helpful utilities for producing, transforming, and terminating CompletableFutures with actions on the main thread. A typical PlayerKeyValueRepository action may look similar to the following, where we retrieve all key/value pairs for a player and perform an action with the result on the main thread: PlayerKeyValueRepository<String> repo = [...]; // init repo UUID uuid = [...]; // a player's UUID repo.getAll(uuid).thenCompose(BukkitFuture.accept(values -> { // this will be run on the main thread! // `values` is of type `Map<String,String>` }));	2016-05-25 08:35:05 -05:00
samczsun	72a2aa926f	Change event priority again. Fixes PC-216	2016-05-24 13:15:29 -04:00
Sam Sun	cd0e59087a	Don't drop items from hidden slimes. Fixes PC-276	2016-05-24 13:15:29 -04:00
xGamingDudex	f550df5a4b	Initial game commit.	2016-05-24 13:31:59 +02:00
Shaun Bennett	434ada2e86	Fix merge issues	2016-05-24 19:14:52 +10:00
Shaun Bennett	1377e6724f	Merge with develop	2016-05-24 19:10:55 +10:00
Shaun Bennett	12c5ba80b7	API Endpoints, Web calls, Gem Fountain Schematics, Game Menu Update, Booster implementation	2016-05-24 17:13:33 +10:00
Ben	8da4ac3135	[Brute/FleshHook] Deal more damage/pull velocity when charging up more [PC-340]	2016-05-23 23:42:12 +01:00
LCastr0	3ad7fc5f21	Adds old Mr.Punchman name ... Adds another fix for winroom speed	2016-05-22 21:46:22 -03:00
LCastr0	ed68ef332b	Fixes for Win Room (Players were able to see other players) ... Added command to allow other players to run ranked commands Fixes code styles	2016-05-22 21:05:48 -03:00
xXVevzZXx	c984bbfc8a	make it possible to add stats to the brawl games	2016-05-22 00:29:58 +02:00
LCastr0	92b6abc884	Fixes merging bugs	2016-05-20 23:53:27 -03:00
LCastr0	0109e2f2dd	Fixes for Illuminated chest ... Fixes for /check command (Support)	2016-05-20 23:33:58 -03:00
xXVevzZXx	0fb84e57c1	Merge branch 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants ... # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java	2016-05-20 23:26:54 +02:00
cnr	d6750c7d91	Disable /unlockCosmetics on production servers	2016-05-20 03:23:27 -05:00
LCastr0	22fb507871	Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics	2016-05-20 05:14:29 -03:00
LCastr0	c58e0f3e30	Fixes for the 1 Shard thing (Next time, for testing, use /unlockCosmetics)	2016-05-20 05:11:59 -03:00
Shaun Bennett	efb264dd75	Hook into Booster API	2016-05-20 16:58:58 +10:00
Thanos Paravantis	28f1d45b1c	Update achievement category game enum	2016-05-19 20:55:22 +03:00
Thanos Paravantis	472d3881a0	Merge branch 'develop' into thanos-mineware	2016-05-19 20:49:45 +03:00
Thanos Paravantis	87c8c7efa4	Merge branch 'master' into thanos-mineware	2016-05-19 20:42:43 +03:00
cnr	7f44281441	Merge branch 'develop' into project-cosmetics	2016-05-19 10:04:19 -05:00
Shaun Bennett	012edfed45	Use loaded schematics to display fountain progress	2016-05-18 18:04:21 +10:00
LCastr0	11db05b6bf	Fixes spelling of MineStrike gun ... Fixes spectators not being sent to the winroom	2016-05-18 03:58:50 -03:00
Shaun Bennett	e3833b95ad	Update Gem Fountain purchase gui	2016-05-18 15:59:04 +10:00
TadahTech	3479d6e318	Fix incognito.	2016-05-17 18:12:05 -05:00
TadahTech	38a0b593ee	Fix height for 1.9 and 1.8 users. ... *Thanks QA for not fully testing*....	2016-05-17 18:11:28 -05:00
Ben	35c7b9a2bd	Incognito Updates: ... -ADD: Prompt in Tab to identify who is in vanish (Can be a * or [Vanish]) -ADD: Make it so /stats don't work on vanished staff. -ADD: Make sure it can be toggled off on /vanish again or network leave. Staff get stuck with it when resigning. Should stay on in-between lobbies.	2016-05-17 18:10:07 -05:00
Ben	8a75a5098c	Remove hub invisibility preference for all but Admins and higher.	2016-05-17 18:08:01 -05:00
Ben	014ce137fc	If a player uses /a regardless of if staff are online, offline, or vanished, making it always yield a response telling the player that if there are staff currently online, they will receive a reply soon - removing the "there are no staff online" message. Also a 60s Recharge for this.	2016-05-17 18:03:18 -05:00
Ben	6760c07e6c	Fix staff members getting stuck in both Incognito mode and the Hub Invisibility preference, and not being able to toggle either off them off because Incognito would stop Hub Invisibility from getting toggled (on OR off), and vice versa.	2016-05-17 18:00:20 -05:00
AlexTheCoder	141cafcf28	Implement initial game code and add skeleton for full play	2016-05-17 17:29:23 -04:00
xXVevzZXx	6e9b0e4fa5	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants ... # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java	2016-05-17 14:41:17 +02:00
TadahTech	43cadf564e	Fix Carl the Creeper. Fix Bridges TNT exploit.	2016-05-16 22:03:27 -05:00
LCastr0	fb63b3a1a4	Fixes for winroom command, and illuminated chest	2016-05-15 22:49:10 -03:00
LCastr0	42eef838b3	Fixes podium not being enabled by default	2016-05-15 21:33:36 -03:00
xGamingDudex	a27a618b2f	Made debugging tools only available on test servers	2016-05-16 02:04:15 +02:00
xGamingDudex	816a7ca232	Re-Activated chest buttons	2016-05-16 01:57:58 +02:00
xGamingDudex	d92ad9c53f	Made illuminated chest purchasable and added appropriate lore	2016-05-16 01:51:40 +02:00
LCastr0	511726f72a	Treasure chest coin checker for test servers	2016-05-15 20:43:46 -03:00
xGamingDudex	4ebf48bd45	Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics	2016-05-16 01:34:08 +02:00
xGamingDudex	8ad7646128	Edits to treasure chests	2016-05-16 01:33:54 +02:00
xGamingDudex	f8d5bd3c11	Fixed treasure chests ... Items would sometimes pop out of chest blocks You could open illuminated chests before they were converted to real chests	2016-05-16 00:51:33 +02:00
LCastr0	09b7fbdbbe	Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics	2016-05-15 18:48:00 -03:00
LCastr0	4f79ec6551	Pinata fixes	2016-05-15 18:47:09 -03:00
xGamingDudex	b4aad690e5	Fixed some rewards and added party trail to chests	2016-05-15 23:31:10 +02:00
xGamingDudex	fdf167953f	Fixed emerald set order	2016-05-15 23:30:17 +02:00
xGamingDudex	1e6dda2d7d	Cleaned up some win effect backend code & fixed kits working in winroom	2016-05-15 23:28:12 +02:00
xGamingDudex	d850bed725	Minor code tweaking ... * Made reward manager ammo multiplier private final field * Removed old commented code from WinEffectPodium, WinEffectLavaTrap, ParticleMusic, ParticleEmerald, ParticleBlood * Cleaned up the GameModifierMineStrikeSkin filter * Removed unused Math#isBetween(double, double, double) method * Changed Animator to use PriorityQueue	2016-05-15 19:43:07 +02:00
xGamingDudex	97f82e422d	Merge branch 'project-cosmetics' of ... ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/animation/Animator.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/animation/AnimatorEntity.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ICosmeticShape.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ShapeWings.java	2016-05-15 16:03:36 +02:00
xGamingDudex	22e54557d8	Fixed cleaning method for WineffectRiseOfTheElderGuardian ... The class contained commented code, removed when debugging	2016-05-15 15:33:42 +02:00
xGamingDudex	abddc446fd	Added java docs and tweaked code ... * Fixed possible duplication bug in MulitBlockUpdaterAgent * Tweaked some of the factor methods for Shape.java * Cleaned some code in ShapeWings.java	2016-05-15 15:32:44 +02:00
LCastr0	1cc44d1b3e	Fixes for the following classes: ... KitGameModifier KitModifierType MultiBlockUpdaterAgent Shape GadgetManager KitModifierType HatLovestruck HatSecretPackage SetLove Animator AnimatorEntity AnimationPoint ICosmeticShape UtilText KitGameModifier KitModifierType Removed build.xml and org.eclipse.jdt.ui.prefs	2016-05-15 00:20:07 -03:00
xGamingDudex	24f7a4b409	Added "(Minestrike Weapon Skin)" suffix to MS skins in treasure rewards	2016-05-14 18:53:09 +02:00
samczsun	b2e92fdf15	Don't pass on INTERACT_AT as INTERACT. Fixes PC-114	2016-05-14 09:42:28 -05:00
LCastr0	20b9f428b4	Fixes Illuminated Chest's Lore ... Fixes Pinata Burst not being saved Fixes AWP Asiimov and XM1014 Tranquility materials Removes Fireworks WinRoom Changes prices of things from 1 shard to Treasure Chest More unused imports removed Fixed ANGLE_WING_PATTERN -> ANGEL_WING_PATTERN Adds javadoc to UtilColor.applyColor() Adds javadoc to UtilColor.getNextColor() defaultLeatherColor -> DEFAULT_LEATHER_COLOR Adds suggestions for UtilColor Adds final modifier to _worldBorders (UtilPlayer) Changed _worldBorders key from String to UUID Adds suggestion for UtilPlayer Adds final modifier to _type (GameModifierSubPage) Adds final modifier to _type and _kitType (KitGameModifierPage) DefaultDencity -> DefaultDensity (Shape) Changed <Vector> to <> (Shape) dencity -> density (ShapeBox, ShapeGrid, ShapeSphere) Using speed and count in constructor (ShapeWings) Removed empty constructor (WorldGenCleanRoom, MultiBlockUpdaterAgent) Adds final modifier to all fields (AnimationPoint)	2016-05-14 01:18:37 -03:00
Shaun Bennett	b802cdec6d	Rename shop to "Fountain Keeper"	2016-05-14 14:01:28 +10:00
xXVevzZXx	63c44afa10	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants	2016-05-13 22:05:27 +02:00
xXVevzZXx	df5c628c35	add new gamemodes Tiny Winners, Random Kit SSM, UHC SW, UHC SG and improve OP SG, OP SW, OP Bridges, Dukes of decoration, OP Gladiators, Faster than Light, Bunny Hopper and Countdown	2016-05-13 20:23:04 +02:00
xGamingDudex	2cc609b67e	Moved some rewards from normal to valentines	2016-05-13 01:28:26 +02:00
xGamingDudex	35ab155756	Removed unnecessary lore from minestrike game modifiers	2016-05-13 01:20:06 +02:00
xGamingDudex	d34f77a381	Moved some rewards from normal to winter chest	2016-05-13 01:19:06 +02:00
xGamingDudex	9c2c415eb2	Fixed the emerald trail leaving from idle to moving	2016-05-13 01:14:00 +02:00
xGamingDudex	3bb3821fa9	WinEffect gadget disable and MineStrike name and data update	2016-05-13 01:04:35 +02:00
xGamingDudex	4958ab8149	Bug Fixes ... * Fixed Menu page adding glow to win effects if game modifiers were active * MineStrike skins were not properly applying material and data * Skinned knife was not dealing damage	2016-05-13 00:38:56 +02:00
xGamingDudex	06e583c05e	Added flat podium to Firework and Punchman	2016-05-12 23:50:41 +02:00
xGamingDudex	956d64d750	Git Merge Import Fix	2016-05-12 23:46:39 +02:00
xGamingDudex	29d4db0bfd	Merge branch 'project-cosmetics' of ... ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics Conflicts: Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java	2016-05-12 23:46:17 +02:00
xGamingDudex	2db98613ab	Cosmetic Update ... * Redid the Reward manager Added new rewards to the chest and changed some values * Fixed some MineStrike skin bugs * Removed particles/death effects from Minestrike * Removed old test minestrike skins * Moved minestrike skins to correct package * Changed the illuminated chest animation a bit * Fixed other minor bugs	2016-05-12 23:42:37 +02:00
LCastr0	6f4c6bc545	Fixes counter on WindUp suit ... Removes kit modifier categories	2016-05-12 15:00:43 -03:00
Keir Nellyer	13ff2e5263	Fix query for pulling report profiles ... Previously we didn't check that the user actually reported an issue so in effect we were creating a report from every single logged incident (regardless of whether the user in question was involved).	2016-05-12 14:38:04 +01:00
Keir Nellyer	814f3516de	Make the chat abuse color easier on the eyes ... Dark blue [bold] is hard to read, dark aqua [bold] should be easier to read.	2016-05-12 14:22:19 +01:00
xGamingDudex	276f572009	Merge branch 'project-cosmetics' of ... ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics Conflicts: Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathPinataBurst.java	2016-05-10 20:21:37 +02:00
xGamingDudex	1b0b9a894b	Tweaked some cosmetics ... * Changed Party Death to firework icon * Removed idle spark from Emerald Trail * Changed wing style to pixie from angle on infernal wings * Added black dots to YinYang Started some work on the RewardManager	2016-05-10 20:20:44 +02:00
LCastr0	4fada6de49	Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics	2016-05-10 12:45:22 -03:00
LCastr0	5b8ff933b1	Removed more unused imports ... Fixed some lores and names for cosmetics Renamed some classes to match Set name Commented out the Lovely set (Duplicate of Cupid's Love) Fixed set descriptions Added 'Comming soon...' to set bonuses	2016-05-10 12:44:45 -03:00
Keir Nellyer	7c80c3826b	Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report	2016-05-08 21:49:16 +01:00
Conrad	ac86f3ac8c	Merge pull request #55 from Mineplex-LLC/alex-mcl ... Change the visuals of the Billboards and of ELO's display in the stat…	2016-05-08 13:29:23 -04:00
AlexTheCoder	34e8d65f4d	Change the visuals of the Billboards and of ELO's display in the stats menu to be more user friendly	2016-05-07 21:16:12 -04:00
Keir Nellyer	b68127b111	Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report	2016-05-08 00:37:59 +01:00
Keir Nellyer	b1a41c3cb3	Make chat abuse colour easier on the eyes ... Dark blue [bold] is hard to read, dark aqua [bold] should be easier to read.	2016-05-07 22:48:49 +01:00
xGamingDudex	5649939f8c	Removed some old disabled code.	2016-05-06 21:59:18 +02:00
xGamingDudex	e04a897488	Added some pre-animation to chicken win effect. Removed some comments.	2016-05-06 21:58:31 +02:00
xGamingDudex	0fea90516b	Alternative emerald trail for full set	2016-05-06 13:24:06 +02:00
xGamingDudex	f58db6ee3b	Removed firework from party death ... Replaced the death effect with item drops instead	2016-05-06 13:12:28 +02:00
xGamingDudex	d60fea4f76	Added chicken and guardian win room schematic handlers	2016-05-06 13:00:45 +02:00
LCastr0	97ef801e3d	Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics	2016-05-06 00:40:55 -03:00
LCastr0	49c45628a2	Removed more unused imports ... Fixed some lores and names for cosmetics Renamed some classes to match Set name Commented out the Lovely set (Duplicate of Cupid's Love)	2016-05-06 00:40:22 -03:00
Shaun Bennett	93c2886601	Add boosters to inventory menu	2016-05-06 13:31:59 +10:00
Conrad	55d40a1a6b	Merge pull request #53 from Mineplex-LLC/feature/logitech-brand ... Changed design of billboard and fixed its centering in hubs	2016-05-05 18:33:15 -04:00
AlexTheCoder	f329051399	Changed design of billboard and fixed its centering in hubs	2016-05-05 18:25:51 -04:00
xGamingDudex	17a4517e71	Merge remote-tracking branch 'origin/develop' into project-cosmetics ... Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java	2016-05-05 21:03:15 +02:00
xGamingDudex	1a96ea3c18	Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics	2016-05-05 20:29:28 +02:00
xGamingDudex	db21c7dd22	EGit FTW! ... Git, you are the greates, randomly deciding not to include everything when I spesify you to do so.... This should have been part of prev commit.	2016-05-05 20:26:00 +02:00
xGamingDudex	9fca9283e2	Fixed skin layers for Player/Human disguises	2016-05-05 10:39:00 +02:00
Keir Nellyer	e1f2bb9740	Use all-man style braces here to be compliant with the coding standards ... (cherry picked from commit e553ac5)	2016-05-04 16:02:39 +01:00
Keir Nellyer	a663cb3e01	Revert "Revert "Report system (version 1)"" ... This reverts commit d0d2de1e21. # Conflicts: # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java	2016-05-04 15:24:29 +01:00
Conrad	145ea9221a	Merge pull request #40 from Mineplex-LLC/clans/beta ... Clans/beta	2016-05-03 16:57:07 -04:00
LCastr0	cfc6f3703d	Merge pull request #50 from Mineplex-LLC/develop ... Merge from develop	2016-05-03 13:24:32 -03:00
Conrad	3c482e38cc	Merge pull request #47 from Mineplex-LLC/feature/logitech-brand ... Convert over to System.out.println() for error messaging and add prot…	2016-05-02 16:34:58 -04:00
Conrad	2cd76fbf72	Merge pull request #48 from Mineplex-LLC/alex-mcl ... Add catch for rare occurrence where players have no stored data	2016-05-02 16:34:50 -04:00
AlexTheCoder	ccd5b47d75	Convert over to System.out.println() for error messaging and add protection for billboards in Hub via a new manager	2016-05-02 16:20:41 -04:00
LCastr0	055b8684c2	- Added action bar message when booster is ready (Wind Up Suit) ... - Moved each suit to an individual package, to make it easier to work with - Removed some unused imports - Added util to get entity egg data - Added kit modifiers: Beastmaster, Horseman and Necromancer (SG), Apple (Bridges) - Added specific kit pages to game modifier menu	2016-05-02 00:13:06 -03:00
Keir Nellyer	fa017c185d	Add method to load ReportProfile from database	2016-05-01 22:48:02 +01:00
Keir Nellyer	41bc9672ab	Remove un-needed imports	2016-05-01 21:49:08 +01:00
Keir Nellyer	ccf14d0d2a	Declare final variables in ReportCategory	2016-05-01 21:12:01 +01:00
Keir Nellyer	132f431a94	Map each ReportResult to its id in the database ... We no longer use the statistic system to store the results of reports but rather store the result of each ticket in a database table.	2016-05-01 21:10:55 +01:00
Keir Nellyer	1d36d4c4b9	Map each ReportCategory to it's id in the database	2016-05-01 21:04:20 +01:00
AlexTheCoder	7e97bd346e	Change an internal method to private and add missing class JavaDoc	2016-05-01 15:16:42 -04:00
AlexTheCoder	335c5a4510	Clean up billboard generation and clearing, rewrite MapRender for logos, and add JavaDocs to comply with code standard	2016-05-01 14:58:40 -04:00
AlexTheCoder	48c8a5a630	Force structure to spawn correctly, complete with maps on item frames	2016-05-01 01:56:07 -04:00
Ben	189f9ad524	Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta	2016-05-01 01:42:32 +01:00
Ben	2337e89a93	Improvements to the Clans ban system in general as it was performing more operations than required, and accessing the database more than was necessary. Polished up the Clans ban GUI as well.	2016-05-01 01:42:11 +01:00
AlexTheCoder	070326e72d	Create systems to automatically create and destroy branding boards, as well as implement the Logitech branding	2016-04-30 19:26:16 -04:00
Keir Nellyer	e553ac5aab	Use all-man style braces here to be compliant with the coding standards	2016-04-30 23:12:25 +01:00
Keir Nellyer	bce218a65e	Merge branch 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-04-30 23:11:35 +01:00
AlexTheCoder	39c105f0cf	Add catch for rare occurrence where players have no stored data	2016-04-30 15:34:04 -04:00
Conrad	d0d2de1e21	Revert "Report system (version 1)"	2016-04-30 14:53:59 -04:00
Conrad	e0e30a8b7f	Merge pull request #43 from Mineplex-LLC/alex-mcl ... Fix Async Elo Ranked Bans	2016-04-30 14:46:49 -04:00
AlexTheCoder	37a815d52a	Update JavaDocs to fit Mineplex standard	2016-04-30 14:41:28 -04:00
AlexTheCoder	2e4bae6915	Merge branch 'feature/top-elo' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla	2016-04-30 14:14:14 -04:00
AlexTheCoder	2dc5c46624	Fix naming convention on checkRankBannedAsync	2016-04-30 14:13:21 -04:00
AlexTheCoder	41e26f283c	Fix all async elo ranked ban methods and switch to callback system for API hooks	2016-04-30 14:10:09 -04:00
TadahTech	6e35bc0989	Stop spamming the chat.	2016-04-30 00:55:59 -05:00
Keir Nellyer	2490e3df82	Previous git merge cause this single line to be deleted ... I literally have no idea why or how this happened.	2016-04-29 23:47:01 +01:00
Keir Nellyer	6a00f26d5f	Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java # Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java	2016-04-29 23:42:27 +01:00
Keir Nellyer	81cebc4ce7	Swap static helpers for a much better solution ... This allows for easier refactoring in the future when we move away from retrieving the CoreClientManager from a static instance. Mineplex coding standards are also against the use of static helpers in scenarios such as this, therefore this commit brings this branch to be in-line with the coding standards.	2016-04-29 23:37:40 +01:00
Shaun Bennett	184d247fc9	Start adding BoosterPage. Move Boosters to core to support UI's	2016-04-29 17:37:34 +10:00
AlexTheCoder	a8d9745320	- Fixed order of Top Elo	2016-04-29 00:12:25 -04:00
TadahTech	26f6a1189f	Prettyfy EloCommand	2016-04-28 21:34:43 -05:00
TadahTech	e83e4b270c	Prettyfy EloCommand	2016-04-28 21:34:07 -05:00
TadahTech	00efb7d72e	Fix ELO query	2016-04-28 21:20:48 -05:00
TadahTech	84ca13c0d3	Fix ELO query	2016-04-28 21:09:28 -05:00
TadahTech	80ea7b7a4c	Fix ELO query	2016-04-28 21:09:07 -05:00
TadahTech	5a4f89b484	Fix ELO query	2016-04-28 21:04:07 -05:00
AlexTheCoder	7c279998ec	- Changed top elo queries	2016-04-28 21:55:51 -04:00
AlexTheCoder	8e68d62356	- Added documentation for new EloManager methods	2016-04-28 21:16:18 -04:00
AlexTheCoder	2887630cf8	- Added javadoc headers	2016-04-28 21:11:38 -04:00
AlexTheCoder	4b7684da4c	Merge branch 'feature/top-elo' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla	2016-04-28 21:05:56 -04:00
AlexTheCoder	e032b81842	- Made SQL calls async	2016-04-28 20:59:49 -04:00
TadahTech	562e950361	Remove File headers.	2016-04-28 19:46:13 -05:00
TadahTech	680e579223	Merge Alex's branch into mine. ... Convert to Java 8 Remove unneeded comments.	2016-04-28 19:39:24 -05:00
TadahTech	168483a9fc	Communities work	2016-04-28 19:30:05 -05:00
TadahTech	725481f310	Top Elo data for Webpage	2016-04-28 19:23:57 -05:00
TadahTech	84c0b1b389	Top Elo data for Webpage	2016-04-28 19:22:45 -05:00
AlexTheCoder	156982460f	- Fixed water permanently [MCL] ... - Fixed team balancing [MCL] - Fixed overjoining [MCL] - Changed bans for quitting ranked matches [MCL]	2016-04-28 20:03:09 -04:00
Keir Nellyer	5dbb3744d1	Improve reputation map initialization logic	2016-04-28 23:52:26 +01:00
Keir Nellyer	c82dd27b64	Make getValueOf method more robust	2016-04-28 23:36:41 +01:00
Keir Nellyer	bff5751691	Remove very last @author tag	2016-04-28 14:41:44 +01:00
AlexTheCoder	dcd376b837	- Improved graphics for Elo display in /stats	2016-04-28 01:01:14 -04:00
AlexTheCoder	189296a586	- Fixed using water in restricted zones in MCL ... - Implemented Elo in /stats menu	2016-04-28 00:53:04 -04:00
AlexTheCoder	b4c5be81f3	- Fixed random weather in MCL ... - Added Elo Division display to /stats for applicable games - Made fishing rods kept on death in MCL	2016-04-27 23:12:38 -04:00
AlexTheCoder	a16145479e	- Disabled picking up lava ... - Leaving ranked matches temp bans players from rejoining them	2016-04-27 03:18:44 -04:00
LCastr0	d0e7590b2a	Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics	2016-04-26 23:23:45 -03:00
LCastr0	a7ef8bec49	Adds new constructor to NotePlayer, to be able to send the song to specific players ... Some WindUp costume fixes Added actionbar and song to WindUp suit Created new booster manager	2016-04-26 23:21:59 -03:00
xGamingDudex	38d03b8468	Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics	2016-04-27 00:03:29 +02:00
xGamingDudex	79f210e242	Schematic and WinEffect update ... +Added better schematic support +Fixed schematics not sending block updates to nearby players +Added win room schematics *Tweaked some of the win rooms +Added sounds to the Lava Trap win effect.	2016-04-27 00:01:30 +02:00
Shaun Bennett	714000163b	Add messages when fountain is complete and resets	2016-04-26 16:19:27 +10:00
Shaun Bennett	4a8c38e1c8	Add fountain reset command	2016-04-26 15:33:52 +10:00
Shaun Bennett	cabf4c4c8b	Add BlockProgressBar for Gem Fountain	2016-04-26 15:26:07 +10:00
Shaun Bennett	e8370579c0	Counter refactoring	2016-04-26 13:55:06 +10:00
Thanos Paravantis	d0336be7b7	Add new achievements and modify current ones	2016-04-25 22:59:24 +03:00
LCastr0	28de514d1a	Adds some utils for UtilColor ... Small changes in Wind Up suit	2016-04-24 21:39:35 -03:00
Thanos paravantis	856eb6059b	Update statistics and implement data tracker	2016-04-24 22:39:56 +03:00
Keir Nellyer	8969ec172b	Merge branch 'feature/report' into feature/report-v2	2016-04-24 18:26:10 +01:00
Keir Nellyer	949f9ca712	Don't allow players to report themselves ... I left this to last minute to make testing easier, as with this check in place it means at least two players are required to test the report mechanism.	2016-04-24 18:10:01 +01:00
Keir Nellyer	dab1f9485c	Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report	2016-04-24 17:17:17 +01:00
Keir Nellyer	9df4dac023	Remove dead code ... This was left over from before I took over development of the report feature.	2016-04-24 17:16:36 +01:00
Keir Nellyer	713263214f	Run ReportPurgeTask asynchronously ... This prevents the task from hanging the server which may be an issue when a large amount of reports exist.	2016-04-24 17:15:12 +01:00
Keir Nellyer	57e9cd6e19	Add class headers and remove @author tags ... This makes the PR compliant with with the Mineplex coding style. Class headers are used to describe the function of a class and git history will be used to determine the author of a class.	2016-04-24 17:10:29 +01:00
Keir Nellyer	84f5bd2f31	Handle abusive report types	2016-04-24 16:51:01 +01:00
Thanos paravantis	e2a6500bce	Update game achievements	2016-04-24 13:37:39 +03:00
Shaun Bennett	b21dfad12e	Merge remote-tracking branch 'remotes/origin/develop' into feature/gems ... # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java	2016-04-24 13:37:45 +10:00
Shaun Bennett	c60beec68c	Implement Fountain GUI	2016-04-24 12:40:38 +10:00
LCastr0	491c509317	Added UnlockCosmetics command (/unlockCosmetics <type>) ... Added Ammo command (/ammo <gadget> <ammo> [player]) Added util for red world border screen (UtilPlayer.sendRedScreen) Added new costume -> Wind Up Removed test gadget (ItemBouncyBall)	2016-04-23 22:16:02 -03:00
xGamingDudex	ccd630e2ae	Leftovers from merge	2016-04-23 00:56:19 +02:00
xGamingDudex	b7099088a9	Merge remote-tracking branch 'origin/develop' into project-cosmetics ... Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/block/schematic/Schematic.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguisePlayer.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/data/TNTGenerator.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/MiscManager.java	2016-04-23 00:55:48 +02:00
Thanos paravantis	fa75bc15ad	Merge branch 'develop' into thanos-mineware ... Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java	2016-04-22 22:03:15 +03:00
Jonathan Williams	fe0cee65e8	Added gem and coin rewards back into bonus.	2016-04-22 05:33:25 -05:00
Jonathan Williams	260c617007	Merge remote-tracking branch 'remotes/origin/alex-mcl' into develop	2016-04-22 05:12:30 -05:00
Jonathan Williams	e28621ae26	Set oldElo equal to new elo on new row.	2016-04-22 05:04:13 -05:00
AlexTheCoder	70541fd6f2	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla	2016-04-22 05:41:24 -04:00
Jonathan Williams	d73b720323	Merge branch 'features/elo' into develop	2016-04-22 04:34:35 -05:00
Jonathan Williams	477acf044e	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop	2016-04-22 04:34:21 -05:00
Jonathan Williams	6db7e648f5	Don't insert new row if the update doesn't succeed because of elo mismatch on loss.	2016-04-22 04:20:59 -05:00
Jonathan Williams	7b18efa7b0	Prevent farming elo up with multiple games by dc and joining new game.	2016-04-22 04:05:07 -05:00
Jonathan Williams	ddd1c5af9b	Removed EloSettings and fixed scoreboard.	2016-04-22 03:10:09 -05:00
Jonathan Williams	a31eccc15b	Multiply new rating by team size. MIssed that undo!	2016-04-22 02:53:02 -05:00
Jonathan Williams	757c945320	Added in kFactor ratio application to rating delta.	2016-04-22 02:35:37 -05:00
Jonathan Williams	aa6d25139f	Tweaked elo for team games.	2016-04-22 02:04:57 -05:00
Jonathan Williams	776093288a	Fixed rating not setting in EloPlayer constructor.	2016-04-22 01:11:48 -05:00
Jonathan Williams	977fbe684a	Fixed elo query.	2016-04-22 01:06:33 -05:00
Jonathan Williams	6d00e8b41f	Refactored Elo to work correctly.	2016-04-22 00:21:11 -05:00
Shaun Bennett	8a5fdccb60	Add to fountain button	2016-04-22 11:26:05 +10:00
AlexTheCoder	d0e3b094c1	- cleaned up and prepped for live update	2016-04-21 20:57:35 -04:00
Shaun Bennett	e46798f20e	Fix NPE in AdminCommand from IncognitoManager being null	2016-04-22 10:49:34 +10:00
Shaun Bennett	435d3968a2	Fix Fountain string being changed to Counter from refactor	2016-04-21 19:46:20 +10:00
AlexTheCoder	d57cc48f0f	- Added new features!	2016-04-20 22:31:54 -04:00
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
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
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
Shaun Bennett	cb48df6a3d	Update fountain count every 5 seconds. Display Hologram	2016-04-19 14:30:38 +10:00
Shaun Bennett	5a667a7d31	Add /fountain command. Fountain implementation	2016-04-19 13:57:19 +10:00
AlexTheCoder	6c20427395	- Fixed some bugs and added final achievements	2016-04-18 22:32:15 -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
AlexTheCoder	44263beb87	- Make elo store/recover properly	2016-04-17 17:34:18 -04: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	b0d30a4ff4	- cleaned everything up ... - renamed game	2016-04-16 20:32:14 -04: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	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
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
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
cnr	ab21efd2ca	Give the correct amount of old/ancient chests for bonuses	2016-04-13 18:51:52 -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
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
Keir Nellyer	56b0a886bf	Add helper method for setting common item meta values	2016-04-09 00:36:04 +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
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
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	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	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
Joseph Prezioso Jr	09db5a8131	I'm committing this so I can checkout to a different branch	2016-04-05 16:41:50 -04: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	7f92a3c048	incognito changes	2016-04-05 00:38:27 +01: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	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	1b1e6f6ef5	Moved the redis operation before asking for a mysql connection	2016-04-04 13:45:20 -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
Shaun Bennett	e11a9379b9	More tutorial tweaking	2016-04-04 12:32:22 +10:00
Jonathan Williams	401127caa9	Reworked Monthly bonuses so they always succeed and it logs them.	2016-04-03 01:36:30 -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	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
Joseph Prezioso Jr	6e23a17acb	Removed unnecessary code.	2016-04-01 16:01:57 -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
Joseph Prezioso Jr	b1c29a4fa6	Setup proper Elo brackets with the top 1% being placed in diamond. Also changed starting Elo to 1400 (middle of Iron 1), leaving Coal as a purely regressive division.	2016-03-30 16:06:30 -04:00
Joseph Prezioso Jr	00ee594f28	Missed one file last time	2016-03-29 17:50:45 -04:00
Joseph Prezioso Jr	6048c97b52	Tweaks to clean/clarify things	2016-03-29 17:50:06 -04:00
Joseph Prezioso Jr	51cd770d38	Changes to help smooth the transition into using EloSettings.	2016-03-29 16:00:57 -04:00
Joseph Prezioso Jr	35fc5223b1	reverted previous changes back to lastIndexOf (and altered comments accordingly) on the advice of SJSampson (with whom Sigils agreed)	2016-03-29 14:03:21 -04:00
Joseph Prezioso Jr	0c479e1562	Made change to Elo calculation under Sigils' advisement. Now using indexOf, rather than lastIndexOf to find Elo	2016-03-29 14:00:59 -04:00
Joseph Prezioso Jr	f496392c5a	EloDivision class created. ... EloManager can now calculate division ranking (EloDivision can also do this once we are ready for it to)	2016-03-29 13:49:59 -04:00
Joseph Prezioso Jr	38a079846d	Some basic ideas for Elo I will be experimenting with	2016-03-28 18:14:52 -04:00
Shaun Bennett	caf8170a32	Tutorial Changes	2016-03-27 08:47:34 +11:00
William Burns	c1adb7e1bc	Remove Slack attachment functionality (for now).	2016-03-26 13:12:59 -04:00
William Burns	29966195ee	Create an API for sending Slack message to multiple teams and channels.	2016-03-26 13:07:41 -04:00
AlexTheCoder	6678dffb61	- Updated everything for Sigils and chiss	2016-03-25 20:25:43 -04:00
Ben	f000360565	missing a few files	2016-03-24 19:29:45 +00:00
Shaun Bennett	3d473ad00a	Merge remote-tracking branch 'origin/clans/beta' into clans/beta	2016-03-23 20:39:21 +11:00
git	4dd756286e	Fix small resource pack bug	2016-03-23 20:32:13 +13:00
Shaun Bennett	e8dcc4a3e2	Merge branch 'develop' into clans/beta ... # Conflicts: # Plugins/Mineplex.Cache/src/mineplex/cache/player/PlayerCache.java # Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java # Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java	2016-03-23 11:02:20 +11:00
Shaun Bennett	1e73adf2af	Increase ram and cpu for event server	2016-03-23 10:23:04 +11:00
Shaun Bennett	656780d027	Change runAsync in MiniPlugin to use our own thread pool ... This allows the tasks to run immediately. Using Bukkit's scheduler the async task wont start until the next server tick	2016-03-23 10:22:40 +11:00
Shaun Bennett	da9a642a6d	Process item for treasure before opening	2016-03-23 10:21:36 +11:00
Shaun Bennett	309b5464f2	Clean up Account Repository, attempt to load account ID from cache	2016-03-23 10:21:02 +11:00
Shaun Bennett	85cb065d5c	Merge pull request #14 from Mineplex-LLC/Dual_1.9 ... 1.9 Bugfixes + Ring game	2016-03-22 19:25:37 +11:00
Shaun Bennett	61b79fab9d	Merge pull request #13 from Mineplex-LLC/PC-15 ... Fix PC-13, PC-15, PC-16, PC-17	2016-03-21 20:31:58 +11:00
md_5	55e64a09b9	Test Gem Booster Item	2016-03-21 20:08:40 +11:00
Jonathan Williams	b4dfeb224b	Reduced NCP exempt time by .5s.	2016-03-21 02:06:11 -05:00
Jonathan Williams	8427ead097	Changed how currency types is initialized to avoid possible NPE	2016-03-19 15:33:16 -05:00
Ben	995d454f87	tutorial additions.	2016-03-18 02:47:51 +00:00
Ben	a4cbe54c78	Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito ... Conflicts: Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java	2016-03-18 01:21:25 +00:00
Ben	2cf59ced8b	new pvp timer management, fixed build house task, fixed incognito	2016-03-18 01:18:35 +00:00
md_5	4899d56c09	Implement local gem boosters that can be activated on a joined arcade server.	2016-03-17 19:49:05 +11:00
Ben	add651780b	priority chat filters, fixed siege weapon clicking listeners being incorrect	2016-03-17 01:06:07 +00:00
Ben	93767b7a90	tutorial changes, chat filter system, commented out all web stuff for analytics.	2016-03-16 22:46:18 +00:00
Ben	0d237370e1	Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta	2016-03-15 23:33:09 +00:00
Keir Nellyer	25075597f2	Only allow Ultra+ players to use /report whilst it's in beta testing.	2016-03-15 17:43:16 +00:00
Shaun Bennett	e53b8616d1	A ton of tutorial work	2016-03-15 10:29:43 -05:00
Ben	813a3833ae	implement temporary holograms	2016-03-15 00:48:50 +00:00
Ben	e08ba29ac1	Final fixing of cannon saving/loading	2016-03-14 22:48:31 +00:00
Ben	422df69335	incognito async stuff and updated alpha holograms	2016-03-11 21:50:48 +00:00
Ben	86c50cc3cd	updates	2016-03-11 19:03:32 +00:00
Shaun Bennett	1228ca227e	Add support for 1.9 resource packs, Text Tutorials	2016-03-11 11:50:08 -06:00
Ben	a27fb90c2a	Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito	2016-03-11 02:21:03 +00:00
Ben	0e276474c5	fixerroooniissssss	2016-03-11 02:20:18 +00:00
Ben	01ba099d74	Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito	2016-03-11 01:52:38 +00:00
Ben	c9eb2c9559	Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito	2016-03-11 01:52:31 +00:00
Ben	57c65cf5ff	some changes and vanish fixes maybe?	2016-03-11 01:47:14 +00:00
Ben	a568db6d90	remove eclipse file	2016-03-11 00:43:30 +00:00
Ben	bcfe4a42c0	changerooonis	2016-03-11 00:41:28 +00:00
Ben	33d978c6d6	Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta	2016-03-10 22:12:41 +00:00
Ben	20ade492a8	tnt generator changes	2016-03-10 22:09:45 +00:00
Shaun Bennett	76782fd420	Fix issues	2016-03-10 15:07:22 -06:00
git	557b0bf978	Fix Wither disguise	2016-03-11 01:55:49 +13:00
Ben	5b3da3d06f	Consistency. (Changed Vanish to Incognito)	2016-03-09 01:53:01 +00:00
Ben	befb27d3db	Finalized Vanish system	2016-03-09 01:45:17 +00:00
Virizion	b1c8158e2f	Added @a argument to /shard, /gem and /giveitem PC-13	2016-03-08 19:52:31 -05:00
Ben	abdf61de0a	*more fixes*	2016-03-08 21:02:25 +00:00
Ben	af8f0fff16	vanish error fixes	2016-03-08 21:00:19 +00:00
Ben	69091c079f	Merge branch 'feature/incognito' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta	2016-03-08 20:58:11 +00:00
Shaun Bennett	9b65926d42	Fix rank monthly rewards description	2016-03-08 13:26:26 -06:00
Ben	1f09616784	chat packet listener	2016-03-08 18:28:54 +00:00
Shaun Bennett	99c2fefed2	Merge remote-tracking branch 'remotes/origin/clans/tutorial' into clans/beta ... # Conflicts: # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java	2016-03-08 12:27:45 -06:00
Ben	86ef10456c	packet hnadler beginning, switching to clans to fix errors	2016-03-08 18:10:57 +00:00
Ben	f24e196efd	Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito	2016-03-08 18:07:57 +00:00
Ben	036565abb7	more	2016-03-08 17:44:15 +00:00
Ben	0ff434cf91	progress	2016-03-08 16:49:32 +00:00
git	0f752fb7e3	Fix custom names in 1.9	2016-03-08 16:11:12 +13:00
git	280d03daa7	Fix names	2016-03-08 09:52:30 +13:00
git	496983ee04	Untested bugfixes	2016-03-07 22:29:14 +13:00
NewGarbo	ae2da31544	Merge branch 'clans/alpha' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta ... Conflicts: Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java	2016-03-05 23:14:32 +00:00
NewGarbo	d92f817efc	fixed some teleportation bugs and a bit of cleanup	2016-03-05 22:50:06 +00:00
git	6d0ca4f813	Merge branch 'Dual_1.9' of https://github.com/Mineplex-LLC/Minecraft-PC into Dual_1.9 ... Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java	2016-03-03 13:49:31 +13:00
git	0ffa67dfb8	Ring game	2016-03-03 13:48:22 +13:00
NewGarbo	73d8870daf	nether work (forgot to commit days ago oops)	2016-03-02 19:42:53 +00:00
Shaun Bennett	3447354814	Dual 1.9 Fixes	2016-03-02 12:58:30 -06:00
Thanos paravantis	9a4f4dbd7c	Merge branch 'master' into thanos-mineware	2016-03-02 18:47:30 +02:00
Thanos paravantis	1e08e1a5db	Update player death handling, add aggressive chicken behavior, minor changes and refactoring.	2016-02-26 18:17:03 +02:00
Thanos paravantis	0e697e279b	Player death handling and chicken attack changes.	2016-02-25 23:35:38 +02:00
git	2a9d49ccd9	Merge branch 'master' of https://github.com/Mineplex-LLC/Minecraft-PC into Dual_1.9	2016-02-25 18:11:12 +13:00
Thanos paravantis	27daace524	Rename game type to Bawk Bawk Battles, change item display to Egg.	2016-02-24 21:43:10 +02:00
NewGarbo	2956b18821	some hologram work	2016-02-23 18:45:04 +00:00
Keir Nellyer	70260754ff	Reset these files to their previous state (IDE added tabs).	2016-02-23 00:26:10 +00:00
Keir Nellyer	c923745f5f	Add required import.	2016-02-23 00:25:37 +00:00
Keir Nellyer	99150db2d7	Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/report/ReportRepository.java # Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java	2016-02-22 19:02:54 +00:00
xGamingDudex	33b3d121b3	Merge branch 'develop' into project-cosmetics ... Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatLovestruck.java Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatSecretPackage.java Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCoalFumes.java Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleEnchant.java Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleFrostLord.java Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleGreen.java Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleHeart.java Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleHelix.java	2016-02-20 15:30:26 +01:00
AlexTheCoder	3b7a7e457c	Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla	2016-02-20 03:20:27 -05:00
Shaun Bennett	82d51a896f	Add SERVER_STATS to DBPool. Rename STATS to MINEPLEX_STATS	2016-02-19 19:54:06 -06:00
NewGarbo	67c355bf65	remove more eclipse files	2016-02-19 07:22:54 +00:00
NewGarbo	441cf702c7	Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha	2016-02-19 07:22:09 +00:00
NewGarbo	d5583b93f2	remove eclipse files	2016-02-19 07:14:13 +00:00
Shaun Bennett	7714e4960c	Use DBPool for everything	2016-02-19 00:17:38 -06:00
Shaun Bennett	eab992e621	Delete SimpleStats	2016-02-18 23:01:23 -06:00
md_5	6d81e43b30	Don't print db config to System.out	2016-02-19 15:30:30 +11:00
NewGarbo	8507bb1bd8	all progress over this week	2016-02-18 21:29:42 +00:00
libraryaddict	8b1b63c8b3	Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into Dual_1.9 ... Conflicts: Patches/craftbukkit.jar	2016-02-18 16:45:37 +13:00
AlexTheCoder	9e2840b3b5	Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla	2016-02-16 21:28:07 -05:00
xGamingDudex	10e89a228e	Added some extra checks to Blood ... Should resolve possible NPE and Material.AIR issues along	2016-02-16 18:48:27 +01:00
md_5	8893db60d7	Fix highly annoying exception in Reindeer mount.	2016-02-16 12:46:39 +11:00
AlexTheCoder	53ac1827bc	Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla	2016-02-15 19:13:20 -05:00
Shaun Bennett	95c22a59fd	Use DNS for chat filter	2016-02-15 16:30:57 -06:00
Shaun Bennett	15ed2570e2	Valentines final changes, Change Gift Giver achievement	2016-02-15 20:43:46 -06:00
xGamingDudex	85b8937801	Hats, supposed to go in the previous one	2016-02-15 16:39:04 +01:00
xGamingDudex	7d8ffa1311	Small stuff	2016-02-15 16:38:18 +01:00
NewGarbo	e25accfba4	outpost saving and loadi9ng	2016-02-15 11:24:29 +00:00
AlexTheCoder	f6c38903f2	Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla	2016-02-13 14:34:11 -05:00
AlexTheCoder	ea893bfa48	- Fixed update	2016-02-12 23:03:38 -05:00
AlexTheCoder	197bcc9dbf	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla ... Conflicts: Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java	2016-02-12 21:23:58 -05:00
NewGarbo	e6eb43ada8	PUSHING CODE BECAUSE MY HDD MIGHT BE BREAKING DOWN. THIS CODE IS UNTESTED PROBABLY DOESN'T WORK	2016-02-12 19:58:40 +00:00
Shaun Bennett	0d19a8017f	Update Featured arcade game, various bug fixes	2016-02-12 06:51:30 -06:00
Shaun Bennett	1e596a6969	Valentines rewards	2016-02-12 04:54:09 -06:00
Shaun Bennett	66aa89b5e0	Fix sheep look bug, valentines gift effects, valentines achievements	2016-02-12 04:32:26 -06:00
Shaun Bennett	dfd61833b7	Valentines changes	2016-02-12 03:03:47 -06:00
Shaun Bennett	d8965179f7	More valentines adjustments/fix gladiators tutorial being enabled	2016-02-11 23:01:59 -06:00
Shaun Bennett	2eeddb828b	Merge pull request #165 in MIN/mineplex from virizion_speed_builder to develop ... * commit '51d152d48473f820ab6d03586fb41f890750f645': Perfect build all fix Only eliminated players are guardians. Broken blocks/mobs go directly into inventory. Stop mid game joiners from getting participation gems. Mob egg baby fix. Also fixed non build entities from being "broken" spec command add guardian The infamous look direction bounce bug Chiss' double jump mechanic Moar fixes Hopper item pickup fix.	2016-02-11 22:59:35 -06:00
Cheese	eebe25040e	cleaned the particle effects a bit	2016-02-10 16:31:25 +11:00
Shaun Bennett	e3ff25526b	Merge pull request #164 in MIN/mineplex from valentines/game to develop ... * commit '6800e4ef478e2d1eea5c19ec52a8368ec0bd520a': valentines final push bug fixes more valentines :) many valentine, such wow val1	2016-02-09 20:28:58 -06:00
Shaun Bennett	f6e091f029	Merge pull request #163 in MIN/mineplex from feature/valentines-cosmetics to develop ... * commit '57638ff68496b6f10012f8782633066b52a8a715': More work on valentines Valentines gifts Added love potion and hub sheep thing. Started on Love Potion system. Switching branches. Varius tweaks and changes. Added sheep mount to index. Added various cosmetic items for Valentines day.	2016-02-09 20:28:37 -06:00
Shaun Bennett	57638ff684	More work on valentines	2016-02-09 16:26:17 -06:00
Shaun Bennett	a868b8b2b8	Valentines gifts	2016-02-08 22:26:33 -06:00
xGamingDudex	c4da8ef636	Cosmetic Update ... + Set Storm + Set Shadow + Set Music + Set Emerald + Set Blood + Set Enchant + Particle Ying and Yang + Particle Wings Angel + Particle Wings Infernal + Particle Wings Pixie + Shape Utils * Particle Party Time * Particle Heart * Double Jump Firecracker	2016-02-08 00:21:47 +01:00
Virizion	008fc587b0	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2016-02-07 15:33:37 -05:00
Shaun Bennett	c059425e9d	Remove GiveawayManager (not used anymore)	2016-02-07 13:18:29 -06:00
Shaun Bennett	f502c2a693	Fix filtermessage sync calls	2016-02-07 12:15:08 -06:00
Mysticate	a8ff714ee4	Added love potion and hub sheep thing.	2016-02-07 10:19:40 -05:00
Mysticate	c1393697f8	Started on Love Potion system. Switching branches.	2016-02-06 14:08:17 -05:00
Mysticate	b414642990	Varius tweaks and changes.	2016-02-04 21:58:55 -05:00
Virizion	a76e570b8a	Moar fixes	2016-02-04 21:43:17 -05:00
Mysticate	e94222a68e	Added sheep mount to index.	2016-02-04 13:13:22 -05:00
Mysticate	c0d6cbbb85	Added various cosmetic items for Valentines day. ... - Heart arrow trail - Heart death animation - Heart double jump animation - Heart set - Cupid's bow gadget - Pink Sheep mount	2016-02-04 13:12:53 -05:00
Cheese	5c22c841fe	val1	2016-02-04 10:55:29 +11:00
Keir Nellyer	27fc81dd8b	Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report	2016-02-03 17:23:40 +00:00
Keir Nellyer	a8f9c91534	ReportServer: update package name and configure Maven to generate a META-INF file with the main class name included.	2016-02-02 22:28:18 +00:00
Thanos paravantis	854ebf70c4	Merge branch 'master' into thanos-mineware ... Conflicts: Plugins/Mineplex.Core/.classpath Plugins/Mineplex.Queuer/.settings/org.eclipse.jdt.core.prefs Plugins/Nautilus.Game.Arcade/.classpath Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.ui.prefs Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/MineWare.java	2016-02-02 17:11:22 +02:00
Shaun Bennett	86917fb146	Fix treasure stair orientation	2016-02-02 05:50:03 -05:00
Shaun Bennett	af27944a39	add a shard queue to DonationManager, use that for TreasureShardReward	2016-02-02 05:34:33 -05:00
Shaun Bennett	1a9c36d0a1	Merge pull request #153 in MIN/mineplex from master to bugfix/duplicates ... * commit '3a945f190dca9f558cbcb6052b3eaa2816d112b3': (308 commits) Commons codec is not included in BungeeCord. Pooling with later jedis versions doesn't work on Bungee. Gitignore redundant Eclipse files. Add Eclipse magic. Speed up LobbyBalancer to 500ms Add example maven settings.xml Remove setTestOnBorrow Tone down lobby balancer too. Emergency patch to slow down redis player count updates. Fixed explosions dropping right items. sapling fix Update fixes - @Teddy! Made block define its own drops. Removed an nunnecesarry method Fixed items not dropping their regular counterpart. Final changes Prep for update Update CB.jar Prevent hearts changing colors in UHC tab. Fixed ForTheKing achievement. ...	2016-02-01 15:49:34 -06:00
Keir Nellyer	9601eabfeb	Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report ... # Conflicts: # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java	2016-01-31 17:38:08 +00:00
NewGarbo	cc857da88e	Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta ... Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java	2016-01-31 16:27:14 +00:00
NewGarbo	002be01ef1	MAVEN TEST COMMIT	2016-01-31 16:21:04 +00:00
Shaun Bennett	c23855bd65	Merge with develop	2016-01-30 02:44:24 -05:00
md_5	7ed0ab442f	Emergency patch to slow down redis player count updates.	2016-01-30 12:36:20 +11:00
Keir Nellyer	8cf32ef8bf	Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report	2016-01-30 00:46:43 +00:00
Shaun Bennett	1c3c800a66	Update fixes - @Teddy!	2016-01-29 14:05:09 -05:00
Shaun Bennett	50fc1f5a10	merge with develop	2016-01-29 03:44:04 -05:00
Shaun Bennett	a1f9f41910	Merge remote-tracking branch 'origin/develop' into develop	2016-01-29 03:37:03 -05:00
Shaun Bennett	2e2a08bea8	Merge pull request #142 in MIN/mineplex from bugfix/coal-particles to develop ... * commit 'd1d3382ec065bb7c508044d53124266fda142c00': Prevented Coal particles from showing during the game	2016-01-29 02:33:57 -06:00
Mysticate	d1d3382ec0	Prevented Coal particles from showing during the game	2016-01-28 22:44:33 -05:00