5049 Commits

Author	SHA1	Message	Date
Kenny	f5cba1eb1e	Rate limit book/sign edits as a temporary measure against a crash exploit	2017-04-29 02:05:07 -04:00
Sam	8a54e19695	Fix Fissure skipping snow blocks	2017-04-28 19:30:19 +01:00
Sam	6beeec20d6	Disable morphs when changing kits	2017-04-28 19:30:00 +01:00
Sam	26d97bf7eb	Up the water damage check rate	2017-04-28 19:29:23 +01:00
Sam	59699f930e	Re-implemented triple jumps	2017-04-28 16:26:02 +01:00
LCastr0	d33aac9fd4	Fixed args	2017-04-27 16:34:35 -03:00
LCastr0	124d22ce31	Added new class for peasants	2017-04-26 22:52:40 -03:00
LCastr0	6bf1b6c1dc	Fixed arguments	2017-04-26 16:25:32 -03:00
Sam	d3cb99f431	Skeletal Horse converted to Google Sheets	2017-04-26 19:11:48 +01:00
LCastr0	19138eb501	Added castle stuff for hub	2017-04-26 01:12:43 -03:00
Sam	7f1b1d72b9	Chicken converted to Google Sheets	2017-04-25 19:33:00 +01:00
Sam	af25aa0b00	Witch converted to Google Sheets	2017-04-25 18:20:34 +01:00
Sam	044a3754cf	Fix incorrect key	2017-04-24 23:14:01 +01:00
Sam	f16ea648f9	Blazr converted to Google Sheets	2017-04-24 23:13:03 +01:00
Sam	99fa347cf1	Wolf converted to Google Sheets	2017-04-24 20:21:19 +01:00
Sam	27cff85189	Fix Perk variables being overriden when multiple kits used the same perk	2017-04-24 18:04:16 +01:00
Sam	5bc2b9d34c	Revert "Make Perks not static, this fixings all kits having the same stats 😨" ... This reverts commit 1d0f28689f.	2017-04-24 17:40:48 +01:00
Sam	1d0f28689f	Make Perks not static, this fixings all kits having the same stats 😨	2017-04-23 19:06:33 +01:00
Sam	c8d891ef31	Snowman converted to Google Sheets	2017-04-23 18:54:29 +01:00
Sam	9e6ab9a696	Enderman converted to Google Sheets	2017-04-23 17:07:45 +01:00
Sam	24b73d27e7	Fix the infinite Giga Slime	2017-04-23 16:10:54 +01:00
Sam	9d48a5f1a5	Creeper converted to Google Sheets	2017-04-23 16:08:45 +01:00
Sam	02ffec8618	Fix players being affected by velocity inside on the spawn island	2017-04-23 14:42:26 +01:00
Sam	09300b499f	Adjust the time before the player recieves kit information after death	2017-04-23 14:41:59 +01:00
Sam	f1b45bc29e	Slime converted to Google Sheets	2017-04-23 14:37:29 +01:00
Sam	43d703d9b7	Spider converted to Google Sheets	2017-04-22 23:53:01 +01:00
Sam	1d7fb77bc4	Deleted some code by accident	2017-04-22 23:10:08 +01:00
Sam	e350c62f54	Iron Golem and Skeleton converted to Google Sheets	2017-04-22 23:07:44 +01:00
Sam	2f478e46f3	Fix various bugs found in testing	2017-04-21 21:53:16 +01:00
Sam	ca6789d92a	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm	2017-04-21 17:35:12 +01:00
Sam	01f74a3e12	SSM Training Ground	2017-04-21 17:35:10 +01:00
Sam	30fb899bee	Move debug commands over to the proper system	2017-04-20 18:26:22 +01:00
cnr	87b829b411	Disable easter egg baskets in games	2017-04-19 22:33:32 -07:00
cnr	2263e8bfcb	Ignore movement checks in Runner	2017-04-16 01:09:12 -06:00
cnr	b30a706543	Disable Skyfall booster kit	2017-04-14 22:33:54 -06:00
cnr	c7e855ee16	Merge branch 'feature/eastereggs' into develop	2017-04-13 22:56:41 -06:00
samczsun	498df70a1f	Implement basic canDamage	2017-04-13 00:02:32 -06:00
cnr	490fe56b34	Merge branch 'update/skyfall-nolag' into develop	2017-04-12 23:39:01 -06:00
samczsun	e1fee19aff	Optimize chunk updating and fix invis players	2017-04-13 01:09:05 -04:00
Sarah	4775fccb9a	Improve Island rot and misc fixes	2017-04-12 22:35:33 +02:00
AlexTheCoder	5a225b9332	Properly check the spring chest rewards	2017-04-12 16:01:24 -04:00
AlexTheCoder	fe1cda820f	Merge branch 'update/aprilchest' of github.com:Mineplex-LLC/Minecraft-PC into feature/eastereggs	2017-04-12 16:00:37 -04:00
AlexTheCoder	c3ff494f94	Update Arcade and Hub to use skinned easter eggs	2017-04-12 03:06:32 -04:00
LCastr0	1904990f84	Fixed merging issues	2017-04-11 23:16:42 -03:00
AlexTheCoder	9a58cd792e	Implement easter egg baskets in games which can give fantastic rewards	2017-04-11 20:18:09 -04:00
LCastr0	6f1c062182	Removed GameType, using GameDisplay instead	2017-04-08 23:06:55 -03:00
LCastr0	8bcb5bc948	Added event to be called when game stops	2017-04-07 14:13:53 -03:00
LCastr0	b441dc5edf	Calls event when arcade game starts	2017-04-07 14:12:23 -03:00
LCastr0	6a668004e0	Added game start event to core, to be called inside arcade and handled inside core	2017-04-07 14:06:44 -03:00
Sam	08bd17afe6	Fix a chat formatting problem	2017-04-06 00:36:17 -05:00
samczsun	0cc7a078c6	Fix bad logic in TeamArmorModule	2017-04-06 00:35:49 -05:00
samczsun	36f4e6b5a1	Change more closeInventory calls	2017-04-06 00:35:49 -05:00
samczsun	8e92317b9c	So that's why Tim closed inventories	2017-04-06 00:35:49 -05:00
samczsun	9c9d74f098	PC-1394	2017-04-06 00:35:49 -05:00
samczsun	fceda64a5a	PC-1318	2017-04-06 00:35:49 -05:00
samczsun	d69c4b3dca	PC-1189	2017-04-06 00:35:49 -05:00
samczsun	4553a7081f	PC-697 PC-1180	2017-04-06 00:35:49 -05:00
samczsun	e0706f3627	PC-1056	2017-04-06 00:34:34 -05:00
samczsun	db59c32b5e	PC-1028	2017-04-06 00:34:34 -05:00
samczsun	873cd9c2a5	PC-802	2017-04-06 00:34:34 -05:00
cnr	a1fc6bd20f	Merge remote-tracking branch 'bugfix/bridges' into develop	2017-04-06 00:33:47 -05:00
cnr	64d5fe3c80	Revert "Revert "Merge branch update/bridges into develop"" ... This reverts commit 0ad69ebefc.	2017-04-06 00:33:41 -05:00
Sam	cbf7985773	Colour the message	2017-04-05 22:58:06 +01:00
Sam	c1b83b1065	Braces	2017-04-05 21:46:22 +01:00
Sam	047ed81eea	Add a message when a player dies pregame	2017-04-05 21:38:04 +01:00
Sam	1f1ad4c441	Change Diamond ore drops to diamonds	2017-04-05 21:35:04 +01:00
Sarah	acd588ff1a	Add lucky/unlucky tracks to Skyfall	2017-04-05 04:40:52 +02:00
Sarah	e4b79a3731	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/skyfall ... # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skyfall/Island.java	2017-04-05 04:21:14 +02:00
Sarah	616e2dad0f	Fix selection of air blocks when searching for top layer blocks ... add some Supply Drop loot dd /Boost command, fix AntiCheat don't put duplicates in supply drop don't crumble rings before the game begins don't crumble middle rings	2017-04-05 04:15:48 +02:00
samczsun	ef21106da0	Fix memory leak in CompassModule	2017-04-01 16:20:59 -05:00
Sam	4c882ae4a8	Fix chat handling elsewhere	2017-04-01 02:11:11 -05:00
Sam	03d781ca70	It be April fools matey, walk yee plank	2017-04-01 02:11:11 -05:00
samczsun	c82697a4e3	PC-1396	2017-03-29 23:30:49 -05:00
samczsun	53d9a5f977	PC-1222	2017-03-29 23:30:49 -05:00
samczsun	ca452463db	PC-1106	2017-03-29 23:30:49 -05:00
samczsun	3ef8c6f532	PC-1101	2017-03-29 23:30:49 -05:00
samczsun	8226592caa	PC-1026	2017-03-29 23:30:49 -05:00
samczsun	8a78f1ce34	PC-1026	2017-03-29 23:30:49 -05:00
samczsun	858b08e3c3	PC-825	2017-03-29 23:30:49 -05:00
samczsun	8521691cfb	PC-817	2017-03-29 23:30:49 -05:00
samczsun	c95fea066c	PC-778	2017-03-29 23:30:49 -05:00
samczsun	e45e27ba34	PC-629	2017-03-29 23:30:49 -05:00
samczsun	66e3a7ad5c	PC-587	2017-03-29 23:30:49 -05:00
samczsun	1ecd46f7ee	PC-372	2017-03-29 23:30:49 -05:00
Sam	fff18ef2a0	Revert "Make appler ignore damage rate" ... This reverts commit e0819bfd7d.	2017-03-27 19:19:45 +01:00
Sam	e0819bfd7d	Make appler ignore damage rate	2017-03-27 19:14:07 +01:00
Sam	421d76b7f3	More changes!	2017-03-27 19:08:31 +01:00
Sam	28fa092b20	Additional kit changes	2017-03-26 13:39:12 +01:00
Sam	60231c817f	Missed a class	2017-03-25 16:05:58 +00:00
Sam	02a6f34bd3	Destructor changes	2017-03-25 16:05:16 +00:00
Sam	5564dc7daf	Fix even more bugs	2017-03-25 13:57:20 +00:00
Sarah	b389041392	Change some more loot, not weapon doubles, 25% more boost from booster rings, fixed decay times for rings, let the complete surface of islands rot at once, specific items come with another item and a dynamic rot rate	2017-03-24 18:04:44 +01:00
LCastr0	d2851b0708	Merge branch 'develop' into update/aprilchest	2017-03-24 14:01:15 -03:00
Sam	8bddad44da	Bridges hotfix	2017-03-24 16:46:14 +00:00
cnr	0ad69ebefc	Revert "Merge branch update/bridges into develop" ... This reverts commit 7e8f5b4939, reversing changes made to 222e4267d2.	2017-03-23 23:24:00 -05:00
AlexTheCoder	3ebfb453c5	Implement rank and powerplay linking to the website and give specific ranks an id corresponding to their respective forum tag	2017-03-23 23:18:29 -05:00
Sam	401276d705	Missing isLive check	2017-03-22 23:04:50 +00:00
Sam	1c620048ca	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/bridges	2017-03-22 14:14:30 +00:00
Sam	c4c7ebe1e6	Check for blocks already registering	2017-03-20 22:10:20 +00:00
LCastr0	defece04a9	Fixed some issues changing Creature to Entity	2017-03-20 16:33:20 -03:00
Sarah	f8f7c04f58	Improve Performance, add dynamic rot rate, change some loot and islands only rot on the top	2017-03-20 19:18:33 +01:00
cnr	441e2ab30f	Disable 2x XP	2017-03-20 01:19:21 -05:00
Sam	95d919a654	Removed was werid disjointed code	2017-03-19 00:07:23 +00:00
Sam	05bd93cbdf	Fixed Death Bomber achievement exploit	2017-03-19 00:01:11 +00:00
Sam	df8ed90138	Ops, forgot to enable reports. Eclipse is bad	2017-03-18 23:44:42 +00:00
Sam	b1a1faacb1	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/bridges	2017-03-17 17:03:55 +00:00
Sam	8e5a5695d5	Fix early game revive	2017-03-17 17:03:53 +00:00
samczsun	db2feeac42	Reorganize tracks, add BotB track	2017-03-15 23:16:07 -05:00
cnr	e5d2ad34eb	Merge branch 'update/stpatrickscosmetics' into develop	2017-03-15 23:15:10 -05:00
samczsun	4778d28be4	Allow overriding enabled team armor	2017-03-15 23:13:42 -05:00
Sarah	4f9cf987bd	Change block rates and add Rate command	2017-03-15 21:30:48 +01:00
Sarah	1a061f6e2f	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/skyfall ... # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/addons/compass/CompassAddon.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skyfall/Island.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skyfall/Skyfall.java Rot starts at 2 minutes, Rings take 3 Minutes to rot, Top Island rots now, rings rot now	2017-03-15 17:38:07 +01:00
Sam	15d691370d	Configuration for bridges	2017-03-14 21:05:52 +00:00
LCastr0	a3861d43c4	Fixes costume throwing items without complete set	2017-03-14 13:32:49 -03:00
Sam	c8a9cffcdf	Edit the documentation for per player world borders	2017-03-14 16:08:31 +00:00
Sam	a49b19ee0c	Removal of kit progression from bridges	2017-03-14 16:08:16 +00:00
Sam	1e43398875	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/bridges	2017-03-14 15:53:27 +00:00
cnr	3dc36449b5	Add 2x XP and open Gem Hunters beta ... This is for spring break, and ends 3/19	2017-03-10 00:29:11 -06:00
samczsun	888761d15e	Somehow missed Team Super Smash	2017-03-09 01:06:53 -06:00
samczsun	b5f026d4c0	Removem misleading comment	2017-03-09 01:06:53 -06:00
samczsun	a99cb6579d	PC-814	2017-03-09 01:06:53 -06:00
samczsun	4be4fcb434	Fix Team Armor Addon (also PC-201)	2017-03-09 01:06:53 -06:00
AlexTheCoder	a691d58840	Set up clans specific rewards for voting, daily bonus, and youtube clicks. Additionally, set up promotion for specific youtube channels in Carl. Finally, provide support for a differently-named creeper!	2017-03-09 01:04:50 -06:00
cnr	06a71946a0	Publish server status earlier during startup ... Servers are allowed ten seconds to publish their status on startup by ServerMonitor. NpcManager can consume most or all of that allotted time on EU, so we need to initialize ServerStatusManager first.	2017-03-03 08:15:56 -06:00
samczsun	b782f5ced9	Speed up generation	2017-03-01 23:58:20 -06:00
samczsun	3e8b23c6f4	Sentry Issue #223473496 ... Don't bother with failsafe if the game is null (i.e. beyond dead) Steps to reproduce: 1) Quit server at just the right time	2017-03-01 23:54:02 -06:00
samczsun	3f40432268	Sentry Issue #223474603 ... Handle null gun in Minestrike Steps to reproduce: 1) Bring a player down to low health using a molotov 2) Kill them with a grenade	2017-03-01 23:54:02 -06:00
samczsun	9571db123d	Sentry Issue #223483175 ... Fix badly implement Player check in PerkBoneRush Steps to reproduce: 1) Pick Skeletal Horse 2) Bone rush on some mob (i.e. cows in swamp)	2017-03-01 23:54:02 -06:00
samczsun	cb9ac1fc9f	Sentry Issue #223481030 ... Prevent Fish Flurry from activating if no suitable blocks are found Steps to reproduce: 1) Select squid on hyrule castle 2) Activate fish flurry while looking at middle of empty side of castle	2017-03-01 23:54:02 -06:00
samczsun	7e9211815f	Sentry Issue #223481223, #223481117 ... Reverse check so RHS can be null Steps to reproduce: 1) Pick Wither Skeleton in SSM 2) Throw wither image away from other player so it has no target 3) When it's standing still (i.e no target), have the other player punch the image	2017-03-01 23:54:02 -06:00
samczsun	0725639852	Sentry Issue #223596821 ... Check if player has left before performing actions Steps to reproduce: 1) Pick wolf in SSM 2) Hit someone 3) Quit immediately after	2017-03-01 23:54:02 -06:00
samczsun	2e23d59702	Sentry Issue #223489411 ... Check if fired projectile is a WitherSkull before casting Steps to reproduce: 1) Go to Wither Assult 2) Fire enderpearl	2017-03-01 23:54:02 -06:00
cnr	699845d6d7	Merge branch 'feature/gem-hunters' into develop	2017-02-25 00:40:05 -06:00
cnr	7de556e3d8	Allow plugins to choose a hub type when restarting ... Clans Hubs will send to Clans Hubs, Clans will send to Clans Hubs, and all other plugins will send to the normal Hub	2017-02-25 00:35:46 -06:00
Sam	3a4e973551	Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters	2017-02-12 13:12:53 +00:00
Alexander Meech	1736b198f2	Fix Twitch+ Mps not properly showing information via MOTD	2017-02-09 22:44:18 -06:00
Nate Mortensen	9444da9dae	Fix item drop check in Wizards ... Currently players are unable to drop items if the held item slot is below 5. This works fine when dropping items simply by pressing q, but it often interferes with players dropping items from an open inventory. This commit changes the check to iterate over the first five slots and only cancel the event if they're dropping one of them.	2017-02-08 22:32:57 -06:00
Nate Mortensen	abbb46ec0a	Fix the death message when using Summon Wolves	2017-02-08 22:32:57 -06:00
Nate Mortensen	1425a2aaed	Fix Rumble spell slowness level	2017-02-08 22:32:57 -06:00
Nate Mortensen	b90e879d4b	Fix protection provided by Gold armor in Wizards ... While the name of the gold items is "Golden X", the name of the material is "GOLD X" resulting in gold items providing no protective benefit other than the default vanilla protection(in the case of there being only gold armor).	2017-02-08 22:32:57 -06:00
Nate Mortensen	4031b037de	Correct damage for Fireball and AnvilDrop ... This issue came down to two bugs with the explosions created by Fireball and AnvilDrop. The first was the damage being done. Settings the max damage doesn't change the base damage, so they did the default amount of damage based on the vanilla code. The second was the radius of the explosion. The radius was too small, and so it was perceived that only users directly hit would suffer damage. The radius was increased, however the block explosion size was kept the same.	2017-02-08 22:32:57 -06:00
Nate Mortensen	941be75161	Allow spells to be learned from double chests	2017-02-08 22:32:57 -06:00
Alexander Meech	6583e86ace	Remove william's copyright file headers	2017-02-08 22:24:19 -06:00
Alexander Meech	908b282fdf	Fix issue with spaces in ChooseMapButton	2017-02-08 22:24:19 -06:00
Sam	2f9f55226a	Adjust world border distance	2017-02-07 00:05:10 +00:00
Sam	3018f264cc	QA ready!	2017-02-06 23:28:27 +00:00
Sam	36f318e4a0	KP Upgrades (1)	2017-02-06 21:00:30 +00:00
Sam	6cc5a14073	Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters	2017-02-03 20:33:54 +00:00
Sam	13806a49d2	Bridges bug fixes	2017-02-03 20:33:21 +00:00
Sam	99ff344679	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/bridges	2017-02-02 13:20:14 +00:00
samczsun	8a3b531a06	Bawk Bawk Battles rewrite	2017-02-02 00:31:58 -06:00
Sam	c6bb850bc3	Lots of stuff	2017-01-30 23:28:55 +00:00
Sam	a62ecdb212	Custom Bridges and Per player world borders	2017-01-25 21:38:58 +00:00
Sam	3557fd8acc	Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters	2017-01-21 14:21:03 +00:00
samczsun	8b1fe8302e	Match Bukkit tab completion behaviour	2017-01-20 01:27:58 -06:00
samczsun	cc9f28dfec	Fix holes in Skywars ... Skywars's crumble affects any block which has been updated, including blocks outside the game world. This commit checks if a block is in the game world before crumbling it	2017-01-20 01:27:58 -06:00
samczsun	8479e80f8e	Change intent of /hub to PLAYER_REQUEST	2017-01-20 01:27:58 -06:00
samczsun	8dc0961f03	Remove debug message	2017-01-19 23:12:29 -05:00
samczsun	f83550157c	PC-1034 ... The `z` variable wasn't being reset properly	2017-01-19 23:12:26 -05:00
samczsun	1ff05eb3ff	Reset Magma Cube kill counter on game end	2017-01-19 23:12:11 -05:00
samczsun	7290b83466	Fix Skywars eating/bowing/whatevering bug	2017-01-19 21:24:50 -05:00
samczsun	5ca9b79333	Fix Fissure doing no damage	2017-01-19 18:49:51 -05:00
samczsun	343167245e	Fix party chat	2017-01-19 18:16:43 -05:00
Sam	8a9a3cb2ac	Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters	2017-01-19 21:16:12 +00:00
samczsun	fd65f2df1b	Tab completion for /game set	2017-01-18 23:34:57 -06:00
samczsun	6692432c42	Smart™ Tab Completion©®	2017-01-18 23:30:39 -06:00
samczsun	e5ece844cb	Tab completion	2017-01-18 23:20:56 -06:00
samczsun	1bb96625f7	Add missing import	2017-01-18 23:20:24 -06:00
samczsun	2ffae9f078	Enable strict anticheat in Gladiators (Artix)	2017-01-18 23:20:24 -06:00
samczsun	ac63985419	Revert removing strict anticheat	2017-01-18 23:20:24 -06:00
samczsun	1ce69dfa14	PC-1054 PC-1164 ... GameTeam can't handle spawnpoints which are also solid blocks, and SurvivalGames has a chance of spawning a chest on a spawn platform. When this happens, the next closest spawn is always the same spawn because the two players will be exactly 1 block apart, causing everyone to spawn at the same podium. This commit prevents SurvivalGames from generating random chests on spawn podiums	2017-01-18 23:20:24 -06:00
samczsun	cc7150850c	PC-221 ... In Block Hunt, hitting an entity will cause an "Cancelled Infection" event to propagate upwards the stack. This commit checks whether the game is live before beginning the cancellation	2017-01-18 23:20:24 -06:00
samczsun	e309abc968	PC-1051 PC-1238 ... Some kits had armor in the wrong order, causing them to render incorrectly. This commit reorders the armor.	2017-01-18 23:20:24 -06:00
samczsun	63357b0fc5	PC-1303 ... In the 1.11 update, the override was mistakenly toggled off while spawning in skeletons. This commit undoes that change.	2017-01-18 23:20:24 -06:00
samczsun	8e5483e42b	PC-190 ... Ignoring listened on too high of a priority and chat managers didn't respect the recipients list. Those two issues have been fixed in this commit	2017-01-18 23:20:24 -06:00
samczsun	0ae4bd2281	PC-938 PC-1294 ... For whatever reason, Minestrike nametags don't hide properly on hotjoining. This is a simple fix which just resets all nametag visibilities on game reset. Should work, right?	2017-01-18 23:20:24 -06:00
samczsun	2bac38385f	PC-1299 ... In the 1.11 update, the override was mistakenly toggled off while spawning in wither skeletons. This commit undoes that change.	2017-01-18 23:20:24 -06:00
samczsun	4cd643f64f	PC-1040 ... In one of my previous commits, while migrating CompassAddon -> CompassModule I accidentally removed two logical components. The first prevented compasses from being given out in the pregame lobby, and the second allowed players who were dead to receive compasses. Both have been re-added.	2017-01-18 23:20:24 -06:00
samczsun	283dd23920	PC-1298 ... In the 1.11 update, the override was mistakenly toggled off while spawning in horses. This commit undoes that change.	2017-01-18 23:20:24 -06:00
Sam	8d47e80066	Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters	2017-01-12 18:03:07 +00:00
samczsun	132036bd17	Move Constants to common	2017-01-11 20:42:46 -06:00
samczsun	e72d1e51a2	Ignore bypass for testing sever motd	2017-01-11 20:29:37 -06:00
samczsun	39ba03d1b4	Convert to UtilServer.isTestServer	2017-01-11 20:29:36 -06:00
samczsun	19ac8f0c3b	Create framework for proper test network	2017-01-11 20:29:36 -06:00
Nate Mortensen	e339b0352a	Make GameComponent generic and store an instance of the Game.	2017-01-11 20:04:48 -06:00
samczsun	5c4cc48e86	More QA changes	2017-01-11 19:50:26 -06:00
samczsun	56d4ed9e11	Parties rewrite ... Basically everything got changed. Also Portal has a slightly better API now	2017-01-11 19:50:26 -06:00
cnr	cea08cae67	Merge branch 'update/cosmetics-balloons' into develop	2017-01-11 15:32:41 -06:00
xXVevzZXx	1095f8bc49	Respack links	2017-01-11 15:29:50 -06:00
xXVevzZXx	5a2ed59a38	Make Strike Games an actual game, disable Hunger and remove food from loot	2017-01-11 15:29:50 -06:00
samczsun	99211d5d89	Fix particles	2017-01-11 15:11:57 -06:00
Nate Mortensen	9583c7abcb	Run Minestrike in Adventure Mode	2017-01-11 15:07:48 -06:00
Nate Mortensen	afaed17071	Fix kill reward for skinned knives	2017-01-11 15:07:48 -06:00
Nate Mortensen	8384c47e53	Create Lifetime system for managing Listeners with a defined duration. ... This commit introduces a Component system focused around Games, which is completely backwards compatible, as well as designed to be flexible enough for later improvements such as dependency injection. Each GameState is associated with a phase of the PhasedLifetime that each Game has. Components can be registered with a specific phased or the entirety of the Lifetime. Refer to the javadocs for Lifetime and PhasedLifetime for more details. Currently the main two Component types are ICommand and ListenerComponent. This commit includes the first refactoring into using this system, which is replacing the Wizards minigame's usage of Miniplugin with a Lifetimed Component, allowing for the shop to be appropriately registered and unregistered. This change allows for Wizards to be run more than once on the same server instance. Previously, attempting to register the Miniplugin twice would result in the minigame failing to start after the initial registration. This commit additionally includes slight refactoring within GameCreationManager as required for the Lifetime system to function correctly. These changes ensure that Games are only disabled once, whereas before they could be repeatedly disabled. The previous implementation of disable(), along with the classes that override it, functioned correctly despite being called several times. Finally, this commit adds in changes to the pom to allow for unit testing.	2017-01-11 15:07:47 -06:00
LCastr0	21473a7d82	Fixed merge conflict	2017-01-10 21:27:47 -02:00
Sam	64026f81ff	Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters	2017-01-08 21:12:28 +00:00
Sam	0218965bee	Villager trading and loot upgrades	2017-01-08 15:44:04 +00:00
cnr	990c548e7b	Disable Thanksgiving chickens	2017-01-06 01:06:10 -07:00
cnr	f08068c717	Revert "Enable double XP + gems for the holidays" ... This reverts commit d3bcc77e01.	2017-01-04 20:34:09 -07:00
cnr	3af401ee8f	Implement two-factor authentication	2017-01-04 20:33:09 -07:00
LCastr0	7f7f3b9954	Removed thanksgiving chickens	2016-12-29 17:01:30 -02:00
LCastr0	4c6298bb63	Merge branch 'develop' into update/cosmetics-balloons	2016-12-29 16:28:13 -02:00
LCastr0	6478656501	Fixed armorstand balloon types	2016-12-29 16:25:20 -02:00
Sam	0ba22f9201	Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters	2016-12-28 22:33:04 +00:00
cnr	c7d5e149f8	Fix NullPointerException in speed builders	2016-12-28 15:18:59 -07:00
Sam	4c7f5c5716	Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters	2016-12-27 18:59:03 +00:00
cnr	d3bcc77e01	Enable double XP + gems for the holidays	2016-12-26 22:43:32 -07:00
Sam	a4a039b619	Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters	2016-12-25 22:09:03 +00:00
cnr	ca19840b19	Revert "Disable communities temporarily." ... This reverts commit 6d5d2b551b.	2016-12-22 16:50:35 -07:00
William Burns	6d5d2b551b	Disable communities temporarily.	2016-12-22 17:07:36 +00:00
AlexTheCoder	941b33bcfc	Replace Integer == with Integer.intValue() == so as to avoid edge case errors	2016-12-21 19:31:56 -07:00
AlexTheCoder	8bb279a8fb	Remove game tips from MCS	2016-12-21 19:30:53 -07:00
AlexTheCoder	2611ba7a7a	Bugfixes from iteration, & new features requested by sampson sigils and relyh	2016-12-21 19:30:53 -07:00
AlexTheCoder	df3c2d5d67	Fix champions being permanently disabled	2016-12-21 19:30:27 -07:00
AlexTheCoder	cbe1a617af	Support the MCS in Arcade	2016-12-21 19:30:26 -07:00
LCastr0	36801283d7	Added method to disable taunts in certain games	2016-12-21 15:55:52 -07:00
LCastr0	f9c71c481f	Fixed taunts, using armorstands instead of items ... Removed minestrike chest (not being released this month)	2016-12-21 15:55:52 -07:00
LCastr0	69f7f025a1	Added the first taunt!	2016-12-21 15:55:52 -07:00
LCastr0	0af46005e7	Added Taunts :toot:	2016-12-21 15:55:51 -07:00
samczsun	7f3bb9671a	Change thresholds, add notifs, move stuff around	2016-12-20 15:05:52 -05:00
samczsun	ece4416c2e	Metadata	2016-12-20 15:05:26 -05:00
samczsun	77f1f18f27	More metadata	2016-12-20 15:05:01 -05:00
samczsun	6970c3205e	AntiHack Logging	2016-12-20 15:05:01 -05:00
samczsun	77da6ac2c2	Remove MAC	2016-12-20 15:05:01 -05:00
samczsun	fd00644eb8	Finalize Titles	2016-12-14 19:56:27 -07:00
samczsun	4641ed828b	Fix faulty scoreboard logic	2016-12-14 19:54:08 -07:00
samczsun	d291521ad1	Clean up DonationManager	2016-12-14 19:52:13 -07:00
cnr	b7e738b4e8	Revert commits from #302 ... This reverts commits from the range 062fdd3^..a0beeab Changes from #302 are on hold until a later date.	2016-12-08 20:41:46 -07:00
Nate Mortensen	5c363d27fd	Fix item drop check in Wizards ... Currently players are unable to drop items if the held item slot is below 5. This works fine when dropping items simply by pressing q, but it often interferes with players dropping items from an open inventory. This commit changes the check to iterate over the first five slots and only cancel the event if they're dropping one of them.	2016-12-07 13:20:04 -06:00
Nate Mortensen	66eeae2a54	Run Minestrike in Adventure Mode	2016-12-07 13:20:04 -06:00
Nate Mortensen	ee6e6837ac	Fix the death message when using Summon Wolves	2016-12-07 13:20:04 -06:00
Nate Mortensen	1a7965a954	Fix kill reward for skinned knives	2016-12-07 13:20:04 -06:00
Nate Mortensen	a05b53c233	Fix Rumble spell slowness level	2016-12-07 13:20:04 -06:00
Nate Mortensen	0c71d5ef5d	Fix protection provided by Gold armor in Wizards ... While the name of the gold items is "Golden X", the name of the material is "GOLD X" resulting in gold items providing no protective benefit other than the default vanilla protection(in the case of there being only gold armor).	2016-12-07 13:20:04 -06:00
Nate Mortensen	fb15264a69	Correct damage for Fireball and AnvilDrop ... This issue came down to two bugs with the explosions created by Fireball and AnvilDrop. The first was the damage being done. Settings the max damage doesn't change the base damage, so they did the default amount of damage based on the vanilla code. The second was the radius of the explosion. The radius was too small, and so it was perceived that only users directly hit would suffer damage. The radius was increased, however the block explosion size was kept the same.	2016-12-07 13:20:04 -06:00
Nate Mortensen	833c52d0f2	Create Lifetime system for managing Listeners with a defined duration. ... This commit introduces a Component system focused around Games, which is completely backwards compatible, as well as designed to be flexible enough for later improvements such as dependency injection. Each GameState is associated with a phase of the PhasedLifetime that each Game has. Components can be registered with a specific phased or the entirety of the Lifetime. Refer to the javadocs for Lifetime and PhasedLifetime for more details. Currently the main two Component types are ICommand and ListenerComponent. This commit includes the first refactoring into using this system, which is replacing the Wizards minigame's usage of Miniplugin with a Lifetimed Component, allowing for the shop to be appropriately registered and unregistered. This change allows for Wizards to be run more than once on the same server instance. Previously, attempting to register the Miniplugin twice would result in the minigame failing to start after the initial registration. This commit additionally includes slight refactoring within GameCreationManager as required for the Lifetime system to function correctly. These changes ensure that Games are only disabled once, whereas before they could be repeatedly disabled. The previous implementation of disable(), along with the classes that override it, functioned correctly despite being called several times. Finally, this commit adds in changes to the pom to allow for unit testing.	2016-12-07 13:20:04 -06:00
Nate Mortensen	062fdd31b2	Allow spells to be learned from double chests	2016-12-07 13:20:04 -06:00
samczsun	20697982e7	Create Rank ScoreboardTag to fix Name collision	2016-12-07 13:05:54 -06:00
Alexander Meech	1ab800afb8	Remove time portion from scoreboard when ending is reached	2016-12-04 01:59:28 -05:00
Alexander Meech	aa3a8104d2	Toggle reached ending setting on last stage	2016-12-04 01:57:57 -05:00
Alexander Meech	d1a084b66e	Add a reached ending setting to Christmas Chaos	2016-12-04 01:55:46 -05:00
LCastr0	97ce2d0ae6	Gingerbread Cosmetics ... Adds the following: - Gingerbread Chests - Holiday Tree particle - Freeze Suit - Winter Warfare win effect - Present Danger Win Effect - Gingerbread Man pet	2016-12-01 23:39:33 -06:00
cnr	fa0e42a918	Revert "Anticheat Logging #299" ... This reverts commit cae9d2f67e.	2016-12-01 01:59:50 -06:00
LCastr0	64949678f8	Added Santa Morph to the menu ... Disabled spawning Baby Zombie Jockey near water	2016-12-01 01:42:29 -06:00
cnr	cae9d2f67e	Anticheat Logging #299 ... Remove MAC Add AntiHack Logging Change thresholds, add notifs, move stuff around Add warning if check does not exist Handle multiple bans when ranked TWITCH+ Prevent punishment abuse	2016-12-01 01:24:05 -06:00
AlexTheCoder	df741fd394	Fix UtilVariant and disable Thanksgiving Chickens in Christmas Chaos	2016-12-01 01:22:32 -06:00
AlexTheCoder	e8cc23279f	Start debugging CC	2016-12-01 01:22:32 -06:00
AlexTheCoder	df48369e70	Revamp original Pumpkin King morph, add a new Christmas King Morph, and make the Christmas King morph the new reward for Christmas Chaos	2016-12-01 01:22:32 -06:00
AlexTheCoder	72669c7640	Remove malfunctioning visibility refreshers and block direct connection to Clans servers for non-staff	2016-12-01 01:20:18 -06:00
Sam	6d1c368452	Fix no drops	2016-11-30 20:23:45 +00:00
Sam	a7143897a0	Vertical Border and achievements fix	2016-11-30 19:52:27 +00:00
Sam	60c1d747c5	Remove PackMaster Achievement	2016-11-30 17:37:50 +00:00
Sam	bb7191504c	UHC Achievements	2016-11-26 00:40:19 +00:00
Sam	ddab450c8e	Another border size problem...	2016-11-25 00:44:13 -05:00
Sam	f2eb1209db	Wrong border size	2016-11-25 00:44:13 -05:00
Sam	4158d09106	UHC Bug fixes!	2016-11-25 00:44:13 -05:00
AlexTheCoder	6fefd71bb8	Remove all chickens on game state change and stop chickens spawning in any UHC type	2016-11-25 00:41:47 -05:00
cnr	3f72ded65e	Revert "Retry CTF proxy fix" ... This reverts commit 67a663891e.	2016-11-24 06:49:26 -06:00
cnr	5e218d019c	Set view distance before loading UHC worlds	2016-11-24 04:50:54 -06:00
Shaun Bennett	4ffe9ef220	Disable UHC in player servers (temporary)	2016-11-24 04:57:21 -05:00
Shaun Bennett	8d9f697bdd	Fix SkyWarrior Kit	2016-11-24 00:50:03 -05:00
Shaun Bennett	8882bfee5c	Merge remote-tracking branch 'remotes/origin/develop' into update/uhc-moppletop ... * remotes/origin/develop: Set up support server with Thankful Chest tracking and Eternal Rank Add Cake Mount and implement it in Thankful Chest Use getName() instead of a String Enable MountChicken with some small modifications and add it to Thankful Chest Implement Thankful chest, patch Trick or Treat chest showing as purchasable, make SubscriptionDuration enum public and static, and create a Power Play Reward Remove MCL and OITQP from the stats page Take a second crack at fixing invisibility across Arcade and Clans Properly block placement of redstone-based blocks in Clans Fix Clans servers not restarting every night, display an uptime notification whenever Clans servers shut down for any reason, and remove unnecessary onDisables from the main ClansManager onDisable Patch Frozen players in clans spawning CombatLog NPCs when leaving, patch ClansCommandExecutedEvent not always being called, clean up ClanBanner code, and make Freeze System and Nether Manager effectively block Clans Commands (particularly teleportation) Fix game scoreboards breaking when given more than 15 lines and removed OITQ Payload from the server selection compass GUI Patch Items with type FEATHER, BONE, or RAW_CHICKEN being automatically instantly removed, patch Carl the Creeper not viewing playwire as an available reward to inform players about, and patch Carl the Creeper not informing players of available rewards on Clans Hubs and Lobbies not included in the main server group # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java	2016-11-24 00:48:15 -05:00
AlexTheCoder	0a458c150f	Take a second crack at fixing invisibility across Arcade and Clans	2016-11-23 23:41:10 -05:00
AlexTheCoder	c2de8c35e2	Fix game scoreboards breaking when given more than 15 lines and removed OITQ Payload from the server selection compass GUI	2016-11-23 23:41:10 -05:00
AlexTheCoder	1bbabe46f7	Patch Items with type FEATHER, BONE, or RAW_CHICKEN being automatically instantly removed, patch Carl the Creeper not viewing playwire as an available reward to inform players about, and patch Carl the Creeper not informing players of available rewards on Clans Hubs and Lobbies not included in the main server group	2016-11-23 23:41:10 -05:00
AlexTheCoder	44efedbc81	Fix HolidayManager being outdated	2016-11-23 19:11:44 -05:00
Shaun Bennett	15f3b19f8a	Merge remote-tracking branch 'origin/update/uhc-moppletop' into update/uhc-moppletop ... * origin/update/uhc-moppletop: Retry CTF proxy fix Eternal Giveaway Fixes Eternal giveaway refactoring Revert: Disable Fated giveaway tools for now Eternal Rank # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java	2016-11-23 18:11:26 -05:00
xXVevzZXx	b42f3eb5fd	Fix final bugs and improve island system	2016-11-23 19:56:46 +01:00
Shaun Bennett	e892476ca0	Setup enderchest API	2016-11-22 08:17:24 -05:00
Sam	325c0ab56c	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop	2016-11-21 19:13:34 +00:00
Sam	92ed095e92	QA changes	2016-11-18 21:32:02 +00:00
samczsun	67a663891e	Retry CTF proxy fix ... But this time, let's allow deregistration even if it hasn't been registered by us, because it auto-registered itself	2016-11-17 22:49:15 -05:00
Shaun Bennett	562d7de1a9	Eternal giveaway refactoring	2016-11-17 21:05:10 -05:00
Shaun Bennett	cdfd030999	Revert: Disable Fated giveaway tools for now	2016-11-17 21:05:10 -05:00
Shaun Bennett	712019b45b	Eternal Rank	2016-11-17 21:05:10 -05:00
xXVevzZXx	85d6452432	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/skyfall	2016-11-17 23:17:24 +01:00
Sam	0ca79f193f	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop	2016-11-17 21:20:28 +00:00
Sam	53b67214fb	More bugs	2016-11-17 21:20:00 +00:00
Shaun Bennett	10911c9a9c	Revert CTF Proxy Fix	2016-11-17 16:17:39 -05:00
Sam	142cf4dd93	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop	2016-11-17 19:41:47 +00:00
Sam	78a123156a	Memory leaks!	2016-11-17 19:38:07 +00:00
xXVevzZXx	26d8fe5e6e	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/skyfall	2016-11-17 19:19:28 +01:00
Shaun Bennett	e845f7fca9	Disable Fated giveaway tools for now	2016-11-17 02:13:48 -05:00
LCastr0	b862a30c76	Thanksgiving Cosmetics (#278) ... * Added chickens to Holiday Manager (Thanksgiving) Added TextEffect Moved all the effects to a different package to make it easier to find Added method in Effect to get the Effect Location * Removed(?) wildcard import * Testing New year thing Added some symbols to UtilBlockText * Allow multiple pets with the same EntityType * Added Stray Morph Added Shulker Pet Added code for a possible new year effect Added Metal Man Morph to the menus Added Metal Man Morph as an yearly bonus for PPC subscriptions * Added chickens to Holiday Manager (Thanksgiving) Added TextEffect Moved all the effects to a different package to make it easier to find Added method in Effect to get the Effect Location * Removed(?) wildcard import * Testing New year thing Added some symbols to UtilBlockText * Allow multiple pets with the same EntityType * Added Stray Morph Added Shulker Pet Added code for a possible new year effect Added Metal Man Morph to the menus Added Metal Man Morph as an yearly bonus for PPC subscriptions * I seriously don't remember what is in this commit, I'm just doing it to fix the thing with develop... * Fixed Pet menu Fixed morph menu Changed from List to Set * Changed from PurchasUnknownSalesPackage to AddUnknownSalesPackageOwned * Added Santa Morph Removed Sleigh Morph Changed all the cosmetics GUIs to start on the second row, instead of the first * Changed some stuff from Holiday Manager so now chickens will walk around when spawned * Added sound effects to Metal Man Added slowness to Metal Man * Added new lore for the Metal Man Morph description Added Stray Morph Ability Fixed some problems with the Thanksgiving Chickens * Added Fated giveaway manager and animation Moved titan and fated giveaway managers to a new package * Fixed lores for Stray morph and Shulker pet Changed ability of Stray morph * Removed Stray and Shulker pet from the menu Deleted Pet class since it was not being used Changed position of achievement on the menu Changed color of chicken's name Changed colors of Power Play message Stray morph, Santa morph and Shulker pet are hidden from the menus for now Removed feathers dropping from chickens, changed them to snow particles * Added hover ability to Metal Man Morph * Fixed some stuff on Metal Man	2016-11-17 02:06:00 -05:00
Shaun Bennett	cbc9aeedc6	Report Feature Improvements (#269) ... Report Feature Improvements	2016-11-16 22:52:14 -05:00
Sam	22b7ce60eb	For sam	2016-11-17 02:56:58 +00:00
AlexTheCoder	0070fed6c7	Fix playwire multithreading and convert to new 5-ticket per 24-hour system	2016-11-16 21:42:47 -05:00
Sam Sun	4709161180	Attempt to fix CTF Proxies (#280)	2016-11-16 21:40:42 -05:00
md-5	735550c157	Use Mineplex Pair Util Class in Halloween 2016 (#274) ... JavaFX is not included in OpenJDK.	2016-11-16 20:29:33 -05:00
Sam	8d6eb13504	Add "%player% is your teammate" in 2 player team games (#273) ... * Add "%player% is your teammate" in 2 player team games * Add to Team Skyfall	2016-11-16 20:10:16 -05:00
Sam	51c7801a9f	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop	2016-11-15 20:01:21 +00:00
cnr	70ca2c7964	Add 1.11 support	2016-11-15 13:58:31 -06:00
xXVevzZXx	a74bc71018	fix bugs and make some improvements	2016-11-15 17:04:38 +01:00
Sam	faba1f2369	Forgot the actual UHC class...	2016-11-13 12:35:48 +00:00
Sam	efc73d220f	Change how UHC handles time	2016-11-13 12:35:38 +00:00
Sam	07cd716cf7	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop	2016-11-13 10:37:21 +00:00
Sam	aa4ef9f4ad	Big bugs	2016-11-12 21:50:38 +00:00
Keir Nellyer	6e5db69b0c	Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report	2016-11-10 13:52:44 +00:00
Sarah	e71187aa33	Add new Brawl Games (#260) ... * add more Brawl games * fix some bugs in new brawl games * fix even more bugs * Fix some super paintstrike bugs * Add some Javadoc	2016-11-09 20:38:49 -05:00
Nate Mortensen	3b83a9bdc3	Reformat Block Hunt	2016-11-08 10:44:39 -05:00
Nate Mortensen	6db79c3ca5	Remove disguises when players switch to Seeker	2016-11-08 10:44:39 -05:00
Nate Mortensen	0607355ee0	Prevent cloaked players from having their visibility reset	2016-11-08 10:44:39 -05:00
Nate Mortensen	e3b701f948	Don't give infestors an initial disguise	2016-11-08 10:44:39 -05:00
Sam	6a9648e646	Solo Mode and Faster UHC	2016-11-05 11:06:12 +00:00
xXVevzZXx	af7de62ff7	Fix non upgradeable perks being not unregistered	2016-11-04 06:02:13 -05:00
Keir Nellyer	407ec0d924	Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report	2016-11-03 20:11:21 +00:00
Nate Mortensen	f587445ffc	Remove extraneous horses when the game ends ... When players using the horseman kit win a game, they never die, which is the only time that spawned horses are removed. To fix this, at the end of the game all horses belonging to players that have survived are explicitly removed, which removes all remaining horses.	2016-11-02 17:01:17 -04:00
LCastr0	9267a36528	Disable Halloween 2016 (#261) ... * Removed all the halloween related items: - Haunted chests can only be opened if player already had ammo - Removed Halloween theme from the hub - Removed pumpkins from in-game * Added Halloween items to the Omega Chest * Fixed weight for items in the omega chest * Changed Disk to Disc in RewardManager Changed values for omega rarities * Final commit (removed win room test command) * Removed Halloween words from Draw My Thing and Master Builders	2016-11-02 16:49:31 -04:00
Sarah	afac2aea3f	Skyfall Update (#262) ... * Fix some bugs, improve Skyfall and add Skyfall Teams * re-enable debug * Fix Perks not being unregistered from the EventHandler * Remove unused import * Remove unused imports	2016-11-02 16:48:44 -04:00
Sam	b122fba97e	Fix arrows not getting removed!	2016-11-02 16:48:01 -04:00
samczsun	07c93606f8	GameChatManager: Check if the game exists	2016-10-28 17:57:25 -04:00
samczsun	873e93747e	HolidayManager: Fix CME	2016-10-28 17:57:25 -04:00
samczsun	49c5df6e68	Parties: Check if target is null before inviting	2016-10-28 17:57:25 -04:00
samczsun	1d961c7d81	GamePlayerManager: Don't load kits if offline	2016-10-28 17:57:25 -04:00
samczsun	d2a2fdfd46	UHC: Fix NPE ... Players who joined after the gamestate has been set to PREPARE should not be considered as in the game	2016-10-28 17:57:25 -04:00
samczsun	a729b03ce7	UtilParser: Handle null lastDamageCauses	2016-10-28 17:57:25 -04:00
samczsun	0c1f6cbedc	Rewrite CombatLogModule	2016-10-28 17:57:25 -04:00
samczsun	70ed2e4fbb	CompassModule ... Integrate with CombatLogModule	2016-10-28 17:56:46 -04:00
samczsun	e8becf3819	Op on dev servers too	2016-10-28 17:56:08 -04:00
samczsun	e7b744f527	UHC rewrite	2016-10-28 17:56:08 -04:00
Keir Nellyer	4b3cadbb5a	Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/BuyChestButton.java	2016-10-27 23:53:32 +01:00
Shaun Bennett	f06325d972	Super Smash Mobs Update (#243) ... Update/ssm	2016-10-26 22:03:43 -04:00
Keir Nellyer	f5a81f083e	Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report	2016-10-26 10:28:13 +01:00
cnr	44e016f272	Fix infinite loop in GameWorldManager	2016-10-25 01:44:07 -05:00
xGamingDudex	eaee382e7f	Small typo	2016-10-23 16:22:27 +02:00
xGamingDudex	c0ec1e1ff7	Prevent infinite speed effect on creeper	2016-10-23 03:11:51 +02:00
xGamingDudex	7b7b7aadf8	Fix a notorious XP bug in the wolf kit	2016-10-23 01:28:57 +02:00
xGamingDudex	1a847862d5	Prevent sometimes duplicate usage of the snowman smash	2016-10-23 01:28:04 +02:00
xGamingDudex	4531902adc	Prevent guardian abilities from affecting team mates	2016-10-23 01:27:34 +02:00
xGamingDudex	0306d0d9d1	Fix chicken rocket to deal damage and knockback	2016-10-23 01:27:09 +02:00
xGamingDudex	2d0d78e1b7	Prevent snowman smash from affecting self, and give 3 snowmen	2016-10-22 21:28:11 +02:00
Keir Nellyer	e0d05d3c87	PC-1140 Keep reports region-separated	2016-10-22 15:06:18 +01:00
xGamingDudex	295f1f255f	Fixed rare NPEs	2016-10-22 13:09:56 +02:00
xGamingDudex	720e965d08	Fixed chicken rocket.	2016-10-22 10:49:21 +02:00
xGamingDudex	4e433665cc	Fixed golem smash affecting team mates	2016-10-22 10:49:02 +02:00
xGamingDudex	8414a17978	Don't apply velocity to team mates	2016-10-22 10:48:36 +02:00
xGamingDudex	d2be1fc646	Don't set team mates on fire on direct fireball hit	2016-10-22 10:48:09 +02:00
xGamingDudex	1ae89adfb0	Remove debug messages	2016-10-22 09:40:06 +02:00
xGamingDudex	cfd2343f0e	Fixed zombie perk Deaths Grasp	2016-10-21 16:51:47 +02:00
xGamingDudex	b8c474a92d	Fixed daze potion	2016-10-21 16:51:29 +02:00
xGamingDudex	bcfdfd4619	Added better team mate detection for team super smash	2016-10-21 16:51:16 +02:00
xGamingDudex	ff1d29bd2e	Apply wool bomb damage to self in team games	2016-10-21 01:37:14 +02:00
xGamingDudex	70d554fa2d	Fixed witch daze potion	2016-10-21 01:12:02 +02:00
xGamingDudex	ca0f36d142	Prevent armorstand used by laze to block projectiles	2016-10-21 00:55:44 +02:00
xGamingDudex	45c5ba66bd	Prevent multiple perks from affect team mates and cleaned up some code	2016-10-21 00:55:18 +02:00
xGamingDudex	c8edc2d01e	Rewrote daze potion damage calculations	2016-10-21 00:54:04 +02:00
xGamingDudex	6a6a589cb7	Fixed wolf cub sometimes not being removed	2016-10-21 00:25:37 +02:00
xGamingDudex	db3106d8a4	Prevent golem fissure from effecting team mates	2016-10-20 23:20:26 +02:00
xGamingDudex	d26103d321	Increase Whirlpool damage	2016-10-20 23:20:02 +02:00
xGamingDudex	d42a5f1897	Prevent Chicken Rocket from resetting cooldown when hitting team mates	2016-10-20 23:13:32 +02:00
xGamingDudex	08b7b7cb48	Removed unused files. Move wool bomb patch to correct file	2016-10-20 23:11:55 +02:00
xGamingDudex	7ad0b214a5	Change team display text	2016-10-20 23:08:40 +02:00
xGamingDudex	be2bc09896	Added comma to laser text	2016-10-20 22:56:12 +02:00
xGamingDudex	875bdc1fca	Removed unused code	2016-10-20 22:50:12 +02:00
xGamingDudex	d119a94d53	Fixed concurrency issue	2016-10-20 22:44:43 +02:00
xGamingDudex	4e4fd2a8e9	Changed respawn title text	2016-10-20 22:44:13 +02:00
xGamingDudex	0705e38b3e	Fixed NPE	2016-10-20 22:43:51 +02:00
samczsun	bafad1189b	ProgressingKitManager: Temporarily add finally	2016-10-19 22:38:39 -04:00
samczsun	09fe7b736a	Don't enable debugging	2016-10-19 22:38:39 -04:00
samczsun	b3ed9db2c7	Fix memory leak in ProgressingKitManager	2016-10-19 22:38:39 -04:00
samczsun	894e6b4a89	Fix memory leak in CombatLogNPC	2016-10-19 22:38:39 -04:00
Alexander Meech	60fad6316b	Ensure command used is actually /pumpkin	2016-10-19 20:59:12 -04:00
AlexTheCoder	26baf6aa67	Make Halloween pumpkins actually drop gems and shards in Block Hunt and Minestrike	2016-10-19 20:59:12 -04:00
xGamingDudex	db9f358718	Increase Angry Heard durration	2016-10-20 02:01:40 +02:00
xGamingDudex	59712b4089	Prevent multiple abilities from dealing damage and knockback on teammate	2016-10-20 02:01:23 +02:00
xGamingDudex	21d004b3f2	Make the skelleton kit deal static 6 damage for arrows	2016-10-20 02:00:30 +02:00
xGamingDudex	6851a20e92	Fix /lives debug command	2016-10-20 02:00:01 +02:00
xGamingDudex	0d688534b1	Reduce slime smash durration	2016-10-20 01:28:25 +02:00
xGamingDudex	33a7deed58	Tweaked witch daze potion damage	2016-10-20 01:27:43 +02:00
xGamingDudex	74d6c599b5	Fixed snowman turret targeting team mates	2016-10-20 01:27:22 +02:00
xGamingDudex	82f1ec1ac6	Tweaked spider smash	2016-10-20 01:01:46 +02:00
xGamingDudex	2306dbc909	Fixed creeper XP	2016-10-20 01:01:31 +02:00
xGamingDudex	8de69d2573	Fixed guardian passive to acctually work	2016-10-19 17:49:59 +02:00
xGamingDudex	0b02bc9e2d	Fixed with daze potion self damage and only randomly working	2016-10-19 16:35:49 +02:00
xGamingDudex	9e3cf58ff5	Type in blaze smash	2016-10-18 19:39:06 +02:00
xGamingDudex	35c9d2ecb1	Tweaked damage/KB values and fixed text issues	2016-10-15 14:56:38 +02:00
cnr	0e5d8cc785	Replace pumpling spawn flicker with short glow	2016-10-14 00:25:55 -05:00
Sam	76a413548b	More unused imports	2016-10-13 23:31:32 +01:00
Sam	4810960d82	Stop visible armorstands	2016-10-13 23:19:11 +01:00
Sam	99c72a3b31	Fix debug command	2016-10-13 23:10:59 +01:00
Sam	e698037a73	Remove unused import	2016-10-13 22:44:48 +01:00
Sam	c93e6be98b	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm	2016-10-13 22:43:08 +01:00
Sam	ca0da15b8c	Fix magma cube	2016-10-13 22:43:04 +01:00
Sam	f72f6e8aaa	Tweaks	2016-10-13 20:20:00 +01:00
Sam	a5d52d9e2f	MERGE PLEASE!	2016-10-13 16:11:01 +01:00
Shaun Bennett	bb32a06caf	Add Halloween Words	2016-10-12 23:30:52 -04:00
AlexTheCoder	7ec530a8c7	Fix lobby protection on build server, make map locks persistent, implement larger parsing size, make map lock command require op, prevent raining on build server, and make block hunt actually work with any map with required information regardless of order	2016-10-12 23:01:25 -04:00
xADudex	311751cc39	Pumpkin's Revenge (#237) ... * Initial Commit * Update * Bunch of new stuff * Fixed fletcher arrow typo * Added reward pet, fixed typo, tweaked lose cinematic * Lots of tweaks and fixes with QA * Cleaning up a little code * Removed debug message on prince death * Added nighttime to halloween game lobby maps * Tweaked spawn rates and mob caps * Typo * Tweaked texts, cleaned import and cleared all mobs from boss cinematic * Fixed creepers not getting properly removed during boss cinematic * Reward typo * Fixed rare NPE * Typos * Tweaked mini zombie * Typo * Prevent zombie from spawning minis after being removed * Tweaked wave announcements + formated WaveVictory * Changed color of prince tag + formated ZombieSpawner * Fixed (another) rare NPE * Tweaked boss wave cinematic	2016-10-12 22:40:05 -04:00
Sam	2b124cb16c	I have really lost track on what I'm doing...	2016-10-09 12:24:49 +01:00
Sam	28a2a8c098	More from GI testing	2016-10-08 11:14:55 +01:00
Sam	e5e953a8ab	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm	2016-10-06 15:03:53 +01:00
Sam	bb9ca490b1	GI changes	2016-10-06 15:03:51 +01:00
Shaun Bennett	a6727bf104	Halloween Fixes/Prep	2016-10-05 22:57:44 -04:00
LCastr0	8da5813f29	Add Halloween Cosmetics (#227) ... * Internal: Changed imports from java.awt.Color to org.bukkit.Color External: Added Double Jump Halloween Added Arrow Trail Halloween Added Pumpkin Hat * Internal: Fixed Arrow Trail Halloween Added new methods to ParticleData Renamed playerNPC to _playerNPC (WinEffectLavaTrap) Removed unecessary method (WinEffectManager) Added a command to test win rooms properly Fixed Squid Morph not showing name unless players hovered over it Created a Manager for the Morphs so we avoid using deprecated methods External: Added Halloween Win Room Added Grim Reaper Morph Added Headless Horseman Morph Added Nightmare Steed * Internal: Renamed RewardType enums to have upper case External: Added Halloween Death Effect Added Haunted Chest Added Baby Zombie Jockey Pet Changed the names of the items Added Grim Reaper pet * Slack integration to test stuff (Will not be in the code in the last commit) * Fixed Grim Reaper Hoe not being removed after the morph is disabled * Details for the Haunted Chest * Details for all the items (lores, icons, texts, effects, etc) Removed Headless Horseman Morph * Fixes for lores and names Support server stuff * Fixes for the Lock and Unlock cosmetics commands * Fixes for the Grim Reaper Morph * Fixes for the Grim Reaper Morph Removed debug messages * Fixed a memory leak. Thanks to Sam * Fix imports * Removed unused code Added javadocs to UtilTextBottom#displayProgress() Added javadocs to UtilAlg#getRandomLocation() * Removed Death Effect Increased Arrow Trail particles Increased Double Jump particles	2016-10-05 10:27:45 -04:00
Keir Nellyer	46db80a056	Always check game object is not null before attempting to access it (#225)	2016-10-04 15:32:04 -04:00
Sam	53c6c07208	Lazer to Laser	2016-10-03 23:17:14 +01:00
Sam	e48dfbefe4	Even more fixes!	2016-10-03 21:20:15 +01:00
Sam	4e9cf4dbb4	More fixes	2016-10-03 19:45:15 +01:00
Sam	668abad83a	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm	2016-10-01 15:49:10 +01:00
Sam	4bfc632fd5	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm	2016-10-01 15:45:05 +01:00
Sam	36c26c0b2c	Fix MineStrike Issues (#222) ... * Check if the costume is null before doing anything. * Disable entity specing	2016-09-29 23:37:41 -04:00
Sam Sun	81070eac62	Plug up memory leaks in IdleManager (#224) ... Somehow, IdleManager was keeping Player references loaded despite having removed them on PlayerQuitEvent. This may be because of the runnable scheduled for 5 ticks after a teleport which would insert players after they quit. In any case, this was keeping entire worlds loaded in UHC. Pretty bad. Moral of the story? Use UUIDs!	2016-09-29 23:29:53 -04:00
Timothy Andis	7d4c817856	Game Lobby/Playwire/Command Fixes (#223) ... * Tweak team locations to accommodate MPS' Disable certain commands from being used. * Change PlayWire things. * Update MPS locations. * Update. * Remove debug * Remove debug. Ty Sam	2016-09-29 23:00:26 -04:00
Sam	22f8a1496a	Guardian fixes	2016-09-29 22:44:03 +01:00
Shaun Bennett	9d6985ddcd	Fix MPS zip file name, null amp stand	2016-09-29 09:10:25 -04:00
Shaun Bennett	b3d8c72953	Add Game Lobby world settings (#220)	2016-09-29 00:22:42 -04:00
Shaun Bennett	7ff6e33941	LegacyGameLobbyManager bug fixes	2016-09-28 23:05:02 -04:00
Timothy Andis	620e219b14	Change MPS world zip (#219) ... * Change MPS map name	2016-09-28 21:32:51 -04:00
Shaun Bennett	3ede0e5644	Merge Report System v2 (#216) ... Report system (v2)	2016-09-28 17:39:26 -04:00
Timothy Andis	3d7647b26b	Game Lobby Update (#215) ... * Game Lobby update. Phase 1. * Correctly apply kit data to players who use the next best game feature. * I can do integer comparisons, I promise. * So much stuff, all minor. * Suck it Carl. * Fix Party bug. Update LobbyManager * Allow QA to test KitProgression @shaun cherry pick this plz. * Proper generation check (testing) Remove debugging from NextBestGame * Correct Amplifier looking direction. Fix Death tag hard coded kits Misc podium work. * ClansHub and Tweaks to the lobby manager * WA Tweak.	2016-09-28 10:17:05 -04:00
Sam	c4e36b2269	Moppletop's September Bug Sprint (#214) ... * Earth Cost issue * Instances of "Tip" to "Thank" * PC-930 Fix an infinite loop when the game ends. * PC-959 Fixes an issue where people could spam drop grenades. * PC-668 Cosmetic Set bonuses no longer carry into MS games * Changes metal's passive Metal's passive is now that it gains 0.5 hearts per armor piece. This avoids the problem of being unkillable	2016-09-27 21:11:49 -04:00
Sam	78e6f3bf71	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm	2016-09-27 19:02:56 +01:00
Sam	68c62acb00	Guardian changes	2016-09-27 19:02:54 +01:00
Keir Nellyer	f63561b05e	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-09-26 10:19:13 +01:00
Sam	96e1e944e1	Addition of the GWEN kit and a billion other things	2016-09-25 22:32:23 +01:00
Keir Nellyer	42ea7f85af	Remove un-required tab changes	2016-09-25 01:36:23 +01:00
Sam	f8a135cf50	Full system conversion	2016-09-25 00:56:06 +01:00
Sam	315a50aa16	Whoops	2016-09-24 21:34:45 +01:00
Sam	baafa62713	Just more converting	2016-09-24 21:09:25 +01:00
Sam	f5a7f35d94	More kits	2016-09-23 18:58:14 +01:00
samczsun	187c6ec67c	Remove debug messages	2016-09-22 21:25:40 -04:00
Sam	f6acedba5f	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm	2016-09-22 17:11:25 +01:00
Sam	2ba2b21577	Progress on converting SSM to a new cleaner system	2016-09-22 17:11:21 +01:00
Keir Nellyer	b24429783b	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java	2016-09-22 16:28:16 +01:00
Shaun Bennett	a3d210871d	Add ignored checks to GWEN (#211)	2016-09-21 23:21:02 -04:00
Shaun Bennett	e15804fc15	Prevent players from joining 1.9+ games with 1.8 clients (#212)	2016-09-21 23:19:55 -04:00
Shaun Bennett	9be26a92d1	Remove NCP	2016-09-21 22:21:49 -04:00
Sam	ac967f6b18	OITQP no longer in Beta (#210) ... * Convert OITQP into a module based system. * More magic modules * Achievements and Stats * Achievement menu update * Removed some Util methods I added that were never used. * Missed a few things * To Alex, Love Sam * Gem and achievement kits	2016-09-21 22:05:21 -04:00
Sarah	c1c46aceb8	Skyfall Game(#208) ... * basic prototype of the game Skyfall * new crumble mechanic * Developing basic game with basic mechanics and basic kits. * Fix merge issues * Add Supply Grop and Deathmatch and change map crumbling * Make cosmetical changes for QA and add Stat Trackers and Achievements * Add version requirement * Change scoreboard layout * Dont crumble the first island, but the islands over the spawn points * Remove Surefoot, fix TNT, remove boats and remove elytra on contact with water/lava * Unused imports * Fix kit description, modify island crumbling and add ring damage * Revert to normal crumble values * Add Javadoc * Remove more unused imports * Check for material data on ring generation * Add Block effect for Booster Ring recharge * Unused imports... * Add Elytra removal message and countdown * "Fix" food issues and some other minor things * Add chest refill to scoreboard from beginning * Fix supply drop * Unused imports..... * Re-enable Anti Cheat * Add java doc, remove system messages and add exeptions * The end of the great label debate * Fix method naming conventions * Remove more labels * Disable Booster kit	2016-09-21 21:57:38 -04:00
samczsun	92a0d606d4	Fix timings	2016-09-21 21:37:57 -04:00
samczsun	ec4add259d	Teleport players back to center of arcade lobby	2016-09-21 21:37:57 -04:00
Timothy Andis	bf61296948	PlayWire Ad integration (#207) ... * PlayWire integration. * Tweak PlayWire display. Update the GUI command. Temp set cooldown to 10 seconds for testing *WILL BE REMOVED* * PlayWire stuff. * PlayWire streaks and tweaks.	2016-09-21 21:24:58 -04:00
Sam	209ea32ef9	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm	2016-09-20 09:18:20 +01:00
Keir Nellyer	2cdab061b6	PC-886 Move report bans over to punishment gui	2016-09-16 17:40:14 +01:00
Keir Nellyer	ebe212c8ff	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-09-15 17:30:27 +01:00
Alexander Meech	93c227a22d	Change Mavs Basketball to 5 Minutes (#201) ... * Update ScoringManager.java * Update Basketball.java	2016-09-14 20:49:24 -04:00
Sam	1458cb84b9	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm	2016-09-14 20:14:05 +01:00
Keir Nellyer	5e5cb3284a	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-09-12 10:11:31 +01:00
Sam	38473dcffd	Fix metal taking too little damage with full iron (#203)	2016-09-10 22:47:52 -04:00
Shaun Bennett	e12ed35da1	Fix NPE and kit upgrades issue	2016-09-07 23:13:28 -04:00
Shaun Bennett	9318ba4de2	Merge branch 'develop' into bugfix/samczsun ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java	2016-09-07 20:12:57 -04:00
Sam	5bf35d49db	Message inconsistancy	2016-09-06 21:38:43 +01:00
Sam	7a5a6c3d00	Fix duplicate message	2016-09-06 19:55:31 +01:00
samczsun	08090f5e06	PC-818 ... Seismic Charges can no longer remove barrier blocks	2016-09-05 18:25:16 -04:00
samczsun	11c97691a9	PC-937 ... This commit allows Arcade to consider spectating and vanished players when deciding to autostart a game	2016-09-05 18:25:16 -04:00
samczsun	3aaa9b2514	Sort tab list properly	2016-09-05 18:25:16 -04:00
Sam	8ebaad4736	Beta ready commit	2016-09-05 17:59:49 +01:00
Keir Nellyer	acd63c90a1	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java # Plugins/Mineplex.Core/src/mineplex/core/preferences/UserPreferences.java # Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/ExclusivePreferencesPage.java # Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java	2016-09-05 14:26:06 +01:00
Sam	34ee62bdc3	Fix NPE	2016-09-03 20:32:10 +01:00
Sam	b3212fc003	Particle changes	2016-09-03 20:13:08 +01:00
Sam	4b1c93150b	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-09-03 20:12:39 +01:00
Sam	8d5d0c6272	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-09-03 18:29:37 +01:00
Sam	fc0217f1fd	More magic OITQ	2016-09-03 18:25:17 +01:00
Sam	e0424c78b2	Added spawn barrier	2016-09-03 18:24:56 +01:00
Sam	7eb148cc59	Ultimate colour change	2016-09-03 18:24:44 +01:00
cnr	374142e63f	Merge branch 'update/the-smoothest-release-we-will-never-have' into develop	2016-09-02 00:42:51 -05:00
TadahTech	e2f974e1e6	Add sounds and messages to basketball.	2016-09-02 00:40:23 -05:00
cnr	ae0d30558c	Merge branch 'update/the-smoothest-release-we-will-never-have' into develop	2016-09-02 00:12:12 -05:00
cnr	f6db5393a3	Merge branch 'project-cosmetics' into develop	2016-09-02 00:08:23 -05:00
TadahTech	9e0bb6ff96	Tweak invite starting index. ... Disable NextBestGame in an MPS	2016-09-01 20:59:28 -05:00
TadahTech	d8486abbfd	Fix minor best game issues.	2016-09-01 20:05:53 -05:00
TadahTech	a6360249b7	Use party if a player has it.	2016-09-01 08:47:43 -05:00
TadahTech	6f3d7dcd29	Merge branches 'develop' and 'update/the-smoothest-release-we-will-never-have' of https://github.com/Mineplex-LLC/Minecraft-PC into update/the-smoothest-release-we-will-never-have	2016-09-01 08:45:43 -05:00
TadahTech	41936e0efc	Remove users from the map.	2016-09-01 08:31:16 -05:00
TadahTech	fdc54e1dd1	Fix BestGame not cancelling for parties.	2016-09-01 08:29:51 -05:00
cnr	05f640266f	Fix basketball scoring infinite loop	2016-09-01 06:36:47 -05:00
TadahTech	53846acbf6	Dont let Minestrike use NextBestGame	2016-09-01 05:39:47 -05:00
TadahTech	46053e82e1	Mavs changes.	2016-09-01 02:35:31 -05:00
cnr	9cd5b73432	Merge branch 'update/basketball-game' into develop	2016-08-31 23:19:51 -05:00
Sam	57292414c6	Gems for winners	2016-08-31 22:55:13 +01:00
Sam	0b7fdc01eb	Initial balence change	2016-08-31 16:30:50 +01:00
Sam	6a139d5c55	Tiny code improvement	2016-08-31 13:28:48 +01:00
Sam	7599630328	Pyromancer Ultimate name change	2016-08-31 13:27:07 +01:00
Sam	8d222aafec	Fix increasing loop in Overtime	2016-08-31 13:26:54 +01:00
Sam	1bfebf358f	Add Overtime	2016-08-31 12:07:50 +01:00
Sam	b1faecea49	Kit Fire incorrect values	2016-08-31 12:07:25 +01:00
AlexTheCoder	8ca214a4d8	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game	2016-08-30 01:37:14 -04:00
TadahTech	a68f7395e4	Use proper server group / remove testing.	2016-08-30 00:10:38 -05:00
TadahTech	94bfc9aa15	Use proper server group / remove testing.	2016-08-29 22:33:01 -05:00
TadahTech	39ea280098	NextBestGame code and new hub releases	2016-08-29 20:21:36 -05:00
Alexander Meech	464c9fcdc3	Update steal chance	2016-08-29 20:37:02 -04:00
Sam	7a3ce9813c	Payload (OITQ)	2016-08-29 23:08:04 +01:00
Sam	9454e1f409	Skywars and Kit Progression	2016-08-29 23:07:48 +01:00
Sam	ec8ed76270	Convert old perks to new perks	2016-08-28 09:06:07 +01:00
Sam	88f4813534	Perk related issue	2016-08-28 09:05:49 +01:00
Sam	ccd855da84	Name the ultimates	2016-08-28 09:05:31 +01:00
Sam	54e8f8e5e8	Code improvement and cleanup	2016-08-28 09:05:11 +01:00
Sam	34c6e1cab7	Add the base of kit progression	2016-08-28 09:04:46 +01:00
Sam	d81ed348f3	Remove used import	2016-08-28 09:04:09 +01:00
Keir Nellyer	cd9423a8e4	De-couple chatsnap from report system	2016-08-27 22:21:56 +01:00
Sam	a35c162dc4	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-08-26 21:26:16 +01:00
Sam	4bc49e6133	Solve merge conflicts	2016-08-26 21:21:18 +01:00
LCastr0	3e38eb5990	Fixes to the merging conflicts	2016-08-25 20:13:59 -03:00
Sam	c2344a0494	Magnet not giving the kill	2016-08-25 20:26:18 +01:00
Sam	265ab620e4	Fix Magnet affecting teams members	2016-08-25 20:10:13 +01:00
Sam	9c5ab7c67e	Remove Fire Aspect 2	2016-08-25 20:09:50 +01:00
TadahTech	2a861460c6	Remove unused variables	2016-08-25 05:12:29 -05:00
TadahTech	b3b8f44b3a	Fix perks not being registered.	2016-08-25 05:11:52 -05:00
TadahTech	ba2bee4f25	Merge branches 'develop' and 'feature/lobby-update' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/lobby-update ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/progression/ProgressiveKit.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeDetailsButton.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeMenuButton.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitDisplayMenu.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitInformationTrackerMenu.java # Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java	2016-08-24 21:29:01 -05:00
TadahTech	bca19788db	Merge branches 'develop' and 'feature/lobby-update' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/lobby-update ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/progression/ProgressiveKit.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeDetailsButton.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeMenuButton.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitDisplayMenu.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitInformationTrackerMenu.java # Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java	2016-08-24 21:28:36 -05:00
cnr	352e1e0eb2	Merge branch 'update/skywars-finalised' into develop	2016-08-24 17:22:01 -05:00
cnr	df1fc60d3d	Merge branch 'update/skywars-finalised' into develop	2016-08-24 17:12:58 -05:00
Sam	4088d2a311	Air teleportation fix ... Makes it less likey that a player would die of fall damage when using the eye of ender	2016-08-24 19:50:38 +01:00
TadahTech	3b9d6adfbc	Lobby Update	2016-08-23 01:37:07 -05:00
Sam	e0f319ea09	Change kit internal names ... Changes the kit internal names to match the current skywars ones in order so that kit progression experience is carried over during this update.	2016-08-22 17:28:51 +01:00
xGamingDudex	7fb6ff58d0	Moved gadgets to use a whitelist system instead of blacklist for ... collisions	2016-08-22 01:00:29 +02:00
Sam	7db41a8be5	Reduce Earth kit scaling	2016-08-20 22:45:17 +01:00
Sam	28bbda23f5	Remove debug commands	2016-08-20 22:44:54 +01:00
Sam	e6530a6f44	More tweaks and fixes	2016-08-20 12:14:01 +01:00
xGamingDudex	e64324b36c	Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698	2016-08-20 11:40:15 +02:00
Sam	dc5c2430cd	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-08-19 17:58:27 +01:00
Sam	c4cb5d8db4	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-08-19 12:56:24 +01:00
LCastr0	84c6720d1c	Fix merging errors	2016-08-18 18:30:32 -03:00
Sam	3b11a2e985	Killstreaks	2016-08-18 22:02:33 +01:00
cnr	999237fe69	Accurately report game TPS	2016-08-18 01:59:05 -05:00
cnr	405f67f8b2	Implement/activate Anticheat phase two ... - Remove anticheat guardians from Arcade - Uncomment/implement Anticheat phase two actions - Specifically: immediate ban on Kill Aura type A, VL 200. - Give moderators less-specific messages, and limit messages by severity	2016-08-17 23:23:20 -04:00
Sam	6c1bd88631	Increase passive knockback	2016-08-17 23:33:31 +01:00
Sam	1565b66395	Ore level changes	2016-08-17 23:33:17 +01:00
Sam	8d6e4a5fd3	Remove some unused code and cleanup	2016-08-17 22:28:22 +01:00
Sam	0176f31f1e	Complete implementation of kit progression	2016-08-16 18:55:26 +01:00
Sam	604f5bc2cc	Update to work with new scoreboard system	2016-08-16 11:03:12 +01:00
Sam	29a07c60ab	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-08-16 11:02:15 +01:00
Sam	84e5b38380	Testing session feedback	2016-08-16 10:53:37 +01:00
Sam	dac4d9595c	Change scoreboard to use new system	2016-08-15 20:28:12 +01:00
Sam	6839006bd1	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-08-15 20:25:01 +01:00
Sam	d5d8f07085	Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple	2016-08-15 19:21:56 +01:00
Sam	df606d5e07	Changed game logic to try out multiple round concept	2016-08-15 19:19:20 +01:00
Sam	09741d4d2a	Added VersionModule (The new way to check client versions for games)	2016-08-15 19:18:51 +01:00
Sam	ea7d877d36	Some attempt at per player kits	2016-08-15 17:45:24 +01:00
xGamingDudex	e71cec874e	Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698	2016-08-14 20:09:01 +02:00
Sam	8f4303cf39	Progress on Upgrade Details	2016-08-13 22:40:33 +01:00
Sam	33cb4db338	Minestrike - Stop vanished players being assigned teams on join	2016-08-12 19:52:23 +01:00
Sam	2915a5e3b9	Add mid-game kit changing NPCs	2016-08-11 21:16:49 +01:00
Sam	69fd78bbf2	Remove Shurikens	2016-08-11 19:05:13 +01:00
Keir Nellyer	a8e891f247	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java	2016-08-11 14:53:57 +01:00
Sam	60a46c8c10	Fire burst is now instant	2016-08-11 14:26:25 +01:00
samczsun	7de9da3d1c	Complete rework of disguising and antihack hook ... This commit completely rewrites DisguiseManager, DisguisePlayer, and PlayerDisguiseManager. Changes to disguising means that much of the core was also changed, primarily having to do with mapping by UUID versus player names. Several new API classes were added, such as EntitySelector, Managers, UtilTasks, and a brand new scoreboard API which is much more optimized and allows for much longer lines The new anticheat is hooked as well, with implementation for guardians which follow the players around. Release two code is also included, but is currently disabled via a boolean.	2016-08-10 21:03:30 -04:00
Sam	82b2541e34	PC-827 ... Team SSM - Teammates can no longer cancel each other's Blaze Firefly	2016-08-10 21:47:13 +01:00
Sam	df646b0659	PC-897 ... SG - Spectators can no longer punch fireballs from the world border	2016-08-10 21:46:37 +01:00
Sam	a02699d84a	PC-898 ... SSM - Fixes an issue where kit armor would not appear correctly in your inventory.	2016-08-10 21:46:02 +01:00
Sam	933861176d	PC-662 ... Castle Siege - Fixes the game not ending if the whole of one team left.	2016-08-10 21:45:27 +01:00
Sam	e05f90372a	Add kit upgrade details	2016-08-10 19:05:40 +01:00
xGamingDudex	907ac7473f	Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698	2016-08-10 16:52:37 +02:00
Sam	87dd4c5632	Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple	2016-08-09 20:23:58 +01:00
Sam	c19825cbb0	Remove unused imports	2016-08-09 20:23:50 +01:00
Sam	950a46ad12	Fix Throwable Dirt's velocity	2016-08-09 14:06:39 +01:00
Sam	5fd5245978	Use attack name	2016-08-09 13:07:17 +01:00
Sam	95c23585c8	Missed a file	2016-08-09 12:53:54 +01:00
Sam	acd5e0c1d2	Added minecart colors	2016-08-09 12:53:34 +01:00
Sam	2f3ff052ff	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-08-08 22:59:55 +01:00
Sam	4c825cf80b	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-08-08 22:48:33 +01:00
Sam	3bab7ffe44	Use attack name for Snowballs and Eggs	2016-08-08 22:48:13 +01:00
Sam	239761962d	Now 1.9!	2016-08-08 20:49:24 +01:00
Sam	93e49bc8a6	Stop placing and dropping of skill items	2016-08-08 16:44:13 +01:00
Sam	280ff577fa	Metal Kit skill item placing and dropping	2016-08-07 01:25:48 +01:00
Sam	44274bcc64	Projectiles, Enchanted armor & StackOverFlows ... Fixes an issue where players with enchanted armor would cause the server to frezze for an extended amount of time due to a stackoverflow error when hit by projectiles such as snowballs or eggs.	2016-08-07 01:23:03 +01:00
Sam	4173c96d32	Fixes inconsistency with the scoreboard	2016-08-06 23:56:54 +01:00
Sam	691fc309c4	Documentation	2016-08-05 22:11:25 +01:00
Sam	e6bdfe8ba7	Per player fireworks	2016-08-05 22:11:15 +01:00
Keir Nellyer	1854b71757	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 ... # Conflicts: # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java	2016-08-05 17:05:01 +01:00
Sam	2c6fc85fee	Logic fix and message change	2016-08-04 17:59:28 +01:00
Sam	618a132806	Payload path marker logic change	2016-08-04 17:29:40 +01:00
Sam	24c1e5fc3b	Kit items are now unbreakable	2016-08-04 17:29:01 +01:00
Sam	23b7064d43	Island ores bug	2016-08-04 16:56:13 +01:00
Sam	190ced7d97	Metal Kit tweaks	2016-08-04 16:55:52 +01:00
xXVevzZXx	91cf391724	some adjustments to UHC Survivalgames	2016-08-04 00:33:24 -04:00
cnr	3610f78b37	Merge branch 'feature/thanks' into develop	2016-08-03 22:23:46 -04:00
Shaun Bennett	e113bedea5	Fix accidentally refactoring "thanks" in strings	2016-08-03 15:11:31 -05:00
Shaun Bennett	ad6c1dd970	Adjust some text wording	2016-08-03 14:55:33 -05:00
Shaun Bennett	a61906acfa	Ignore "Testing" boostergroup when announcing activation	2016-08-03 14:24:49 -05:00
Shaun Bennett	ca13b8f29e	Fix compile errors	2016-08-03 14:18:26 -05:00
Shaun Bennett	1ae7f6cb25	Integrate the new ThankManager into Amplifiers	2016-08-03 14:03:12 -05:00
Sam	2b8754aa32	Metal Kit bug fixes	2016-08-02 23:34:12 +01:00
Shaun Bennett	f41cd8c104	Add /thank command. Update jooq files	2016-08-02 00:10:46 -05:00
Sam	62a1968b01	Experimental Metal Kit	2016-08-02 01:13:16 +01:00
Sam	bd00ac8446	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-08-01 19:34:40 +01:00
Sam	2c37af32ca	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-08-01 19:19:34 +01:00
Sam	4085453f0f	Ninja Dash stopping/not working on rails	2016-08-01 18:47:17 +01:00
Sam	71f9fd97d6	End Effect change ... Reduced the amount of TNT thrown and reduced the velocity at which they are fired.	2016-08-01 18:46:35 +01:00
Sam	8f96b15454	Ninja Dash damage radius fix	2016-08-01 17:18:01 +01:00
Sam	84a4aa5157	Reduce Shuriken damage	2016-07-31 13:47:28 +01:00
Sam	1fde433c50	More changes and fixes	2016-07-30 22:53:36 +01:00
Sam	063e05c0f3	Move subtle changes and fixes	2016-07-29 19:07:24 +01:00
Keir Nellyer	bb9dbf1da4	PC-877 Vanish report handler when teleporting to offender's server	2016-07-29 15:08:03 +01:00
cnr	8d0dc0ce08	Merge branch 'feature/party-v2' into develop	2016-07-28 21:19:52 -05:00
LCastr0	ab8d6daa2c	GitHub being annoying again	2016-07-28 19:59:49 -03:00
Sam	9b71f8c30b	Typo in KitBarrage	2016-07-28 22:49:58 +01:00
Sam	6c11037460	First QA testing session feedback	2016-07-28 22:39:05 +01:00
Sam	771f643b42	Jumping disabled during Pyromancer ULT	2016-07-28 21:01:29 +01:00
Sam	446aec5187	Add "for Team X" when picking up the Arrow powerup	2016-07-28 20:19:50 +01:00
Sam	ba03051689	Add 1 second respawn delay	2016-07-28 19:33:16 +01:00
Sam	d30703c570	Completed game logic & Kit fixes	2016-07-28 19:31:15 +01:00
Shaun Bennett	9c42f4c147	Use the proper boostergroup for amplifier thanks	2016-07-28 13:27:48 -05:00
TadahTech	ab9bf2f405	Fixes possible bug with party leaders not seeing chat. ... Adds pling when you received an invite.	2016-07-28 03:40:24 -05:00
cnr	dd38a1dd76	Merge branch 'update/clans' into develop	2016-07-27 20:40:35 -05:00
cnr	05e59ae9cc	Revert "Revert "Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing"" ... This reverts commit 917b83250d.	2016-07-27 19:03:04 -05:00
Sam	00c0e38b82	Kit upgrades now display	2016-07-27 23:02:40 +01:00
xXVevzZXx	749fa36a5a	remove debug and check for Integer class	2016-07-27 16:47:08 -05:00
AlexTheCoder	031a9575ae	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans	2016-07-27 15:13:18 -04:00
xXVevzZXx	43c45f4094	add timer to dragon escape	2016-07-27 13:59:35 -05:00
Sam	8648581140	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-07-27 19:57:25 +01:00
Sam	ee38cb4c39	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-07-27 19:56:36 +01:00
Sam	888d3fb1aa	Payload logic progress	2016-07-27 19:56:31 +01:00
cnr	3cddf35d12	Refactor out legacy ConfirmationPage	2016-07-27 13:52:03 -05:00
cnr	3d0cc2a5fd	Refactor Clans gold dependency out of core	2016-07-27 13:52:03 -05:00
cnr	dc96258055	Merge branch 'feature/party-v2' into develop	2016-07-27 13:19:25 -05:00
Shaun Bennett	0d46bc4609	Add Amplifier thank button	2016-07-27 13:17:36 -05:00
xGamingDudex	161381f393	Fixed PC-698	2016-07-27 12:09:59 +02:00
TadahTech	5180e46be7	Revert party chat symbol to "@". Change team chat symbol to "#".	2016-07-24 22:17:50 -05:00
Sam	80eb7b2fd3	Gives Super Arrow on start.	2016-07-24 22:44:50 +01:00
Sam	576b92a5ce	Ultimates added to QuiverPayload	2016-07-24 22:06:14 +01:00
Sam	ef797aa599	Velocity fix	2016-07-24 21:41:42 +01:00
Sam	76da92f42e	QuiverPayload added ... Basic implementation added	2016-07-24 21:27:31 +01:00
LCastr0	f4c40c61bb	Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics	2016-07-24 13:18:53 -03:00
LCastr0	195a82f78f	Github is annoying me about this, but I don't know what it is	2016-07-24 13:18:33 -03:00
Sam	a8503d2fb8	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-07-24 11:50:48 +01:00
Sam	4728a50ca9	Small message change ... Avoids using two variables	2016-07-24 11:49:57 +01:00
TadahTech	ceccf2d2ac	Don't give the item when a game is in progress.	2016-07-23 22:36:53 -05:00
Sam	50de769e36	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-07-24 00:13:13 +01:00
Sam	03b3c1864d	Map crumble issue ... Fixes an issue where the max distance of a map would not be calculated correctly affecting the map crumble	2016-07-24 00:12:48 +01:00
Sam	d3c9957f95	Ultimate length tweaks	2016-07-23 23:43:06 +01:00
Sam	43aae5e076	Ultimate visual and gameplay improvements	2016-07-22 22:47:29 +01:00
Keir Nellyer	c5f3f2b2d6	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-07-21 22:44:43 +01:00
AlexTheCoder	b87c6cfff0	Fix git removing class	2016-07-21 17:27:41 -04:00
AlexTheCoder	75cc75f40c	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans	2016-07-21 17:25:15 -04:00
AlexTheCoder	4a77a587f8	Fix git removing a class	2016-07-21 16:11:05 -04:00
AlexTheCoder	fc3ceddf4d	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game ... Conflicts: Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java	2016-07-21 15:47:59 -04:00
xXVevzZXx	0262452b6a	Add enchantments to items, lower arrow spawn rate and limit, give players some steak and make armor unbreakable.	2016-07-21 13:59:35 -05:00
Keir Nellyer	9b58c53e90	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-07-21 16:11:09 +01:00
Sam	faece2c5f8	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-07-21 11:13:15 +01:00
Sam	f48009d9f8	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-07-21 11:12:23 +01:00
Sam	e7658b4bf2	New kits and upgrades for old kits	2016-07-21 11:05:21 +01:00
AlexTheCoder	e5cd38c11b	Revert enjin changes	2016-07-21 05:20:47 -04:00
AlexTheCoder	2615ef74dd	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans	2016-07-21 05:09:54 -04:00
TadahTech	b48f97fd2e	Fix stupid JOOQ issue and IntelliJ.	2016-07-21 03:46:18 -05:00
cnr	9a06cce0a0	Merge branch 'feature/party-v2' into develop	2016-07-20 16:41:50 -05:00
TadahTech	67a185acc9	Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2	2016-07-20 15:52:59 -05:00
AlexTheCoder	ff210271c9	Add javadocs	2016-07-20 12:21:15 -04:00
Sam	7e26480452	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-07-19 22:29:00 +01:00
Sam	3411a3b978	Throwable Dirt colliding issues ... Fixes the falling dirt block colliding with the thrower.	2016-07-19 22:28:56 +01:00
Sam	8b552a69de	Removal of debug message	2016-07-19 21:45:03 +01:00
Sam	765958a421	Code cleanup for PerkDirtCannon ... Cleans up some bad code in PerkDirtCannon and now removes the dirt blocks on death.	2016-07-19 20:51:14 +01:00
Sam	7470078da9	Typo in PerkFireBurst ... Should say Blaze Rod instead of Snowblock	2016-07-19 20:50:19 +01:00
Sam	588e32e1b1	Addition knockback perk for Earth Kit ... Adds a perk so that the Earth kit takes 75% less knockback while on the ground	2016-07-19 20:49:27 +01:00
Sam	0390822fd7	IceBridge item no longer droppable	2016-07-19 20:48:36 +01:00
Sam	63a0eebd02	Increased chance enchanted of armour	2016-07-19 20:48:12 +01:00
AlexTheCoder	0eac157701	Implement basketball features in the hub and begin setting up coordinates	2016-07-19 12:45:38 -04:00
AlexTheCoder	5ecfaef413	Merge branch 'feature/mavericks-master-builders' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game	2016-07-18 16:28:22 -04:00
Keir Nellyer	103f31afc1	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-07-18 17:17:11 +01:00
xXVevzZXx	370b0693d9	fix the server thinking it's the next week	2016-07-17 05:20:21 -05:00