10945 Commits

Author	SHA1	Message	Date
Sam	692fcbacbb	Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters	2017-01-24 17:18:29 +00:00
Sam	2c8b8d4fb0	Add max chests	2017-01-23 19:56:00 +00:00
LCastr0	340f629f09	Changed knockback in winroom	2017-01-21 20:13:19 -02:00
LCastr0	9876c0c61c	Changed particles for wings	2017-01-21 19:58:59 -02:00
Sam	8102ba2e4b	Lots of stuff	2017-01-21 20:45:22 +00:00
Sam	c7c7b4448f	Use File.separator	2017-01-21 14:46:18 +00:00
Sam	0827ea2da0	World Listeners	2017-01-21 14:46:05 +00:00
Sam	24d71e09fe	Teleport dead people	2017-01-21 14:45:58 +00:00
Sam	4c38a5878f	Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters	2017-01-21 14:28:57 +00:00
Sam	490d1d86f2	Give players their earnt gems	2017-01-21 14:24:04 +00:00
Sam	3557fd8acc	Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters	2017-01-21 14:21:03 +00:00
Sam	f5e86f4bc1	Update Villager trading and Events	2017-01-21 14:21:00 +00:00
LCastr0	023ed5ed4a	Small fixes for win room	2017-01-20 22:12:01 -02:00
cnr	8ae74ce952	Increase 2FA window size	2017-01-20 15:42:21 -06:00
cnr	fbb1836eb5	Change Brawl fountain goal to 35M gems	2017-01-20 14:30:54 -06:00
Sam	a16acedb14	Google Sheets v2 finally	2017-01-20 20:08:24 +00:00
cnr	4bb51a3734	Fix non-[\x00-\x7F] characters breaking chat	2017-01-20 01:27:59 -06:00
samczsun	7c829f8712	Filter duplicates, handle permissions in multicommand, support more commands	2017-01-20 01:27:59 -06: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	c340e48daa	Fix Amplifier NPCs disappearing ... Melon Launchers could be used to shove armor stands around. This has been disabled	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
cnr	8fdbe87d1d	Allow spaces when checking 2FA codes	2017-01-20 01:27:58 -06:00
cnr	fded8a6583	Change 2FA issuer on the test network	2017-01-20 01:27:58 -06:00
cnr	f23f04fdb1	Fix NPE in getOrLoadClient	2017-01-20 01:14:03 -06:00
cnr	8f72f9d087	Only require 2FA for MAPDEV+	2017-01-20 01:14:03 -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	66af3cc450	Fix parties mute bypass	2017-01-19 23:12:23 -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
LCastr0	34bf89187d	Added win room to gadget manager	2017-01-19 21:44:57 -02:00
LCastr0	d2c7e48903	Started on the battlefield win room	2017-01-19 21:17:17 -02:00
samczsun	343167245e	Fix party chat	2017-01-19 18:16:43 -05:00
LCastr0	a6ab41fe3f	Fixed cupid pet	2017-01-19 21:14:15 -02:00
Sam	8a9a3cb2ac	Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters	2017-01-19 21:16:12 +00:00
Sam	36c0c56f27	World Events and Sheets rewrite	2017-01-19 21:15:06 +00:00
LCastr0	2fd0e72439	Changed type of love wings	2017-01-19 04:56:11 -02:00
LCastr0	da36276bc3	Changed permissions for unlockcosmetics command	2017-01-19 00:50:42 -06:00
LCastr0	6180162476	Now only remove on teleport if its void	2017-01-19 00:50:42 -06:00
LCastr0	704c787008	Fixed lava and void issues again, prevents CME	2017-01-19 00:50:42 -06:00
LCastr0	d7fe81184a	Better message when despawning balloons	2017-01-19 00:50:42 -06:00
LCastr0	0d1f3a0613	Fixed balloons dying on void ... Fixed balloons bug near lava Fixed balloons lore in menu	2017-01-19 00:50:42 -06:00
LCastr0	7f22872dd6	Changed OpenBalloons so it actually opens the balloons menu	2017-01-19 00:50:42 -06:00
LCastr0	a1a0271cd9	Added balloons to gadgets	2017-01-19 00:50:42 -06:00
LCastr0	9cba2aa9fc	Removed disabled balloons from chests	2017-01-19 00:50:42 -06:00
LCastr0	03aa049f40	Added balloons to chests	2017-01-19 00:50:42 -06:00
cnr	e3b56eda2a	Add 2FA reset command	2017-01-19 00:15:17 -06:00
cnr	9831c7259a	Enforce 2FA and re-enable unbans for trainee+	2017-01-18 23:47:47 -06: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	c5d5d86c1d	Use CoreClient instead of Player in case the player quits	2017-01-18 23:20:24 -06:00
samczsun	ac63985419	Revert removing strict anticheat	2017-01-18 23:20:24 -06:00
samczsun	cdc4f3debd	Don't try to reload client if already loaded	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	d856736bf4	PC-1301 ... If a player joins before any of our listeners are registered, they'll have an account id of -1. If they manage to also not have a redis entry, their cached id will also be -1. This breaks stuff. Instead, let's just kick them. Note that I'm not sending them using Portal because Portal is slow and I want them off the server immediately	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
LCastr0	912bad5035	Used wrong method name	2017-01-18 21:20:32 -02:00
LCastr0	1557f3a39c	Added love chest to customer support server	2017-01-18 21:02:57 -02:00
LCastr0	ed8363e1be	Added items to infused chests	2017-01-18 20:57:54 -02:00
LCastr0	4cdb652b79	Removed winter items from infused chests	2017-01-18 20:35:17 -02:00
LCastr0	ad9caa68a0	Small change to treasure page	2017-01-18 20:34:16 -02:00
LCastr0	f93794f14d	Removed permissions for snr mods to use unlock cosmetics	2017-01-18 20:31:35 -02:00
LCastr0	6ba1901490	Revert "Revered changes to chest page" ... This reverts commit 419c4b1053.	2017-01-18 01:07:50 -02:00
LCastr0	419c4b1053	Revered changes to chest page	2017-01-18 00:52:36 -02:00
LCastr0	3e16c7fdf0	Added items to love chest (missing win room)	2017-01-17 23:34:16 -02:00
LCastr0	d49e85c21a	Corrected chances for love chest	2017-01-17 23:30:29 -02:00
LCastr0	447a1cee18	Removed unused code	2017-01-17 23:28:19 -02:00
LCastr0	09c43ce73b	Added love chets to titles tracking	2017-01-17 23:26:09 -02:00
LCastr0	65cc1b598d	Change Flame Rings icon ... Fixed issue with buy chest button	2017-01-17 21:08:38 -02:00
LCastr0	75ede7f823	Fixed present danger display item	2017-01-17 20:21:37 -02:00
LCastr0	27aa682727	Stops players from purchasing the chest	2017-01-17 20:20:17 -02:00
LCastr0	76b356f73c	Removed gingerbread chest	2017-01-17 19:24:27 -02:00
Sam	1a580251e9	Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters	2017-01-17 09:51:17 +00:00
LCastr0	cdd1e63989	Ops, are we back in time? Fixed lore saying 2012 instead of 2017	2017-01-17 06:30:47 -02:00
LCastr0	ccd490b41a	Added love chest	2017-01-16 21:06:24 -02:00
LCastr0	819741d8ff	Removed gadget selection since it will only work during games	2017-01-16 19:55:28 -02:00
LCastr0	a70c8eccc6	Blow a kiss taunt	2017-01-16 19:43:49 -02:00
LCastr0	ddc098649f	Cupid Pet	2017-01-16 19:28:06 -02:00
LCastr0	694b2f69b2	Love train mount	2017-01-16 19:02:22 -02:00
LCastr0	ebfd6e5cc5	Use correct way for adding pets to ppc	2017-01-16 04:19:57 -02:00
LCastr0	c571736def	Silent villager	2017-01-16 01:57:42 -02:00
LCastr0	9e4f756fe8	Even better way of making pet circle around you	2017-01-15 02:46:44 -02:00
LCastr0	7600cd6e04	Added enderman gun	2017-01-15 00:07:48 -02:00
LCastr0	46552428a4	Make them slower	2017-01-14 23:55:24 -02:00
LCastr0	6e399b10db	Increased radius	2017-01-14 23:27:02 -02:00
LCastr0	3d49eb2181	Better way to handle the circle points	2017-01-14 23:21:49 -02:00
LCastr0	2398fbc8c9	Added correct ppc lore	2017-01-14 23:15:41 -02:00
LCastr0	6c75f6e7dc	Showing correct icon for pets	2017-01-14 23:12:31 -02:00
LCastr0	fb05a08e91	Merge branch 'develop' into update/true-love-pet	2017-01-14 23:10:20 -02:00
LCastr0	28442abbbd	Now using the correct naming...	2017-01-14 23:09:46 -02:00
LCastr0	e03b59bb7c	Added love wings to gadget manager	2017-01-14 22:22:17 -02:00
LCastr0	03c2ec56b7	Added love wings	2017-01-14 22:21:38 -02:00
LCastr0	33cb3b74fc	Added love doctor morph to gadgetmanager	2017-01-14 22:11:25 -02:00
LCastr0	fa9f895891	Use the correct event	2017-01-14 21:01:18 -02:00
LCastr0	d667524ed9	Love Doctor Morph	2017-01-14 20:50:44 -02:00
LCastr0	2976eab5bf	Added particles	2017-01-14 20:06:12 -02:00
LCastr0	8c11f2c4cb	Added True Love Pet	2017-01-14 18:57:40 -02:00
cnr	ef53ae5737	Reinstate missing _showInterface check	2017-01-14 13:59:06 -06:00
cnr	5ba3fac58c	Check twofactor status instead of interact events	2017-01-14 01:29:37 -06:00
LCastr0	babc72a87c	Fixed lore	2017-01-13 23:31:22 -06:00
samczsun	1a5a530133	Fix Evolution crash	2017-01-13 23:30:13 -06:00
cnr	66bff40040	Update StaffServer whitelist	2017-01-13 21:52:02 -06:00
cnr	bb2477676c	Add missing diff from PP-Bizon fix	2017-01-13 14:24:48 -06:00
Sam	b55902f853	World events	2017-01-13 17:16:36 +00:00
cnr	d5160bf10b	Don't register https scheme in BungeeRotator	2017-01-13 03:07:50 -06:00
cnr	89ccaf4323	Disable hotbar items when authenticating with 2FA	2017-01-13 01:14:31 -06:00
samczsun	a4614fe3b4	Drastically reduce BungeeRotator size (3MB!!!)	2017-01-12 23:23:11 -06:00
samczsun	251eb2e53e	Let's be legal	2017-01-12 23:22:40 -06:00
samczsun	e82d1b5885	Remove spigot as a dependency from ServerData	2017-01-12 23:22:39 -06:00
cnr	cdfc19f566	Ignore canceled player interact events	2017-01-12 23:05:34 -06:00
LCastr0	2bb8023b47	Changed chest spawn animation	2017-01-12 18:20:19 -06:00
LCastr0	4a803c1482	Fixed NPE, weapon name is now back at the lore	2017-01-12 18:20:14 -06:00
cnr	8d33a49397	Use a more explicit title for classic MineStrike	2017-01-12 15:59:57 -06:00
LCastr0	85eb38032f	Added minestrike chest to treasure hunt track	2017-01-12 18:50:55 -02:00
LCastr0	9385144566	Lowered the cost from 20000 to 10000	2017-01-12 16:52:36 -02:00
LCastr0	353cefe949	Added weapon name after skin name ... Changed lore and icon of MS chest	2017-01-12 16:36:29 -02:00
Sam	d5be0f5061	Remove args to match new parameters	2017-01-12 18:04:59 +00:00
Sam	3d64319180	Missing commands	2017-01-12 18:03:40 +00:00
Sam	8d47e80066	Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters	2017-01-12 18:03:07 +00:00
LCastr0	4b3b7849eb	Added MS chest to customer support server	2017-01-12 15:55:15 -02:00
cnr	ac32fbb15e	Add StrikeGames to MineStrike NPC's server page	2017-01-12 00:54:59 -06: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	4fd92a3402	Fix remainder of parties bugs	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	91773de97e	Don't use metadata for two-factor auth	2017-01-11 16:17:03 -06:00
Kenny	6f2705f0e4	Reduce size of bungeerotator jar ... Make use of the maven shade plugin's `minimizeJar` option to filter out classes not explicitly mentioned, and use two artifact filters to explicitly include classes used. Also removes the mysql driver check in the main method as it is not necessary for this program to work.	2017-01-11 15:46:20 -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
Shaun Bennett	28a83ef722	Don't delete old client when being replaced (solves enjin listener issue)	2017-01-11 15:28:59 -06:00
samczsun	cbe238c83d	Don't give book on join	2017-01-11 15:11:57 -06:00
samczsun	716c77451e	Update the right titles	2017-01-11 15:11:57 -06:00
samczsun	fbaeffc96e	Remove EventHandler annotation	2017-01-11 15:11:57 -06:00
samczsun	99211d5d89	Fix particles	2017-01-11 15:11:57 -06:00
samczsun	cb13fb1ccc	1.8 titles!	2017-01-11 15:11:57 -06:00
samczsun	bcea0044e8	Animated Titles!	2017-01-11 15:11:57 -06:00
Nate Mortensen	e803df6884	Fix Blink ability with Spectators ... When using blink, players are teleported away from other players within a one block radius of them. However, if a player happens to have the exact same position(only can occur when a player is spectating them), division by 0 occurs, resulting in the player being teleported to NaN, as any operation with NaN is also NaN. To fix this, Blink now ignores players in Spectator mode. This change could also address the hypothetical scenario where a spectator is within the one block radius and results in a blinking player getting teleported in a weird direction.	2017-01-11 15:07:48 -06:00
Nate Mortensen	9583c7abcb	Run Minestrike in Adventure Mode	2017-01-11 15:07:48 -06:00
Nate Mortensen	0bb01d39b6	Fix PP-Bizon skin	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	e1aeaa8714	Add damage metadata system to CombatLog and CustomDamageEvent ... This adds a system whereby plugins can associate metadata with individual damage events and then retrieve that metadata later from the CombatLog. One example use case for this is Minestrike. Players are rewarded according to the weapon that they used to kill another player, however the weapons are frequently renamed. Minestrike can now associate a "gunType" key to the name of the weapon used to kill the player, regardless of the skin that the gun currently has applied to it.	2017-01-11 15:07:47 -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	0a655932af	IntelliJ removed an import after I commited last time	2017-01-11 15:50:53 -02:00
LCastr0	5e85f48c87	Fixed balloons still being added to chests	2017-01-11 01:54:53 -02:00
LCastr0	21473a7d82	Fixed merge conflict	2017-01-10 21:27:47 -02:00
LCastr0	d3e6a094e5	Removed balloons for now, will be in the next update ... Updated cosmetics menu Added weapon name to skin lore	2017-01-10 21:08:03 -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	cbc5ed491c	Check two-factor status for every player on login	2017-01-05 19:16:28 -07:00
cnr	96c15376aa	Use default 2FA window size (3)	2017-01-05 15:20:10 -07:00
cnr	435abbba08	Allow builders to use 2FA	2017-01-05 10:48:56 -07:00
cnr	a2472f45b4	Cancel commands when authenticating with 2FA	2017-01-05 10:44:03 -07:00
cnr	fa6a60981c	Return to normal hub type	2017-01-04 20:36:16 -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
Sam	571840e249	Lots more changes	2017-01-02 14:40:13 +00:00
LCastr0	17bdfe6814	Started on the flying mechanics stuff	2016-12-30 12:44:49 -02:00
LCastr0	1aca03b22d	Added balloons to normal chests	2016-12-30 12:17:52 -02:00
LCastr0	ef7bbfe7eb	Added Balloons to omega chest	2016-12-30 12:10:26 -02:00
LCastr0	9578864f8a	Added display item	2016-12-29 21:49:20 -02:00
LCastr0	9ec8835374	Fixed block balloons!	2016-12-29 21:40:02 -02:00
LCastr0	16e40c2896	Added shotgun skin	2016-12-29 19:18:09 -02:00
LCastr0	fcec0399cd	Added remaining skins to chest	2016-12-29 19:08:31 -02:00
LCastr0	5f0de2e5e3	Allows 2 chests to be opened and dupes for minestrike chest	2016-12-29 18:04:24 -02:00
LCastr0	c877f20031	Added other skins, forgot this on the last commit	2016-12-29 18:00:18 -02:00
LCastr0	025a43b519	Added ms skins to their own chest, and added chest to page	2016-12-29 17:58:48 -02:00
LCastr0	36303a0fe8	Added new minestrike skins (some, at least?)	2016-12-29 17:43:50 -02:00
LCastr0	8131656ae2	Changed RankReward to have Eternal rank	2016-12-29 17:06:07 -02: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	efea2b0c1d	Merge branch 'feature/dinnerbone-morph' into develop	2016-12-28 15:19:06 -07:00
cnr	c7d5e149f8	Fix NullPointerException in speed builders	2016-12-28 15:18:59 -07:00
Sam	4f497a2025	Rank rewards	2016-12-28 18:48:19 +00:00
Sam	4c7f5c5716	Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters	2016-12-27 18:59:03 +00:00
Sam	e114ab03b5	Chest spawning	2016-12-27 17:20:53 +00:00
Sam	3a6cef32a4	Add Gem Hunters as a catagory for the build server	2016-12-26 22:45:18 -07:00
cnr	d3bcc77e01	Enable double XP + gems for the holidays	2016-12-26 22:43:32 -07:00
cnr	0b4d217303	Reduce number of redis requests by communities	2016-12-26 22:34:09 -07:00
LCastr0	c685486086	Fixed some types of entities	2016-12-27 00:58:16 -02:00
LCastr0	5198d64ab8	Added all the balloons!	2016-12-27 00:29:48 -02:00
LCastr0	092cde9973	Renamed to BalloonData	2016-12-27 00:01:42 -02:00
LCastr0	cd70305afb	Make leashes not break (WITHOUT packets ;))	2016-12-26 23:17:04 -02:00
LCastr0	f25c592a6d	Removed commented code	2016-12-26 22:20:23 -02:00
LCastr0	78510ffbbf	Allows multiple balloons	2016-12-26 22:19:08 -02:00
LCastr0	5e420a20d8	Changed temporary display item so it doesn't bug with 1.11	2016-12-26 20:21:43 -02:00
LCastr0	d19d661c7d	Modified pets so they don't make different sounds anymore :toot:	2016-12-26 19:02:35 -02:00
LCastr0	6712ad427b	Added bat so players can use items in hand with the leash ... Changed silence method so it works :toot:	2016-12-26 19:00:11 -02:00
LCastr0	c11755558e	Ops, those comments are wrong...	2016-12-26 18:27:01 -02:00
LCastr0	1d2a538fd6	Renamed Balloons page name	2016-12-26 18:23:27 -02:00
LCastr0	b422832276	Fixed Cosmetics menu positions	2016-12-26 18:22:57 -02:00
LCastr0	4ebc82bf1f	Added balloons	2016-12-26 18:10:42 -02:00
Sam	a4a039b619	Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters	2016-12-25 22:09:03 +00:00
Sam	a1dc9135c8	Sprint work	2016-12-25 22:06:10 +00:00
LCastr0	fb9720c926	Added padding to menu	2016-12-25 16:21:46 -02:00
LCastr0	7e6810e10f	Added a balloon to the menu	2016-12-25 16:12:05 -02:00
LCastr0	45d4e5ce6e	Added Balloons to the cosmetics menu	2016-12-25 16:01:49 -02:00
LCastr0	246db919d9	Changed permissions for Unlock Cosmetics	2016-12-25 15:35:53 -02:00
LCastr0	de73307754	Added morph to january ppc prize	2016-12-25 15:35:25 -02:00
LCastr0	140da98922	Merge branch 'develop' into feature/dinnerbone-morph	2016-12-25 15:34:00 -02:00
samczsun	10bed92a6a	Change morph description	2016-12-24 17:38:29 -05:00
samczsun	fe8823c134	Re-order morphs	2016-12-24 17:38:09 -05:00
samczsun	81d769db5b	Fix issues regarding disguising	2016-12-24 14:18:33 -05:00
samczsun	eacbdfdb02	Convert morph to packets	2016-12-24 14:07:41 -05:00
cnr	73cefb69c9	Use redis pipeline for community player statuses	2016-12-24 00:39:59 -07:00
cnr	08d65f3662	Load communities with 4 queries instead of 3n+1	2016-12-23 21:33:17 -07:00
LCastr0	0aec8889fa	Added lore	2016-12-23 23:56:43 -02:00
AlexTheCoder	35a9eabf74	Use UUID object instead of String for PlayerStatus and FriendStatus, as well as update CommunityJoinRequestInfo on a task	2016-12-23 18:34:52 -05:00
AlexTheCoder	74a6071d4e	Refactor Redis PlayerStatus to use UUID as a key instead of Name, and make communities not force every server to subscribe to join publishes from proxies	2016-12-23 18:03:08 -05:00
AlexTheCoder	4ae21e66c9	Delete new communities if the leader has been transferred a new community during creation	2016-12-23 18:03:08 -05:00
LCastr0	675642a100	Disable on tp and do not allow mounts	2016-12-23 19:53:49 -02:00
LCastr0	9fad633b88	Ops, lava, not water	2016-12-23 19:13:50 -02:00
LCastr0	c0afad0723	Fixed morph with lava, water, void and ender pearls	2016-12-23 18:15:26 -02:00
LCastr0	7f6f3464a1	Fixed chest pages again	2016-12-23 17:48:37 -02:00
William Burns	1e0ba62557	To many typos.	2016-12-23 11:15:46 -07:00
AlexTheCoder	7a482c3386	Implement system to run code when an SQL error occurs, and ensure that duplicate key errors on community creation inform the community creator	2016-12-22 22:32:04 -07:00
AlexTheCoder	ac8d8aa69c	Prevent Name value in info classes from being null	2016-12-22 22:32:04 -07:00
AlexTheCoder	0a69562579	Improve communities member page sorter to base on role as well as name and online status	2016-12-22 22:32:04 -07:00
AlexTheCoder	09e711e202	Properly get online player key from redis	2016-12-22 22:32:04 -07:00
AlexTheCoder	8e9336ad23	Make community button refresh with join requests	2016-12-22 22:32:04 -07:00
AlexTheCoder	9acd6b7832	Ensure comparison of ints with == instead of Integers	2016-12-22 22:32:04 -07:00
AlexTheCoder	286a9fe246	Fix various synchronization issues and make community creation load the new community through redis instead of a database call	2016-12-22 22:32:04 -07:00
AlexTheCoder	66c6f66768	Fix threading of community create command and make invite loader run on a LoginProcessor	2016-12-22 22:32:04 -07:00
AlexTheCoder	36f671d944	Use UtilPlayer.message instead of sender.sendMessage to fit standards	2016-12-22 22:32:04 -07:00
AlexTheCoder	e5aaa555b7	Make join request name updating redis-based	2016-12-22 22:32:04 -07:00
AlexTheCoder	56ecab1985	Make community membership updating entirely redis-based	2016-12-22 22:32:04 -07:00
samczsun	a0716ae774	Try to prevent duplicate bans even more	2016-12-22 22:42:07 -05:00
samczsun	1bcbddee87	Remove VL logging for good	2016-12-22 22:32:56 -05:00
LCastr0	6870bf31db	Merge branch 'feature/dinnerbone-morph' of github.com:Mineplex-LLC/Minecraft-PC into feature/dinnerbone-morph	2016-12-23 00:53:18 -02:00
LCastr0	4c58e852d0	Fixed a bug with treasure pages after buying a chest	2016-12-23 00:53:01 -02:00
samczsun	bbd695981d	Don't summon titles if player is morphed	2016-12-22 21:06:39 -05:00
cnr	df5c53766c	Disable VL logging	2016-12-22 17:54:50 -07:00
cnr	ca19840b19	Revert "Disable communities temporarily." ... This reverts commit 6d5d2b551b.	2016-12-22 16:50:35 -07:00
cnr	2fe9423196	Remove inner query in CommunityRepository	2016-12-22 16:44:26 -07:00
LCastr0	7322e05ac4	Added the custom display item to menus	2016-12-22 18:58:38 -02:00
LCastr0	38e9daa377	Added display item feature again	2016-12-22 18:23:42 -02:00
LCastr0	ac6440a3c6	Merge branch 'develop' into feature/dinnerbone-morph	2016-12-22 17:09:33 -02:00
Kenny	253c907ba1	Update Anticheat dependency in core	2016-12-22 12:33:27 -05:00
William Burns	6d5d2b551b	Disable communities temporarily.	2016-12-22 17:07:36 +00:00
cnr	69670a4b99	Pass accountId at community creation time	2016-12-22 01:17:44 -07:00
LCastr0	09afab39d6	Merge branch 'develop' into feature/dinnerbone-morph	2016-12-22 03:51:40 -02:00
AlexTheCoder	623703cc76	Insert MCS as type Community in redis	2016-12-21 19:31:57 -07:00
AlexTheCoder	65522a364f	Update lobby file used by MCS	2016-12-21 19:31:56 -07:00
AlexTheCoder	0b92bc2263	Fix redis host value for MCS	2016-12-21 19:31:56 -07:00
AlexTheCoder	b73e51b345	Fix invites and member data loading communities from the wrong regions	2016-12-21 19:31:56 -07:00
AlexTheCoder	d4904fa02a	Fix communities commands having incorrect coloring in their help messages	2016-12-21 19:31:56 -07:00
AlexTheCoder	d0c2906467	Fix community invites storing twice in player data if it is a duplicate	2016-12-21 19:31:56 -07:00
AlexTheCoder	1190d4a427	Fix communities queries having the ability to lock the server mysql connections due to nesting, improve RepositoryBase by allowing all the methods to be passed a Connection object to reuse it, and fix duplicate invites throwing an sql error	2016-12-21 19:31:56 -07:00
AlexTheCoder	cc3842f019	Synchronize BrowserIds List and update the browser GUI when a contained community is disbanded	2016-12-21 19:31:56 -07:00
AlexTheCoder	941b33bcfc	Replace Integer == with Integer.intValue() == so as to avoid edge case errors	2016-12-21 19:31:56 -07:00
AlexTheCoder	1cb6151817	Allow CUST-1 to set players to ETERNAL via support commands	2016-12-21 19:31:56 -07:00
AlexTheCoder	dad7346313	Fix incorrect placement of thankful chest on cust server display	2016-12-21 19:31:56 -07:00
AlexTheCoder	07f2679275	Fix preference ordinal being shifted due to community invite preference being added in the middle, and added region-locking to community names so as to stop EU and US communities from having the same name due to independent redii	2016-12-21 19:30:54 -07:00
AlexTheCoder	eabda7f8c6	Fix alpha numeric check and slight potential concurrency issues	2016-12-21 19:30:54 -07:00
AlexTheCoder	bcbc6fdea4	More fixes and stylistic changes from iteration	2016-12-21 19:30:54 -07:00
AlexTheCoder	92e5c74fff	Update PersonalServerManager to launch the MCS with the community's favorite game	2016-12-21 19:30:54 -07:00
AlexTheCoder	94d8e5d2f4	Update Formatter to support specifically colored commands	2016-12-21 19:30:54 -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	2cacbcbc1c	Update community repository to latest changes	2016-12-21 19:30:27 -07:00
AlexTheCoder	df3c2d5d67	Fix champions being permanently disabled	2016-12-21 19:30:27 -07:00
AlexTheCoder	1a3a48115c	Set up personal server manager to be able to create an MCS	2016-12-21 19:30:27 -07:00
AlexTheCoder	095fbfa255	Fix error caused by GIT client with MCS themes and actually register redis commands in the miniplugin	2016-12-21 19:30:27 -07:00
AlexTheCoder	cbe1a617af	Support the MCS in Arcade	2016-12-21 19:30:26 -07:00
AlexTheCoder	fe62e5a683	Make server monitor support MCS and servers with multiple '-' characters	2016-12-21 19:30:26 -07:00
AlexTheCoder	bd4fa1f2d4	Convert to MCS system for community servers and add a command to open them	2016-12-21 19:30:26 -07:00
AlexTheCoder	0668e31710	Implement various events to interact with the GUIs and update them when changes to communities or playerdata occur	2016-12-21 19:30:26 -07:00
AlexTheCoder	024a58e0fa	Create data classes to handle information about join requests and community members, as well as increasing the amount of information held for online players in their MemberData	2016-12-21 19:30:26 -07:00
AlexTheCoder	cefc3344ab	Set up redis pub sub commands to transfer communities information across the network	2016-12-21 19:30:26 -07:00
AlexTheCoder	39f2c94718	Update the Communities miniplugin to contain a variety of redis and player interaction	2016-12-21 19:30:26 -07:00
AlexTheCoder	2a971d616c	Complete setting up community data class	2016-12-21 19:30:26 -07:00
AlexTheCoder	471ea8942f	Create an enum to manage different unlockable MPS themes	2016-12-21 19:30:26 -07:00
AlexTheCoder	216b4fe947	Further set up communities database class	2016-12-21 19:30:26 -07:00
AlexTheCoder	9ba38ffd3b	Implement all communities commands	2016-12-21 19:30:26 -07:00
AlexTheCoder	d44a3774db	Implement communities GUI system with several pages for community management	2016-12-21 19:30:26 -07:00
AlexTheCoder	f6362676ff	Implement more settings for communities	2016-12-21 19:30:26 -07:00
AlexTheCoder	fd30fca035	Remove an unused preference class and convert friends preferences to social preferences so as to add communities preferences in that section	2016-12-21 19:30:26 -07:00
AlexTheCoder	88fc34def4	Implement a setting to configure whether a game type can be the favorite game of a community	2016-12-21 19:30:25 -07:00
AlexTheCoder	482f0e5b2a	Implement a method for loading client data from the web server for offline uuids	2016-12-21 19:30:25 -07:00
AlexTheCoder	1a0bd7ffb0	Set up more settings	2016-12-21 19:30:25 -07:00
AlexTheCoder	7b23c1bdd2	Change SQL queries a bit to be more efficient	2016-12-21 19:30:25 -07:00
AlexTheCoder	a2fb0bb491	Implement more backend for communities and add a command base	2016-12-21 19:30:25 -07:00
AlexTheCoder	0007ffc91e	More backend for handling community settings	2016-12-21 19:30:25 -07:00
AlexTheCoder	5143a7cd61	Change/Expand redis interaction and community storage, implement chat formatting	2016-12-21 19:30:25 -07:00
AlexTheCoder	ac224e3f68	Initial communities code	2016-12-21 19:30:25 -07:00
LCastr0	dd9729c0f4	and!	2016-12-21 15:55:52 -07:00
LCastr0	e8d698ac37	Fixed eternal taunt ... Added description for taunts Added eternal taunt description and icon Removed minestrike chest for now Removed debug commans permissions	2016-12-21 15:55:52 -07:00
LCastr0	f2aef9a873	Auto-add item to eternal	2016-12-21 15:55:52 -07:00
LCastr0	dd7f5d7513	Disguise player as skeleton	2016-12-21 15:55:52 -07:00
LCastr0	5102227e94	Added time in ticks where players can't move at the start of the effect	2016-12-21 15:55:52 -07:00
LCastr0	651d0c5966	Changed clocks to be behind player	2016-12-21 15:55:52 -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	e940134610	Removed commented code	2016-12-21 15:55:52 -07:00
LCastr0	99cec0de91	Added pages for the Treasure Chest menu!	2016-12-21 15:55:52 -07:00
LCastr0	e50b867184	Javadocs + option to make taunts usable or not during pvp	2016-12-21 15:55:52 -07:00
LCastr0	0af46005e7	Added Taunts :toot:	2016-12-21 15:55:51 -07:00
LCastr0	56003cccab	Added Minestrike Chests tracking for support	2016-12-21 15:55:51 -07:00
LCastr0	8f50f0d833	Added Minestrike chests (this time to the right branch)	2016-12-21 15:55:51 -07:00
samczsun	7e2c4c8555	Change thresholds, add notifs, move stuff around	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	c4c46b6ba2	Add warning if check does not exist	2016-12-20 15:05:26 -05:00
samczsun	fcaf4538bd	Handle multiple bans when ranked TWITCH+	2016-12-20 15:05:26 -05:00
samczsun	63d0481dcf	Fix minor bugs	2016-12-20 15:05:26 -05:00
samczsun	2397cdbba7	Add playerinfo metadata	2016-12-20 15:05:26 -05:00
samczsun	b00d9d7bb4	Prevent punishment abuse	2016-12-20 15:05:26 -05:00
samczsun	383c4d3670	More	2016-12-20 15:05:26 -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	994d286abe	More logging	2016-12-20 15:05:01 -05:00
samczsun	74f4645828	Ban log	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
LCastr0	df2b0c7e99	Addef fix for dinnerbone morph not opening menus	2016-12-20 17:16:42 -02:00
Sam	94f8419187	Cashing out and safezones	2016-12-20 16:45:41 +00:00
LCastr0	fd223935c7	Merge branch 'feature/dinnerbone-morph' of github.com:Mineplex-LLC/Minecraft-PC into feature/dinnerbone-morph	2016-12-19 22:15:32 -02:00
LCastr0	06a05080ed	Added YearMonth for Dinnerbone Morph	2016-12-19 22:15:22 -02:00
samczsun	b85bd623f7	Fix not updating skin/tab list	2016-12-19 19:14:28 -05:00
samczsun	eadbb22de9	Dinnerbone Morph with tab list	2016-12-19 17:53:15 -05:00
Sam	9409cbc42c	Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters	2016-12-19 00:32:53 +00:00
samczsun	a6db0170c6	QA Fixes	2016-12-15 20:48:40 -07:00
samczsun	58761a0478	1.8 blocker	2016-12-15 20:48:40 -07:00
samczsun	8421aad59c	Multiversion support (but not used)	2016-12-15 20:48:40 -07:00
samczsun	54f59c6a4d	This is not a bribe	2016-12-15 20:48:40 -07:00
samczsun	de3eef462a	Add Gingerbread Chest to list of holiday chests	2016-12-15 20:48:39 -07:00
samczsun	6ed6c324ec	Update Holiday Cheer Hover	2016-12-15 20:48:39 -07:00
samczsun	d43d82d1ad	Update Leveler tier names	2016-12-15 20:48:39 -07:00
samczsun	908df5a4c2	Make Love Potion call event	2016-12-15 20:48:39 -07:00
samczsun	84132588c2	Give bonus for melons	2016-12-15 20:48:39 -07:00
md_5	e107c0a64a	Pass SQL connection into nested method to prevent deadlock. ... Discussed with Sam on Slack 11 Dec #general.	2016-12-15 20:46:42 -07:00
William Burns	337f9e4fd9	Don't display titles to 1.8 clients!	2016-12-15 12:36:32 +00:00
cnr	2ab9bc2c88	Fix Power Play title track's goal	2016-12-15 00:44:31 -07:00
cnr	777574a8ff	Add missing dependency to BungeeRotator	2016-12-14 23:23:42 -07: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	87eaeabd7f	Document and clean up StatsManager	2016-12-14 19:52:13 -07:00
samczsun	d291521ad1	Clean up DonationManager	2016-12-14 19:52:13 -07:00
samczsun	f2fc70f400	Titles	2016-12-14 19:52:13 -07:00
Sam	33ac4f49fd	Some progress	2016-12-13 22:39:38 +00:00
Sam	99b69bd8c8	Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters	2016-12-13 22:39:30 +00:00
Kenny	1b76de9e06	Implement timeout into HTTP calls to prevent freezes	2016-12-12 21:21:06 -05:00
Sam	d0f3aff051	Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters	2016-12-10 11:21:20 +00:00
Sam	6367330021	WorldEvent Base	2016-12-10 11:21:19 +00:00
Sam	6bb76db05b	Helicopter	2016-12-09 18:05:17 +00:00
LCastr0	77a1b40bef	Fixed illuminated chests having gadgets	2016-12-08 20:46:14 -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
Sam	58613fa77f	Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters	2016-12-08 19:42:55 +00:00
Sam	b6173c4990	Google Sheets implementation	2016-12-08 19:25:48 +00:00
LCastr0	38345bfc6d	Add Infused chests #308	2016-12-07 21:42:44 -06:00
Nate Mortensen	a0beeab5ec	Fix Frost Barrier not activating ... Negative yaw values are considered valid in minecraft. UtilShapes doesn't correctly handle negative yaw values (throws an ArrayIndexOutOfBoundsException) so whenever a player is facing east they're unable to activate Frost Barrier. This commit fixes the issue by allowing UtilShapes to take negative values.	2016-12-07 13:20:04 -06: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	107fc9d5f6	Fix Blink ability with Spectators ... When using blink, players are teleported away from other players within a one block radius of them. However, if a player happens to have the exact same position(only can occur when a player is spectating them), division by 0 occurs, resulting in the player being teleported to NaN, as any operation with NaN is also NaN. To fix this, Blink now ignores players in Spectator mode. This change could also address the hypothetical scenario where a spectator is within the one block radius and results in a blinking player getting teleported in a weird direction.	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	d51d3b2df2	Fix PP-Bizon skin	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	21ebb2b4c8	Add damage metadata system to CombatLog and CustomDamageEvent ... This adds a system whereby plugins can associate metadata with individual damage events and then retrieve that metadata later from the CombatLog. One example use case for this is Minestrike. Players are rewarded according to the weapon that they used to kill another player, however the weapons are frequently renamed. Minestrike can now associate a "gunType" key to the name of the weapon used to kill the player, regardless of the skin that the gun currently has applied to it.	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	3755424b1c	Botspam QoL improvements	2016-12-07 13:11:00 -06:00
samczsun	20697982e7	Create Rank ScoreboardTag to fix Name collision	2016-12-07 13:05:54 -06:00
samczsun	9234c7a7d5	Implement AddPunishCommand and RemovePunishCommand	2016-12-07 13:05:54 -06:00
Alexander Meech	3af0fe3bee	Add a check for punishment removal permission	2016-12-07 13:05:54 -06:00
Alexander Meech	609d77a4f2	Add a check for whether a player can remove punishments	2016-12-07 13:05:54 -06:00
Sam	05523c1cdf	Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters	2016-12-07 13:36:28 +00:00
Sam	19a214b454	Gem Hunters base	2016-12-06 19:28:23 +00: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	0ae158726a	Remove last year's 'Massive Winter Sale' news	2016-12-01 03:56:29 -06:00
cnr	795f82d665	Set time to night in the Christmas hub	2016-12-01 03:00:36 -06:00
cnr	fa0e42a918	Revert "Anticheat Logging #299" ... This reverts commit cae9d2f67e.	2016-12-01 01:59:50 -06:00
LCastr0	e503654114	Added lore and icon for the Santa Morph	2016-12-01 01:54:53 -06:00
LCastr0	420a74a33d	Added Santa Morph to the PowerPlay rewards	2016-12-01 01:49:05 -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	58fe232520	Fix redis pubsub for SalesAnnouncements	2016-12-01 01:20:18 -06:00
AlexTheCoder	72669c7640	Remove malfunctioning visibility refreshers and block direct connection to Clans servers for non-staff	2016-12-01 01:20:18 -06:00
AlexTheCoder	3a7ff872d6	Update Rune Amplifier display to be less confusing	2016-12-01 01:20:18 -06:00
Sam	6d1c368452	Fix no drops	2016-11-30 20:23:45 +00:00
Sam	a7143897a0	Vertical Border and achievements fix	2016-11-30 19:52:27 +00:00
Sam	60c1d747c5	Remove PackMaster Achievement	2016-11-30 17:37:50 +00:00
Sam	bb7191504c	UHC Achievements	2016-11-26 00:40:19 +00:00
Sam	ddab450c8e	Another border size problem...	2016-11-25 00:44:13 -05:00
Sam	f2eb1209db	Wrong border size	2016-11-25 00:44:13 -05:00
Sam	4158d09106	UHC Bug fixes!	2016-11-25 00:44:13 -05:00
AlexTheCoder	6fefd71bb8	Remove all chickens on game state change and stop chickens spawning in any UHC type	2016-11-25 00:41:47 -05:00
AlexTheCoder	26262479f6	Remove Smoke Bomb and Illusion from Clans	2016-11-25 00:41:47 -05:00
cnr	3f72ded65e	Revert "Retry CTF proxy fix" ... This reverts commit 67a663891e.	2016-11-24 06:49:26 -06:00
cnr	5e218d019c	Set view distance before loading UHC worlds	2016-11-24 04:50:54 -06:00
Shaun Bennett	f6bf316afb	Update rank colors	2016-11-24 04:58:03 -05:00
Shaun Bennett	4ffe9ef220	Disable UHC in player servers (temporary)	2016-11-24 04:57:21 -05:00
Shaun Bennett	8ffe76c2d0	Fix Bonus Rewards for Omega/Illumination	2016-11-24 02:41:58 -05:00
Shaun Bennett	192273314f	Merge remote-tracking branch 'origin/develop' into develop ... * origin/develop: (37 commits) Implement new sales announcement system in Lobbies and ClansHubs, and remove old Unranked Player Manager Fix SkyWarrior Kit Undo my report changes Set up support server with Thankful Chest tracking and Eternal Rank Add Cake Mount and implement it in Thankful Chest Use getName() instead of a String Enable MountChicken with some small modifications and add it to Thankful Chest Implement Thankful chest, patch Trick or Treat chest showing as purchasable, make SubscriptionDuration enum public and static, and create a Power Play Reward Remove MCL and OITQP from the stats page Take a second crack at fixing invisibility across Arcade and Clans Properly block placement of redstone-based blocks in Clans Fix Clans servers not restarting every night, display an uptime notification whenever Clans servers shut down for any reason, and remove unnecessary onDisables from the main ClansManager onDisable Patch Frozen players in clans spawning CombatLog NPCs when leaving, patch ClansCommandExecutedEvent not always being called, clean up ClanBanner code, and make Freeze System and Nether Manager effectively block Clans Commands (particularly teleportation) Fix game scoreboards breaking when given more than 15 lines and removed OITQ Payload from the server selection compass GUI Patch Items with type FEATHER, BONE, or RAW_CHICKEN being automatically instantly removed, patch Carl the Creeper not viewing playwire as an available reward to inform players about, and patch Carl the Creeper not informing players of available rewards on Clans Hubs and Lobbies not included in the main server group Fix HolidayManager being outdated Update Enderchest endpoint location Setup enderchest API QA changes More bugs ...	2016-11-24 00:51:46 -05:00
AlexTheCoder	be4627812b	Implement new sales announcement system in Lobbies and ClansHubs, and remove old Unranked Player Manager	2016-11-24 00:51:28 -05:00
Shaun Bennett	8d9f697bdd	Fix SkyWarrior Kit	2016-11-24 00:50:03 -05:00
Shaun Bennett	8882bfee5c	Merge remote-tracking branch 'remotes/origin/develop' into update/uhc-moppletop ... * remotes/origin/develop: Set up support server with Thankful Chest tracking and Eternal Rank Add Cake Mount and implement it in Thankful Chest Use getName() instead of a String Enable MountChicken with some small modifications and add it to Thankful Chest Implement Thankful chest, patch Trick or Treat chest showing as purchasable, make SubscriptionDuration enum public and static, and create a Power Play Reward Remove MCL and OITQP from the stats page Take a second crack at fixing invisibility across Arcade and Clans Properly block placement of redstone-based blocks in Clans Fix Clans servers not restarting every night, display an uptime notification whenever Clans servers shut down for any reason, and remove unnecessary onDisables from the main ClansManager onDisable Patch Frozen players in clans spawning CombatLog NPCs when leaving, patch ClansCommandExecutedEvent not always being called, clean up ClanBanner code, and make Freeze System and Nether Manager effectively block Clans Commands (particularly teleportation) Fix game scoreboards breaking when given more than 15 lines and removed OITQ Payload from the server selection compass GUI Patch Items with type FEATHER, BONE, or RAW_CHICKEN being automatically instantly removed, patch Carl the Creeper not viewing playwire as an available reward to inform players about, and patch Carl the Creeper not informing players of available rewards on Clans Hubs and Lobbies not included in the main server group # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java	2016-11-24 00:48:15 -05:00
Shaun Bennett	86591cf4a3	Merge remote-tracking branch 'origin/update/uhc-moppletop' into update/uhc-moppletop ... * origin/update/uhc-moppletop: Fix HolidayManager being outdated	2016-11-24 00:15:03 -05:00
Shaun Bennett	b291090ace	Undo my report changes	2016-11-24 00:14:56 -05:00
AlexTheCoder	e85ee39ac5	Set up support server with Thankful Chest tracking and Eternal Rank	2016-11-23 23:43:42 -05:00
AlexTheCoder	a669ac4105	Add Cake Mount and implement it in Thankful Chest	2016-11-23 23:43:42 -05:00
AlexTheCoder	31fd148487	Use getName() instead of a String	2016-11-23 23:43:42 -05:00
AlexTheCoder	c028edb064	Enable MountChicken with some small modifications and add it to Thankful Chest	2016-11-23 23:43:42 -05:00
AlexTheCoder	cfa5512141	Implement Thankful chest, patch Trick or Treat chest showing as purchasable, make SubscriptionDuration enum public and static, and create a Power Play Reward	2016-11-23 23:43:42 -05:00
AlexTheCoder	ca68b59ba2	Remove MCL and OITQP from the stats page	2016-11-23 23:41:10 -05:00
AlexTheCoder	0a458c150f	Take a second crack at fixing invisibility across Arcade and Clans	2016-11-23 23:41:10 -05:00
AlexTheCoder	e4a968759a	Properly block placement of redstone-based blocks in Clans	2016-11-23 23:41:10 -05:00
AlexTheCoder	32c9900069	Fix Clans servers not restarting every night, display an uptime notification whenever Clans servers shut down for any reason, and remove unnecessary onDisables from the main ClansManager onDisable	2016-11-23 23:41:10 -05:00
AlexTheCoder	18992efa5a	Patch Frozen players in clans spawning CombatLog NPCs when leaving, patch ClansCommandExecutedEvent not always being called, clean up ClanBanner code, and make Freeze System and Nether Manager effectively block Clans Commands (particularly teleportation)	2016-11-23 23:41:10 -05:00
AlexTheCoder	c2de8c35e2	Fix game scoreboards breaking when given more than 15 lines and removed OITQ Payload from the server selection compass GUI	2016-11-23 23:41:10 -05:00
AlexTheCoder	1bbabe46f7	Patch Items with type FEATHER, BONE, or RAW_CHICKEN being automatically instantly removed, patch Carl the Creeper not viewing playwire as an available reward to inform players about, and patch Carl the Creeper not informing players of available rewards on Clans Hubs and Lobbies not included in the main server group	2016-11-23 23:41:10 -05:00
AlexTheCoder	44efedbc81	Fix HolidayManager being outdated	2016-11-23 19:11:44 -05:00
Shaun Bennett	15f3b19f8a	Merge remote-tracking branch 'origin/update/uhc-moppletop' into update/uhc-moppletop ... * origin/update/uhc-moppletop: Retry CTF proxy fix Eternal Giveaway Fixes Eternal giveaway refactoring Revert: Disable Fated giveaway tools for now Eternal Rank # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java	2016-11-23 18:11:26 -05:00
Shaun Bennett	bfa27f2bc4	Update Enderchest endpoint location	2016-11-23 18:10:59 -05:00
xXVevzZXx	b42f3eb5fd	Fix final bugs and improve island system	2016-11-23 19:56:46 +01:00
Shaun Bennett	e892476ca0	Setup enderchest API	2016-11-22 08:17:24 -05:00
Sam	325c0ab56c	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop	2016-11-21 19:13:34 +00:00
Sam	92ed095e92	QA changes	2016-11-18 21:32:02 +00:00
Shaun Bennett	dd7e559a37	Merge remote-tracking branch 'origin/develop' into develop ... * origin/develop: Retry CTF proxy fix Eternal Giveaway Fixes Eternal giveaway refactoring Revert: Disable Fated giveaway tools for now Eternal Rank	2016-11-17 22:50:23 -05:00
samczsun	67a663891e	Retry CTF proxy fix ... But this time, let's allow deregistration even if it hasn't been registered by us, because it auto-registered itself	2016-11-17 22:49:15 -05:00
Shaun Bennett	3d5e61e0f1	Eternal Giveaway Fixes	2016-11-17 21:05:10 -05:00
Shaun Bennett	562d7de1a9	Eternal giveaway refactoring	2016-11-17 21:05:10 -05:00
Shaun Bennett	cdfd030999	Revert: Disable Fated giveaway tools for now	2016-11-17 21:05:10 -05:00
Shaun Bennett	712019b45b	Eternal Rank	2016-11-17 21:05:10 -05:00
Shaun Bennett	c080d41dc2	Temp DB fixes	2016-11-17 19:08:32 -05:00
xXVevzZXx	85d6452432	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/skyfall	2016-11-17 23:17:24 +01:00
Sam	0ca79f193f	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop	2016-11-17 21:20:28 +00:00
Sam	53b67214fb	More bugs	2016-11-17 21:20:00 +00:00
Shaun Bennett	f6a694b4fc	Fix Metal Man distribution	2016-11-17 16:18:51 -05:00
Shaun Bennett	10911c9a9c	Revert CTF Proxy Fix	2016-11-17 16:17:39 -05:00
Sam	142cf4dd93	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop	2016-11-17 19:41:47 +00:00
Sam	78a123156a	Memory leaks!	2016-11-17 19:38:07 +00:00
xXVevzZXx	26d8fe5e6e	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/skyfall	2016-11-17 19:19:28 +01:00
Shaun Bennett	e845f7fca9	Disable Fated giveaway tools for now	2016-11-17 02:13:48 -05:00
LCastr0	b862a30c76	Thanksgiving Cosmetics (#278) ... * Added chickens to Holiday Manager (Thanksgiving) Added TextEffect Moved all the effects to a different package to make it easier to find Added method in Effect to get the Effect Location * Removed(?) wildcard import * Testing New year thing Added some symbols to UtilBlockText * Allow multiple pets with the same EntityType * Added Stray Morph Added Shulker Pet Added code for a possible new year effect Added Metal Man Morph to the menus Added Metal Man Morph as an yearly bonus for PPC subscriptions * Added chickens to Holiday Manager (Thanksgiving) Added TextEffect Moved all the effects to a different package to make it easier to find Added method in Effect to get the Effect Location * Removed(?) wildcard import * Testing New year thing Added some symbols to UtilBlockText * Allow multiple pets with the same EntityType * Added Stray Morph Added Shulker Pet Added code for a possible new year effect Added Metal Man Morph to the menus Added Metal Man Morph as an yearly bonus for PPC subscriptions * I seriously don't remember what is in this commit, I'm just doing it to fix the thing with develop... * Fixed Pet menu Fixed morph menu Changed from List to Set * Changed from PurchasUnknownSalesPackage to AddUnknownSalesPackageOwned * Added Santa Morph Removed Sleigh Morph Changed all the cosmetics GUIs to start on the second row, instead of the first * Changed some stuff from Holiday Manager so now chickens will walk around when spawned * Added sound effects to Metal Man Added slowness to Metal Man * Added new lore for the Metal Man Morph description Added Stray Morph Ability Fixed some problems with the Thanksgiving Chickens * Added Fated giveaway manager and animation Moved titan and fated giveaway managers to a new package * Fixed lores for Stray morph and Shulker pet Changed ability of Stray morph * Removed Stray and Shulker pet from the menu Deleted Pet class since it was not being used Changed position of achievement on the menu Changed color of chicken's name Changed colors of Power Play message Stray morph, Santa morph and Shulker pet are hidden from the menus for now Removed feathers dropping from chickens, changed them to snow particles * Added hover ability to Metal Man Morph * Fixed some stuff on Metal Man	2016-11-17 02:06:00 -05:00
cnr	db1598f896	Revert 1.11 disguise changes ... Entity type tracking for disguises is now done in our spigot build.	2016-11-16 23:36:47 -06:00
Shaun Bennett	cbc9aeedc6	Report Feature Improvements (#269) ... Report Feature Improvements	2016-11-16 22:52:14 -05:00
Shaun Bennett	c250796bdf	Fix pom.xml formatting	2016-11-16 22:37:25 -05:00
AlexTheCoder	7d14b6073d	Give SlackAPI a valid payload link, fix some display issues with clans nether, fix claiming in clans nether, update coordinates to match new map	2016-11-16 22:37:25 -05:00
AlexTheCoder	5e1fcabe36	Final changes for S2	2016-11-16 22:37:25 -05:00
AlexTheCoder	a8e3a530c1	Prevent safely logging out in shop zones while tagged	2016-11-16 22:37:25 -05:00
AlexTheCoder	4a186a8dec	Disable crafting of hoppers	2016-11-16 22:37:25 -05:00
AlexTheCoder	4fc2b875d4	Add a clans map generator to codebase	2016-11-16 22:37:25 -05:00
AlexTheCoder	a219a2d072	Fix TNT breaking bedrock, increase build height and add a minimum chest place height	2016-11-16 22:37:25 -05:00
AlexTheCoder	1535fcc38b	Fix temp blocks in unloaded claims not restoring, fix ClassCombatCreatureSpawnEvent having a null world name, fix block toss fallingblocks solidifying in unloaded chunks, make safelog in clans disable when server shuts down, and make UtilBlock recognize 1.8 fence gates as usable blocks	2016-11-16 22:37:25 -05:00
AlexTheCoder	63ef68976c	Patch illusion in nether, stop cobble generation, lower rune drop rate, make tnt time based and better function in water, make scorching not damage teammates or those in safezones, make runed pickaxe more effective	2016-11-16 22:37:25 -05:00
Sam	22b7ce60eb	For sam	2016-11-17 02:56:58 +00:00
Alexander Meech	c21e71606d	Fix message line spacing for Prince Artix	2016-11-16 21:42:47 -05:00
AlexTheCoder	b374d728f5	Change playwire button, modify player messages, and fix availability bugs	2016-11-16 21:42:47 -05:00
AlexTheCoder	0070fed6c7	Fix playwire multithreading and convert to new 5-ticket per 24-hour system	2016-11-16 21:42:47 -05:00
AlexTheCoder	824ef685c0	Add missing return	2016-11-16 21:42:47 -05:00
AlexTheCoder	d5f89bb370	Add more blocked commands and move the blocked command handler below the Mineplex command executor	2016-11-16 21:42:47 -05:00
AlexTheCoder	4cb257e84a	Tweak blocked commands system	2016-11-16 21:42:47 -05:00
Sam Sun	4709161180	Attempt to fix CTF Proxies (#280)	2016-11-16 21:40:42 -05:00
md-5	735550c157	Use Mineplex Pair Util Class in Halloween 2016 (#274) ... JavaFX is not included in OpenJDK.	2016-11-16 20:29:33 -05:00
Shaun Bennett	0039b79281	Change Youtube Button Link (#275) ... * Fix possible NPE in Preferences * Change youtube button link	2016-11-16 20:23:14 -05:00
Sam	8d6eb13504	Add "%player% is your teammate" in 2 player team games (#273) ... * Add "%player% is your teammate" in 2 player team games * Add to Team Skyfall	2016-11-16 20:10:16 -05:00
Sam	684432d7dc	Add Rules Command (#272) ... * Added a /rules command * Remove unused space * More Spaces!	2016-11-16 19:59:24 -05:00
Sam	51c7801a9f	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop	2016-11-15 20:01:21 +00:00
cnr	70ca2c7964	Add 1.11 support	2016-11-15 13:58:31 -06:00
xXVevzZXx	a74bc71018	fix bugs and make some improvements	2016-11-15 17:04:38 +01:00
Sam	faba1f2369	Forgot the actual UHC class...	2016-11-13 12:35:48 +00:00
Sam	efc73d220f	Change how UHC handles time	2016-11-13 12:35:38 +00:00
Sam	07cd716cf7	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop	2016-11-13 10:37:21 +00:00
Sam	aa4ef9f4ad	Big bugs	2016-11-12 21:50:38 +00:00
Keir Nellyer	6e5db69b0c	Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report	2016-11-10 13:52:44 +00:00
Sarah	e71187aa33	Add new Brawl Games (#260) ... * add more Brawl games * fix some bugs in new brawl games * fix even more bugs * Fix some super paintstrike bugs * Add some Javadoc	2016-11-09 20:38:49 -05:00
Keir Nellyer	af7557c9b1	When multiple accounts with the same name occur, pick the one that ... logged in most recently	2016-11-09 01:25:33 +00:00
Nate Mortensen	3b83a9bdc3	Reformat Block Hunt	2016-11-08 10:44:39 -05:00
Nate Mortensen	6db79c3ca5	Remove disguises when players switch to Seeker	2016-11-08 10:44:39 -05:00
Nate Mortensen	0607355ee0	Prevent cloaked players from having their visibility reset	2016-11-08 10:44:39 -05:00
Nate Mortensen	e3b701f948	Don't give infestors an initial disguise	2016-11-08 10:44:39 -05:00
Keir Nellyer	6273996ebe	Only set incognito and teleport player when report is hacking or ... gameplay offense	2016-11-07 15:38:55 +00:00
Sam	6a9648e646	Solo Mode and Faster UHC	2016-11-05 11:06:12 +00:00
xXVevzZXx	af7de62ff7	Fix non upgradeable perks being not unregistered	2016-11-04 06:02:13 -05:00
Keir Nellyer	407ec0d924	Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report	2016-11-03 20:11:21 +00:00
xXVevzZXx	d93cdfee8f	Add Team stats display for Skyfall	2016-11-02 21:42:53 -05:00
Nate Mortensen	f587445ffc	Remove extraneous horses when the game ends ... When players using the horseman kit win a game, they never die, which is the only time that spawned horses are removed. To fix this, at the end of the game all horses belonging to players that have survived are explicitly removed, which removes all remaining horses.	2016-11-02 17:01:17 -04:00
LCastr0	9267a36528	Disable Halloween 2016 (#261) ... * Removed all the halloween related items: - Haunted chests can only be opened if player already had ammo - Removed Halloween theme from the hub - Removed pumpkins from in-game * Added Halloween items to the Omega Chest * Fixed weight for items in the omega chest * Changed Disk to Disc in RewardManager Changed values for omega rarities * Final commit (removed win room test command) * Removed Halloween words from Draw My Thing and Master Builders	2016-11-02 16:49:31 -04:00
Sarah	afac2aea3f	Skyfall Update (#262) ... * Fix some bugs, improve Skyfall and add Skyfall Teams * re-enable debug * Fix Perks not being unregistered from the EventHandler * Remove unused import * Remove unused imports	2016-11-02 16:48:44 -04:00
Sam	b122fba97e	Fix arrows not getting removed!	2016-11-02 16:48:01 -04:00
Alexander Meech	1f69c204f6	Fix Trick or Treat Chest Logging in Cust Server	2016-11-02 16:47:38 -04:00
Alexander Meech	e73947b9b1	Hotfix pumpling pet being added to Haunted Chest	2016-11-02 16:47:38 -04:00
Keir Nellyer	aaa248833e	Don't allow players to have more than 5 open snapshots at a time	2016-11-01 17:21:56 +00:00
Keir Nellyer	828f39536b	Don't allow players to have more than 5 open reports at a time	2016-10-31 15:49:15 +00:00
Keir Nellyer	b5ef642f39	Improve getReportHandling code	2016-10-30 22:13:52 +00:00
Keir Nellyer	4971adcfb3	This should be an inner join	2016-10-30 01:53:52 +00:00
Keir Nellyer	e72573d6fd	Fix getReports method not checking report cache first	2016-10-30 01:41:28 +00:00
Keir Nellyer	8f07d377f1	Clear report cache after closing message has been sent, prevents ... report cache being cleared and instantly reloaded	2016-10-30 01:25:06 +00:00
Keir Nellyer	1405aef0c3	Update code to use column creatorId instead of creator	2016-10-30 01:16:40 +00:00
Keir Nellyer	08f113bb99	Various improvements and fixes to report related database queries	2016-10-30 01:58:56 +01:00
Keir Nellyer	ce4672f026	Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report	2016-10-29 15:54:13 +01:00
Keir Nellyer	7aa3daca9d	PC-1140 Fix various issues with region-locked reports	2016-10-29 15:54:01 +01:00
Keir Nellyer	696a99b872	Refactor some parameter names to make method function more obvious	2016-10-29 15:26:02 +01:00
Keir Nellyer	3dc441d61d	PC-1016 Delete snapshots > 30 days and not linked to report in ... cleanup task	2016-10-29 14:38:16 +01:00
Keir Nellyer	09e5d13b96	PC-1016 Rename column creator to creatorId	2016-10-29 14:27:19 +01:00
Keir Nellyer	eb37c5da2e	PC-1016 Create column created to store date time for snapshots	2016-10-29 14:26:16 +01:00
samczsun	07c93606f8	GameChatManager: Check if the game exists	2016-10-28 17:57:25 -04:00
samczsun	873e93747e	HolidayManager: Fix CME	2016-10-28 17:57:25 -04:00
samczsun	49c5df6e68	Parties: Check if target is null before inviting	2016-10-28 17:57:25 -04:00
samczsun	1d961c7d81	GamePlayerManager: Don't load kits if offline	2016-10-28 17:57:25 -04:00
samczsun	a7986a0719	Party: Fix NPE ... Filter out members who are no longer online when sending messages	2016-10-28 17:57:25 -04:00
samczsun	d2a2fdfd46	UHC: Fix NPE ... Players who joined after the gamestate has been set to PREPARE should not be considered as in the game	2016-10-28 17:57:25 -04:00
samczsun	a729b03ce7	UtilParser: Handle null lastDamageCauses	2016-10-28 17:57:25 -04:00
samczsun	0c1f6cbedc	Rewrite CombatLogModule	2016-10-28 17:57:25 -04:00
samczsun	70ed2e4fbb	CompassModule ... Integrate with CombatLogModule	2016-10-28 17:56:46 -04:00
samczsun	e8becf3819	Op on dev servers too	2016-10-28 17:56:08 -04:00
samczsun	e7b744f527	UHC rewrite	2016-10-28 17:56:08 -04:00
Keir Nellyer	f0f01b74e8	PC-1016 Schedule cleanup task for everyday at 00:00 CDT	2016-10-28 18:13:20 +01:00
samczsun	7a0fba3027	Make Trick Or Treat chests open 4	2016-10-28 00:10:17 -05:00
Keir Nellyer	4b3cadbb5a	Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/BuyChestButton.java	2016-10-27 23:53:32 +01:00
Keir Nellyer	8283af25af	Remove resolved todo for metrics command	2016-10-27 23:49:40 +01:00
Keir Nellyer	e7ff175eff	Remove report site token todo message (is now resolved)	2016-10-27 23:48:54 +01:00
Keir Nellyer	30f56e3b12	PC-1016 Add cleanup task sql script	2016-10-27 23:40:09 +01:00
Keir Nellyer	100dc53ead	PC-1150 Close div's correctly	2016-10-27 16:09:11 +01:00
Keir Nellyer	3bcfa6adc5	PC-1150 Only show information section of site when report is being ... displayed	2016-10-27 15:34:07 +01:00
Shaun Bennett	577e640f4a	Add KillAura Type E and F checks - no Action enabled yet	2016-10-26 23:00:47 -04:00
Shaun Bennett	0c0ad5ab13	PPC Items (#252) ... Update/ppc items	2016-10-26 22:30:58 -04:00
LCastr0	a340f15d63	Fixed changes requested by Shaun	2016-10-27 00:27:50 -02:00
Shaun Bennett	f06325d972	Super Smash Mobs Update (#243) ... Update/ssm	2016-10-26 22:03:43 -04:00
Alexander Meech	d13387df52	Make trick or treat chest dynamically controlled (#256) ... * Implement trick or treat chest in customer support server * Add several new reward types, implement trick or treat chest and all its animations, and fix playwire nested threads	2016-10-26 22:02:46 -04:00
Keir Nellyer	3bd575b718	PC-1153 Improve /reportmetrics usage	2016-10-26 13:29:11 +01:00
Keir Nellyer	79b5439aa4	Small refactoring	2016-10-26 10:50:49 +01:00
Keir Nellyer	a97ad8dd76	PC-1153 Don't allow days argument to exceed 30 days	2016-10-26 10:42:10 +01:00
Keir Nellyer	f5a81f083e	Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report	2016-10-26 10:28:13 +01:00
Keir Nellyer	52d001c26e	PC-1153 Add /reportmetrics command	2016-10-26 10:28:01 +01:00
Alexander Meech	39f0cd79bb	Cap purchase date for sampson	2016-10-25 13:34:22 -04:00
Alexander Meech	3e8eecdf91	Update reward weightings for sigils	2016-10-25 13:34:22 -04:00
Alexander Meech	6d982f3df9	Fix spin ticket reward threading	2016-10-25 13:34:22 -04:00
Alexander Meech	273f95f8ff	Fix playwire threading	2016-10-25 13:34:22 -04:00
AlexTheCoder	a36ebf4528	Add several new reward types, implement trick or treat chest and all its animations, and fix playwire nested threads	2016-10-25 13:34:22 -04:00
AlexTheCoder	ab228fb492	Implement trick or treat chest in customer support server	2016-10-25 13:34:22 -04:00
cnr	44e016f272	Fix infinite loop in GameWorldManager	2016-10-25 01:44:07 -05:00
Keir Nellyer	e4c7e31185	Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report	2016-10-24 15:00:10 +01:00
Alexander Meech	d6dc750ece	Prevent MPS servers with Lobbyblablabla-1 as... ... ...the name from being loaded as an applicable lobby server	2016-10-24 01:21:56 -04:00
xGamingDudex	eaee382e7f	Small typo	2016-10-23 16:22:27 +02:00
xGamingDudex	c0ec1e1ff7	Prevent infinite speed effect on creeper	2016-10-23 03:11:51 +02:00
xGamingDudex	7b7b7aadf8	Fix a notorious XP bug in the wolf kit	2016-10-23 01:28:57 +02:00
xGamingDudex	1a847862d5	Prevent sometimes duplicate usage of the snowman smash	2016-10-23 01:28:04 +02:00
xGamingDudex	4531902adc	Prevent guardian abilities from affecting team mates	2016-10-23 01:27:34 +02:00
xGamingDudex	0306d0d9d1	Fix chicken rocket to deal damage and knockback	2016-10-23 01:27:09 +02:00
Keir Nellyer	ff8f77f8d1	Rename these variables to make better sense	2016-10-22 23:08:59 +01:00
Keir Nellyer	ecd9dfef1a	PC-1139 Update chatsnap site to support displaying of snapshots with ... no associated report	2016-10-22 20:49:14 +01:00
xGamingDudex	2d0d78e1b7	Prevent snowman smash from affecting self, and give 3 snowmen	2016-10-22 21:28:11 +02:00
Keir Nellyer	c6ca976653	PC-1139 Add /chatsnap command	2016-10-22 20:23:31 +01:00
Keir Nellyer	81bf9bc406	Small method rename	2016-10-22 19:21:38 +01:00
Keir Nellyer	35048b46a7	Report/snapshot code clean-up	2016-10-22 19:17:20 +01:00
Keir Nellyer	e0d05d3c87	PC-1140 Keep reports region-separated	2016-10-22 15:06:18 +01:00
xGamingDudex	295f1f255f	Fixed rare NPEs	2016-10-22 13:09:56 +02:00
xGamingDudex	720e965d08	Fixed chicken rocket.	2016-10-22 10:49:21 +02:00
xGamingDudex	4e433665cc	Fixed golem smash affecting team mates	2016-10-22 10:49:02 +02:00
xGamingDudex	8414a17978	Don't apply velocity to team mates	2016-10-22 10:48:36 +02:00
xGamingDudex	d2be1fc646	Don't set team mates on fire on direct fireball hit	2016-10-22 10:48:09 +02:00
xGamingDudex	1ae89adfb0	Remove debug messages	2016-10-22 09:40:06 +02:00
LCastr0	6de2df5cc4	Fixed lores ... Fixed icons Removed sleigh, chicken mount and wind up suit from menus Added javadocs to sleigh	2016-10-22 02:27:44 -02:00
LCastr0	83ba1cb26e	- Removed debug message ... - Added check for player teleport when opening a chest - Added Turkey Morph and Chicken Mount to PowerPlayClubRewards	2016-10-21 18:48:47 -02:00
LCastr0	0d6ff42a8d	- Fixed players not being kicked from treasure chest locations when they are being opened ... - Increased the time needed for the Wind Up suit to be charged - Added effect for the Wind Up suit to blink between yellow and red when the effect is active	2016-10-21 18:06:13 -02:00
Keir Nellyer	5f755add78	Rename /reportstats command to /reporthistory	2016-10-21 17:24:27 +01:00
LCastr0	56db128730	Merge pull request #251 from Mineplex-LLC/develop ... Merge 'develop' into 'update/ppc-items'	2016-10-21 13:05:00 -02:00
xGamingDudex	cfd2343f0e	Fixed zombie perk Deaths Grasp	2016-10-21 16:51:47 +02:00
xGamingDudex	b8c474a92d	Fixed daze potion	2016-10-21 16:51:29 +02:00
xGamingDudex	bcfdfd4619	Added better team mate detection for team super smash	2016-10-21 16:51:16 +02:00
Keir Nellyer	b0ac3cac8c	Show link to view chat log in /reportinfo	2016-10-21 09:32:11 -04:00
Keir Nellyer	63514029f2	Generate missing tokens for snapshots on report load	2016-10-21 09:32:11 -04:00
xGamingDudex	ff1d29bd2e	Apply wool bomb damage to self in team games	2016-10-21 01:37:14 +02:00
xGamingDudex	70d554fa2d	Fixed witch daze potion	2016-10-21 01:12:02 +02:00
xGamingDudex	ca0f36d142	Prevent armorstand used by laze to block projectiles	2016-10-21 00:55:44 +02:00
xGamingDudex	45c5ba66bd	Prevent multiple perks from affect team mates and cleaned up some code	2016-10-21 00:55:18 +02:00
xGamingDudex	c8edc2d01e	Rewrote daze potion damage calculations	2016-10-21 00:54:04 +02:00
xGamingDudex	6a6a589cb7	Fixed wolf cub sometimes not being removed	2016-10-21 00:25:37 +02:00
xGamingDudex	db3106d8a4	Prevent golem fissure from effecting team mates	2016-10-20 23:20:26 +02:00
xGamingDudex	d26103d321	Increase Whirlpool damage	2016-10-20 23:20:02 +02:00
xGamingDudex	d42a5f1897	Prevent Chicken Rocket from resetting cooldown when hitting team mates	2016-10-20 23:13:32 +02:00
xGamingDudex	08b7b7cb48	Removed unused files. Move wool bomb patch to correct file	2016-10-20 23:11:55 +02:00
xGamingDudex	7ad0b214a5	Change team display text	2016-10-20 23:08:40 +02:00
xGamingDudex	be2bc09896	Added comma to laser text	2016-10-20 22:56:12 +02:00
xGamingDudex	875bdc1fca	Removed unused code	2016-10-20 22:50:12 +02:00
xGamingDudex	d119a94d53	Fixed concurrency issue	2016-10-20 22:44:43 +02:00
xGamingDudex	4e4fd2a8e9	Changed respawn title text	2016-10-20 22:44:13 +02:00
xGamingDudex	0705e38b3e	Fixed NPE	2016-10-20 22:43:51 +02:00
Shaun Bennett	f8010f4ad0	Merge pull request #245 from Mineplex-LLC/update/report-improvements ... Report Feature Improvements	2016-10-19 22:53:53 -04:00
samczsun	bafad1189b	ProgressingKitManager: Temporarily add finally	2016-10-19 22:38:39 -04:00
samczsun	38ef65c32e	Fix memory leak in ItemSnowball	2016-10-19 22:38:39 -04:00
samczsun	2ed03147b0	Make WinEffectGadget clean up even if exceptions occur	2016-10-19 22:38:39 -04:00
samczsun	5168044be5	Fix memory leak in WinEffectHalloween	2016-10-19 22:38:39 -04:00
samczsun	d2c0b34459	PlayerMap	2016-10-19 22:38:39 -04:00
samczsun	09fe7b736a	Don't enable debugging	2016-10-19 22:38:39 -04:00
samczsun	bcb56c50f5	Fix memory leak in AntiHackGuardian	2016-10-19 22:38:39 -04:00
samczsun	25d6a4239e	Fix memory leak in StatsManager, CombatManager	2016-10-19 22:38:39 -04:00
samczsun	2b6d7a4d7a	Fix memory leak in ParticleFairy	2016-10-19 22:38:39 -04:00
samczsun	a59dde44c6	Remove recharge data on quit instead of later	2016-10-19 22:38:39 -04:00
samczsun	19eeae7f7f	Fix memory leak in ParticleFoot	2016-10-19 22:38:39 -04:00
samczsun	6f80e21372	Fix memory leak in carl, server	2016-10-19 22:38:39 -04:00
samczsun	bd9aa38afa	Make DisguiseManager clean up after lazy callers	2016-10-19 22:38:39 -04:00
samczsun	a338fb27d3	Various memory leak fixes	2016-10-19 22:38:39 -04:00
samczsun	b3ed9db2c7	Fix memory leak in ProgressingKitManager	2016-10-19 22:38:39 -04:00
samczsun	c00502d91f	Fix memory leak in WinEffectPodium	2016-10-19 22:38:39 -04:00
samczsun	894e6b4a89	Fix memory leak in CombatLogNPC	2016-10-19 22:38:39 -04:00
samczsun	0cbd4a9de2	Fix memory leak in Teleport	2016-10-19 22:38:39 -04:00
samczsun	dbd5203e9d	Fix memory leak in ParticleFreedom	2016-10-19 22:38:39 -04:00
AlexTheCoder	6719f11358	Fix playwire command not requiring console to use it	2016-10-19 22:36:03 -04:00
AlexTheCoder	13220e267c	Re-enable animation	2016-10-19 22:36:03 -04:00
AlexTheCoder	16b195d2ab	Make playwire-given carl spin tickets update while the player is logged in	2016-10-19 22:36:03 -04:00
AlexTheCoder	2e280d62de	Block rain on the support server	2016-10-19 22:35:17 -04:00
AlexTheCoder	6d9d42cfdd	Allow pets to be given from the support server	2016-10-19 22:35:17 -04:00
Alexander Meech	60fad6316b	Ensure command used is actually /pumpkin	2016-10-19 20:59:12 -04:00
AlexTheCoder	26baf6aa67	Make Halloween pumpkins actually drop gems and shards in Block Hunt and Minestrike	2016-10-19 20:59:12 -04:00
AlexTheCoder	55b37e0261	Fix players being able to log in multiple times via different bungees	2016-10-19 20:58:05 -04:00
xGamingDudex	db9f358718	Increase Angry Heard durration	2016-10-20 02:01:40 +02:00
xGamingDudex	59712b4089	Prevent multiple abilities from dealing damage and knockback on teammate	2016-10-20 02:01:23 +02:00
xGamingDudex	21d004b3f2	Make the skelleton kit deal static 6 damage for arrows	2016-10-20 02:00:30 +02:00
xGamingDudex	6851a20e92	Fix /lives debug command	2016-10-20 02:00:01 +02:00
xGamingDudex	0d688534b1	Reduce slime smash durration	2016-10-20 01:28:25 +02:00
xGamingDudex	33a7deed58	Tweaked witch daze potion damage	2016-10-20 01:27:43 +02:00
xGamingDudex	74d6c599b5	Fixed snowman turret targeting team mates	2016-10-20 01:27:22 +02:00
xGamingDudex	82f1ec1ac6	Tweaked spider smash	2016-10-20 01:01:46 +02:00
xGamingDudex	2306dbc909	Fixed creeper XP	2016-10-20 01:01:31 +02:00
LCastr0	225f5c6b7c	Internal: ... - Removed Win room test command - Fixed spelling error in MountSpider - Changed MountChicken so it can now jump - Still working on the Sleigh morph - Added Wind Up Suit for testing - Removed unused code from MountSpider External: - Added Sleigh Morph (Still need some work on it)	2016-10-19 18:44:57 -02:00
xGamingDudex	8de69d2573	Fixed guardian passive to acctually work	2016-10-19 17:49:59 +02:00
xGamingDudex	0b02bc9e2d	Fixed with daze potion self damage and only randomly working	2016-10-19 16:35:49 +02:00
xGamingDudex	9e3cf58ff5	Type in blaze smash	2016-10-18 19:39:06 +02:00
Keir Nellyer	db0bfece23	Prevent re-saves from un-aborting user reports	2016-10-16 23:23:55 +01:00
Keir Nellyer	3db7e27ecd	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/report-improvements	2016-10-15 15:23:26 +01:00
xGamingDudex	35c9d2ecb1	Tweaked damage/KB values and fixed text issues	2016-10-15 14:56:38 +02:00
Keir Nellyer	1ab646bbda	Fix error message colouring when there are no reports to handle	2016-10-14 19:14:50 +01:00
Keir Nellyer	64bb01c92f	Move /reportabort functionality over to the /reportclose gui	2016-10-14 19:14:35 +01:00
Keir Nellyer	28603ec8c5	Remove resolved TODOs	2016-10-14 18:47:25 +01:00
Keir Nellyer	4b4dc74cbf	PC-1000 Token column is now 8 characters	2016-10-14 16:29:04 +01:00
Keir Nellyer	b6bda9418d	PC-1000 Make all token related things work together	2016-10-14 16:28:42 +01:00
cnr	8e7ae7f55f	Make Power Play status clearer on support server	2016-10-14 00:26:33 -05:00
cnr	8ebad90f52	Don't lock current month's cosmetic on resub day ... This fixes an issue where a player might lose the current month's cosmetic on the date of resubscription until his/her payment method was charged	2016-10-14 00:26:33 -05:00
cnr	0e5d8cc785	Replace pumpling spawn flicker with short glow	2016-10-14 00:25:55 -05:00
Keir Nellyer	3b7169ad3d	PC-1000 Implement token generating method	2016-10-14 01:14:51 +01:00
Sam	76a413548b	More unused imports	2016-10-13 23:31:32 +01:00
Sam	4810960d82	Stop visible armorstands	2016-10-13 23:19:11 +01:00
Sam	99c72a3b31	Fix debug command	2016-10-13 23:10:59 +01:00
Sam	e698037a73	Remove unused import	2016-10-13 22:44:48 +01:00
Sam	c93e6be98b	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm	2016-10-13 22:43:08 +01:00
Sam	ca0da15b8c	Fix magma cube	2016-10-13 22:43:04 +01:00
Sam	f72f6e8aaa	Tweaks	2016-10-13 20:20:00 +01:00
Sam	a5d52d9e2f	MERGE PLEASE!	2016-10-13 16:11:01 +01:00
Shaun Bennett	8974b2b395	Fix Carl Error	2016-10-13 04:07:05 -04:00
Shaun Bennett	bb32a06caf	Add Halloween Words	2016-10-12 23:30:52 -04:00
AlexTheCoder	7ec530a8c7	Fix lobby protection on build server, make map locks persistent, implement larger parsing size, make map lock command require op, prevent raining on build server, and make block hunt actually work with any map with required information regardless of order	2016-10-12 23:01:25 -04:00
Shaun Bennett	62d08e74e3	Remove voting code	2016-10-12 22:54:14 -04:00
Alexander Meech	87122e9904	Update youtube link	2016-10-12 22:54:14 -04:00
Alexander Meech	63c14a99ab	Update playwire displayed cooldown time	2016-10-12 22:54:14 -04:00
AlexTheCoder	6d36034115	Remove voting from carl the creeper, move spin tokens to playwire, unify link messages in all carl the creeper links	2016-10-12 22:54:14 -04:00
xADudex	311751cc39	Pumpkin's Revenge (#237) ... * Initial Commit * Update * Bunch of new stuff * Fixed fletcher arrow typo * Added reward pet, fixed typo, tweaked lose cinematic * Lots of tweaks and fixes with QA * Cleaning up a little code * Removed debug message on prince death * Added nighttime to halloween game lobby maps * Tweaked spawn rates and mob caps * Typo * Tweaked texts, cleaned import and cleared all mobs from boss cinematic * Fixed creepers not getting properly removed during boss cinematic * Reward typo * Fixed rare NPE * Typos * Tweaked mini zombie * Typo * Prevent zombie from spawning minis after being removed * Tweaked wave announcements + formated WaveVictory * Changed color of prince tag + formated ZombieSpawner * Fixed (another) rare NPE * Tweaked boss wave cinematic	2016-10-12 22:40:05 -04:00
AlexTheCoder	66dfe06b34	Clean up bucket fixing in clans	2016-10-12 21:50:18 -04:00
AlexTheCoder	2ac7f72327	Fix clans water exploit and ruined pickaxe duping exploit	2016-10-12 21:50:18 -04:00
Keir Nellyer	03e219f552	Add header to /reportstats and further improvements	2016-10-13 02:15:49 +01:00
Keir Nellyer	2e16eef5d9	Make /reportstats work with offline players and other small improvements	2016-10-13 01:18:23 +01:00
Keir Nellyer	76539648da	PC-1109 Fix /reportstats if player doesn't have at least 5 reports in ... each role	2016-10-12 17:36:54 +01:00
Keir Nellyer	ca09253292	PC-954 Tweak error message when no reports are available for handling ... Also close gui after clicking item and remove old un-necessary code.	2016-10-12 17:30:19 +01:00
Keir Nellyer	f42678a9ef	PC-954 Fix incorrectly sized inventory	2016-10-12 17:23:42 +01:00
Keir Nellyer	eb6d893414	PC-954 Allow staff to select what kind of report they'd like to handle	2016-10-12 17:15:48 +01:00
Keir Nellyer	15cf3a2bee	PC-1019 Give indication of when a report is forwarded to a team	2016-10-11 14:30:43 +01:00
Keir Nellyer	3dc9038bae	Fix incorrect column name in statement	2016-10-11 01:22:43 +01:00
Keir Nellyer	1f47d51935	Merge branches 'develop' and 'update/report-non-sequential' of github.com:Mineplex-LLC/Minecraft-PC into update/report-non-sequential ... # Conflicts: # Plugins/Mineplex.ReportSite/view.php	2016-10-11 00:55:26 +01:00
Keir Nellyer	f39ee7c247	Update chatsnap site to handle new token system	2016-10-11 00:45:33 +01:00
Keir Nellyer	5c5c159ee3	Add support for assigning tokens to snapshots (excluding actual ... generation part)	2016-10-11 00:22:29 +01:00
Sam	2b2bb817be	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm	2016-10-09 12:24:51 +01:00
Sam	2b124cb16c	I have really lost track on what I'm doing...	2016-10-09 12:24:49 +01:00
Shaun Bennett	0dca2e9d46	Fix BabyFirework NPE, TreasureLocation argument exception, Add TimingsFix to Hub	2016-10-08 19:42:29 -04:00
Sam	28a2a8c098	More from GI testing	2016-10-08 11:14:55 +01:00
Keir Nellyer	e4d3621512	Create SnapshotMetadata class in prepartion of snapshot tokens	2016-10-07 18:25:20 +01:00
LCastr0	8ab61b2b06	Public: ... - Added Chicken Mount - Added Turkey Morph Internal: - Changed the Morph system (Using UtilMorph)	2016-10-06 14:19:44 -03:00
LCastr0	3707de6742	Made Haunted Chests buyable	2016-10-06 12:43:19 -04:00
LCastr0	9f66bf438c	Fixes for the CustomerSupport server	2016-10-06 12:43:19 -04:00
Sam	e5e953a8ab	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm	2016-10-06 15:03:53 +01:00
Sam	bb9ca490b1	GI changes	2016-10-06 15:03:51 +01:00
Kenny	0f44483f07	Merge pull request #233 from Mineplex-LLC/project-cosmetics ... Project cosmetics	2016-10-06 04:31:56 -04:00
LCastr0	d6e9283cce	Changed world time so its not too dark	2016-10-06 05:26:58 -03:00
Shaun Bennett	a6727bf104	Halloween Fixes/Prep	2016-10-05 22:57:44 -04:00
LCastr0	c0754a23c8	Fix Slime Soccer, Add /unlockcosmetics and /lockcosmetics for other players (#232) ... * Added option to run /unlockcosmetics and /lockcosmetics for other players * Fixed Slimeball Soccer field location	2016-10-05 22:08:27 -04:00
cnr	bd90c465dd	Update PPC button to reflect new claiming style	2016-10-05 22:03:04 -04:00
cnr	20c37bf3d6	Unlock PPC cosmetics on the first of the month ... The relevant cosmetic will be revoked if the player's subscription lapses during that month	2016-10-05 22:03:04 -04:00
cnr	8793be56ed	Add 'come back on $DATE' message to carl for Power Play	2016-10-05 22:03:04 -04:00
LCastr0	a1ec102419	Fixed Slimeball Soccer field location	2016-10-05 21:54:17 -03:00
LCastr0	5939c304a5	Added option to run /unlockcosmetics and /lockcosmetics for other players	2016-10-05 20:13:30 -03:00
LCastr0	876d35b482	Cosmetics Bug Fixes (#229) ... * Fixes for the Block Morph * Fixes for the Witch Morph * Fixed memory leak on ArrowTrailHalloween, thanks to Sam, again	2016-10-05 17:16:25 -04:00
Alexander Meech	dae3c60247	Make support text for power play claims more accurate (#228) ... * Make support text for power play claims more... ...accurate * Reverse text	2016-10-05 17:13:32 -04:00
Shaun Bennett	25000f7367	Merge pull request #226 from Mineplex-LLC/bugfix/report-hotfix ... Report feature hotfixes	2016-10-05 17:13:08 -04:00
Lucas de Castro Queiroz	49510e6f9f	Fixed memory leak on ArrowTrailHalloween, thanks to Sam, again	2016-10-05 16:21:40 -03:00
LCastr0	314c88333a	Merge pull request #230 from Mineplex-LLC/develop ... Merges develop into project-cosmetics	2016-10-05 16:14:51 -03:00
Keir Nellyer	643656de0d	Merge remote-tracking branch 'origin/bugfix/report-hotfix' into bugfix/report-hotfix	2016-10-05 15:32:05 +01:00
Keir Nellyer	e6bb0c2d78	Improve handling of circumstances whereby a report exists but no ... corresponding chatsnap log on chatsnap site	2016-10-05 15:31:46 +01:00
LCastr0	8da5813f29	Add Halloween Cosmetics (#227) ... * Internal: Changed imports from java.awt.Color to org.bukkit.Color External: Added Double Jump Halloween Added Arrow Trail Halloween Added Pumpkin Hat * Internal: Fixed Arrow Trail Halloween Added new methods to ParticleData Renamed playerNPC to _playerNPC (WinEffectLavaTrap) Removed unecessary method (WinEffectManager) Added a command to test win rooms properly Fixed Squid Morph not showing name unless players hovered over it Created a Manager for the Morphs so we avoid using deprecated methods External: Added Halloween Win Room Added Grim Reaper Morph Added Headless Horseman Morph Added Nightmare Steed * Internal: Renamed RewardType enums to have upper case External: Added Halloween Death Effect Added Haunted Chest Added Baby Zombie Jockey Pet Changed the names of the items Added Grim Reaper pet * Slack integration to test stuff (Will not be in the code in the last commit) * Fixed Grim Reaper Hoe not being removed after the morph is disabled * Details for the Haunted Chest * Details for all the items (lores, icons, texts, effects, etc) Removed Headless Horseman Morph * Fixes for lores and names Support server stuff * Fixes for the Lock and Unlock cosmetics commands * Fixes for the Grim Reaper Morph * Fixes for the Grim Reaper Morph Removed debug messages * Fixed a memory leak. Thanks to Sam * Fix imports * Removed unused code Added javadocs to UtilTextBottom#displayProgress() Added javadocs to UtilAlg#getRandomLocation() * Removed Death Effect Increased Arrow Trail particles Increased Double Jump particles	2016-10-05 10:27:45 -04:00
Keir Nellyer	a4e1fb3c8d	Prepare database for snapshot tokens	2016-10-05 14:31:01 +01:00
Keir Nellyer	46db80a056	Always check game object is not null before attempting to access it (#225)	2016-10-04 15:32:04 -04:00
Sam Sun	5d8c079be6	Understand the squid disguise code (#217)	2016-10-04 15:28:12 -04:00
Keir Nellyer	22707d6d2e	Only execute if throwable is null	2016-10-04 16:34:19 +01:00
Keir Nellyer	6709001c89	Remove double handle check, pointless and can potentially cause issues	2016-10-04 16:25:51 +01:00
Keir Nellyer	afee339e16	Any report with a handler and no conclusion is an active report, ... therefore we don't need to check if the report is active	2016-10-04 16:20:11 +01:00
Keir Nellyer	c462282632	Merge branches 'bugfix/report-hotfix' and 'develop' of github.com:Mineplex-LLC/Minecraft-PC into bugfix/report-hotfix	2016-10-04 10:40:43 +01:00
LCastr0	515fd9fb70	Merge branch 'project-cosmetics' of github.com:Mineplex-LLC/Minecraft-PC into project-cosmetics	2016-10-03 22:44:24 -03:00
LCastr0	fb29947705	Fixes for the Witch Morph	2016-10-03 22:43:49 -03:00
Sam	53c6c07208	Lazer to Laser	2016-10-03 23:17:14 +01:00
Sam	e48dfbefe4	Even more fixes!	2016-10-03 21:20:15 +01:00
Sam	4e9cf4dbb4	More fixes	2016-10-03 19:45:15 +01:00
Keir Nellyer	a923f80438	Accidentally missed out inserting reportTeams' "enums"	2016-10-03 19:24:01 +01:00
Keir Nellyer	17b04a6a84	PC-1021 Prevent 'null' player being punished	2016-10-03 10:00:04 +01:00
LCastr0	0181e21853	Fixes for the Block Morph	2016-10-01 23:54:35 -03:00
Sam	668abad83a	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm	2016-10-01 15:49:10 +01:00
Sam	4bfc632fd5	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm	2016-10-01 15:45:05 +01:00
cnr	e867a09b5c	Update support server to accommodate power play changes	2016-09-30 21:52:07 -07:00
cnr	6e2512e0cf	Merge branch 'project-cosmetics' into develop	2016-09-30 21:47:08 -07:00
cnr	d00c887a84	Hide Power Play Metal Man reward for now	2016-09-30 21:00:02 -07:00
LCastr0	76fc4d6ac4	Merging	2016-10-01 00:46:36 -03:00
LCastr0	0797f90d3b	Fixes for the Witch Morph	2016-10-01 00:42:40 -03:00
cnr	25701dae7d	Enable Metal Man morph in the GUI	2016-09-30 20:25:57 -07:00
cnr	4b1b57d452	Add first-time signup Metal Man reward	2016-09-30 20:17:07 -07:00
cnr	64802769d6	Implement Power Play reward month calculations	2016-09-30 11:13:29 -07:00
Keir Nellyer	7926d88d5b	Update report result reason length as future version of Minecraft ... will be increasing message lengths	2016-09-30 17:18:47 +01:00
cnr	4fe5eb8b45	Stub out new Power Play rewards calculations	2016-09-30 00:10:42 -07:00
TadahTech	2a81f2b317	Fix UI for PlayWire changes ... Fix memory leak in Menu (cherry picked from commit 770c899)	2016-09-30 00:56:40 -04:00
Sam	36c26c0b2c	Fix MineStrike Issues (#222) ... * Check if the costume is null before doing anything. * Disable entity specing	2016-09-29 23:37:41 -04:00
Sam Sun	81070eac62	Plug up memory leaks in IdleManager (#224) ... Somehow, IdleManager was keeping Player references loaded despite having removed them on PlayerQuitEvent. This may be because of the runnable scheduled for 5 ticks after a teleport which would insert players after they quit. In any case, this was keeping entire worlds loaded in UHC. Pretty bad. Moral of the story? Use UUIDs!	2016-09-29 23:29:53 -04:00
Alexander Meech	0caa84f703	Optimize Clan Banners (#221) ... * Optimize BannerRepository.java * Optimize banner loading in BannerManager.java * Optimize banner loading in ClansManager.java * Remove unnecessary runAsync * Optimize Siege Weapon storage * Forgot a ! in my while loop	2016-09-29 23:04:19 -04:00
Timothy Andis	7d4c817856	Game Lobby/Playwire/Command Fixes (#223) ... * Tweak team locations to accommodate MPS' Disable certain commands from being used. * Change PlayWire things. * Update MPS locations. * Update. * Remove debug * Remove debug. Ty Sam	2016-09-29 23:00:26 -04:00
Keir Nellyer	2a2cd5024a	Change message displayed when an error occurs	2016-09-30 01:56:49 +01:00
Keir Nellyer	ee532c1b8e	Improve exception handling	2016-09-30 01:44:49 +01:00
Keir Nellyer	de72f119fe	Don't allow players to handle new accounts in exceptional cases	2016-09-30 01:28:07 +01:00
Keir Nellyer	4818936943	Prevent double exception logging	2016-09-30 01:16:30 +01:00
Keir Nellyer	45eeac8cee	Prevent double exception printing when an error occurs whilst saving ... a report	2016-09-30 01:05:50 +01:00
Keir Nellyer	26d6540b2f	Fix closing reason being truncated with long closing messages	2016-09-30 00:36:52 +01:00
Keir Nellyer	dd5a284d55	Print stacktrace when unable to fetch report player is handling	2016-09-30 00:29:57 +01:00
Sam	22f8a1496a	Guardian fixes	2016-09-29 22:44:03 +01:00
Shaun Bennett	9d6985ddcd	Fix MPS zip file name, null amp stand	2016-09-29 09:10:25 -04:00
Shaun Bennett	b3d8c72953	Add Game Lobby world settings (#220)	2016-09-29 00:22:42 -04:00
Shaun Bennett	7ff6e33941	LegacyGameLobbyManager bug fixes	2016-09-28 23:05:02 -04:00
Timothy Andis	620e219b14	Change MPS world zip (#219) ... * Change MPS map name	2016-09-28 21:32:51 -04:00
Shaun Bennett	b27e1ffbd1	Reward shards on thank claim instead of when being thanked	2016-09-28 21:28:07 -04:00
Shaun Bennett	3ede0e5644	Merge Report System v2 (#216) ... Report system (v2)	2016-09-28 17:39:26 -04:00
Timothy Andis	3d7647b26b	Game Lobby Update (#215) ... * Game Lobby update. Phase 1. * Correctly apply kit data to players who use the next best game feature. * I can do integer comparisons, I promise. * So much stuff, all minor. * Suck it Carl. * Fix Party bug. Update LobbyManager * Allow QA to test KitProgression @shaun cherry pick this plz. * Proper generation check (testing) Remove debugging from NextBestGame * Correct Amplifier looking direction. Fix Death tag hard coded kits Misc podium work. * ClansHub and Tweaks to the lobby manager * WA Tweak.	2016-09-28 10:17:05 -04:00
Keir Nellyer	31dcc87385	Slight code cleanup	2016-09-28 10:51:55 +01:00
Keir Nellyer	f8ad302d80	Simplify handling of optional reason	2016-09-28 10:41:56 +01:00
Keir Nellyer	6f77c05f1e	Players should still be report banned if they reach abuse threshold ... even if reportCloser is not present Also alert players of report closing regardless of whether reportCloser is present	2016-09-28 10:40:39 +01:00
Keir Nellyer	84e1a7291b	Report result gui should handle messaging of player invoking team ... assignment	2016-09-28 10:35:49 +01:00
Keir Nellyer	e54f70d194	JavaDocs for abortReport and assignTeam methods	2016-09-28 10:31:54 +01:00
Sam	c4e36b2269	Moppletop's September Bug Sprint (#214) ... * Earth Cost issue * Instances of "Tip" to "Thank" * PC-930 Fix an infinite loop when the game ends. * PC-959 Fixes an issue where people could spam drop grenades. * PC-668 Cosmetic Set bonuses no longer carry into MS games * Changes metal's passive Metal's passive is now that it gains 0.5 hearts per armor piece. This avoids the problem of being unkillable	2016-09-27 21:11:49 -04:00
Sam	78e6f3bf71	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm	2016-09-27 19:02:56 +01:00
Sam	68c62acb00	Guardian changes	2016-09-27 19:02:54 +01:00
Keir Nellyer	1543b539ba	Refactor unbox optional collection to utility class	2016-09-26 11:01:27 +01:00
Keir Nellyer	f42681c390	Remove old todo	2016-09-26 10:33:46 +01:00
Keir Nellyer	f63561b05e	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-09-26 10:19:13 +01:00
Keir Nellyer	125428d09e	Make getReport return Optional as it is quite likely that this will ... return null	2016-09-26 10:02:30 +01:00
Sam	96e1e944e1	Addition of the GWEN kit and a billion other things	2016-09-25 22:32:23 +01:00
samczsun	b35d933e56	Fix PlayWire error, handle future errors properly	2016-09-25 16:28:02 -04:00
samczsun	3f3241bec9	Reformat developer servers	2016-09-25 16:28:01 -04:00
Keir Nellyer	32385d4064	Update error message for non-titans, due to change made in previous commit	2016-09-25 02:28:42 +01:00
Keir Nellyer	a413df9f52	Limit feature to titans for damage limitation	2016-09-25 02:01:10 +01:00
Keir Nellyer	42ea7f85af	Remove un-required tab changes	2016-09-25 01:36:23 +01:00
Keir Nellyer	17b98888fc	Update database upgrade script for latest changes	2016-09-25 01:29:18 +01:00
Sam	f8a135cf50	Full system conversion	2016-09-25 00:56:06 +01:00
Sam	315a50aa16	Whoops	2016-09-24 21:34:45 +01:00
Sam	baafa62713	Just more converting	2016-09-24 21:09:25 +01:00
LCastr0	1475243d8a	Added MetalMan to the GUI for testings	2016-09-23 23:14:10 -03:00
Sam	f5a7f35d94	More kits	2016-09-23 18:58:14 +01:00
samczsun	187c6ec67c	Remove debug messages	2016-09-22 21:25:40 -04:00
samczsun	548e23a212	Fix fetching timestamp from wrong column	2016-09-22 21:21:16 -04:00
Sam	f6acedba5f	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm	2016-09-22 17:11:25 +01:00
Sam	2ba2b21577	Progress on converting SSM to a new cleaner system	2016-09-22 17:11:21 +01:00
Keir Nellyer	b24429783b	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java	2016-09-22 16:28:16 +01:00
Keir Nellyer	df17177892	PC-1003 Forgot to commit some changes from last commit	2016-09-22 16:10:31 +01:00
Keir Nellyer	ea74826d0c	PC-1003 Prevent rogue Report objects being cached and cause handler message spam	2016-09-22 16:01:11 +01:00
Keir Nellyer	6494720d2e	PC-998 Limit chat messages to 3 minutes	2016-09-22 15:48:01 +01:00
Shaun Bennett	79e6903c8b	Enable Speed and Glide punishments, remove hack from ban reason	2016-09-22 08:44:58 -04:00
Shaun Bennett	7f447f8084	Setup compass for game changes	2016-09-22 00:33:48 -04:00
Shaun Bennett	a3d210871d	Add ignored checks to GWEN (#211)	2016-09-21 23:21:02 -04:00
Shaun Bennett	e15804fc15	Prevent players from joining 1.9+ games with 1.8 clients (#212)	2016-09-21 23:19:55 -04:00
Shaun Bennett	9be26a92d1	Remove NCP	2016-09-21 22:21:49 -04:00
Sam	ac967f6b18	OITQP no longer in Beta (#210) ... * Convert OITQP into a module based system. * More magic modules * Achievements and Stats * Achievement menu update * Removed some Util methods I added that were never used. * Missed a few things * To Alex, Love Sam * Gem and achievement kits	2016-09-21 22:05:21 -04:00
Sarah	c1c46aceb8	Skyfall Game(#208) ... * basic prototype of the game Skyfall * new crumble mechanic * Developing basic game with basic mechanics and basic kits. * Fix merge issues * Add Supply Grop and Deathmatch and change map crumbling * Make cosmetical changes for QA and add Stat Trackers and Achievements * Add version requirement * Change scoreboard layout * Dont crumble the first island, but the islands over the spawn points * Remove Surefoot, fix TNT, remove boats and remove elytra on contact with water/lava * Unused imports * Fix kit description, modify island crumbling and add ring damage * Revert to normal crumble values * Add Javadoc * Remove more unused imports * Check for material data on ring generation * Add Block effect for Booster Ring recharge * Unused imports... * Add Elytra removal message and countdown * "Fix" food issues and some other minor things * Add chest refill to scoreboard from beginning * Fix supply drop * Unused imports..... * Re-enable Anti Cheat * Add java doc, remove system messages and add exeptions * The end of the great label debate * Fix method naming conventions * Remove more labels * Disable Booster kit	2016-09-21 21:57:38 -04:00
samczsun	7252906d30	Better synchronization of Managers	2016-09-21 21:37:57 -04:00
samczsun	92a0d606d4	Fix timings	2016-09-21 21:37:57 -04:00
samczsun	ec4add259d	Teleport players back to center of arcade lobby	2016-09-21 21:37:57 -04:00
Timothy Andis	bf61296948	PlayWire Ad integration (#207) ... * PlayWire integration. * Tweak PlayWire display. Update the GUI command. Temp set cooldown to 10 seconds for testing *WILL BE REMOVED* * PlayWire stuff. * PlayWire streaks and tweaks.	2016-09-21 21:24:58 -04:00
Keir Nellyer	1eecfbafee	Small code improvement	2016-09-21 16:33:05 +01:00
Keir Nellyer	c6eb23812f	PC-1001 Do not show private messages between users unless reporter is ... involved	2016-09-21 13:21:23 +01:00
Keir Nellyer	09287ddefc	PC-1002 Automatic reports bans show the id of the report which caused ... the ban	2016-09-21 12:22:55 +01:00
Keir Nellyer	e73b06b5ab	PC-998 Change cache time for chat messages to 5 minutes	2016-09-21 11:46:03 +01:00
Sam	209ea32ef9	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm	2016-09-20 09:18:20 +01:00
Keir Nellyer	32563904fa	PC-997 Show total counts when showing report statistics	2016-09-19 10:38:03 +01:00
LCastr0	f0c7b1d6aa	Whoops, forgot this	2016-09-18 16:18:33 -03:00
LCastr0	537dc28daa	Used proper method to add specific prizes	2016-09-18 16:16:57 -03:00
LCastr0	ae6868b76a	Added Witch Morph ... Added Metal Man morph	2016-09-16 20:46:52 -03:00
Keir Nellyer	2cdab061b6	PC-886 Move report bans over to punishment gui	2016-09-16 17:40:14 +01:00
Keir Nellyer	ebe212c8ff	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-09-15 17:30:27 +01:00
William Burns	199d6cba3e	Add a period to the anticheat ban message. (#206)	2016-09-14 20:50:08 -04:00
Alexander Meech	93c227a22d	Change Mavs Basketball to 5 Minutes (#201) ... * Update ScoringManager.java * Update Basketball.java	2016-09-14 20:49:24 -04:00
Keir Nellyer	da5a8d5b46	PC-966 Reports assigned to RC now have a higher priority instead of no decay effect	2016-09-14 21:51:06 +01:00
Keir Nellyer	a64ba4db2a	Include sender as being a recipient for testing reasons when checking if player can create a chat abuse report	2016-09-14 21:44:57 +01:00
Sam	1458cb84b9	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm	2016-09-14 20:14:05 +01:00
Keir Nellyer	9af606ae20	Ensure suspect messages actually involved the reporter	2016-09-14 14:53:39 +01:00
Keir Nellyer	efe532e8a6	Clean-up createReport method	2016-09-14 14:37:44 +01:00
Keir Nellyer	464099dc87	Correctly handle weird cases whereby an account may be involved in ... multiple open reports of the same category	2016-09-14 14:26:12 +01:00
Keir Nellyer	2be0522599	Attach JavaDocs and small method renames	2016-09-14 14:14:11 +01:00
Keir Nellyer	425d814ac4	PC-966 When selecting a new report for a user to handle, always ... prioritise reports assigned to teams that the user is a member of	2016-09-14 12:14:14 +01:00
Keir Nellyer	5ad4f2831d	PC-966 Only allow members of team to handle report if team assigned ... to report	2016-09-14 12:13:41 +01:00
Keir Nellyer	20c4488c5f	PC-966 Add gui button for passing report to RC team ... Misc. other changes	2016-09-13 18:28:09 +01:00
Keir Nellyer	d115097eb9	PC-966 Implement support for teams to be assigned to a report	2016-09-13 17:01:47 +01:00
Keir Nellyer	f1d1585585	PC-966 Implement method to get members of a team	2016-09-12 18:13:10 +01:00
Keir Nellyer	ee6e8a9656	PC-966 Implement report user cache	2016-09-12 18:07:01 +01:00
Keir Nellyer	a39d894d85	PC-966 Add support for saving report teams to database	2016-09-12 17:54:00 +01:00
Keir Nellyer	fae7e93f1a	PC-966 Add support for loading report teams from database	2016-09-12 17:08:11 +01:00
Keir Nellyer	a5e5be4329	PC-951 Fix handler message task not being cancelled when closing report	2016-09-12 11:56:21 +01:00
Keir Nellyer	5e5cb3284a	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-09-12 10:11:31 +01:00
cnr	6de3640243	Disable immediate ban actions for Glide and Speed	2016-09-11 17:54:50 -05:00
LCastr0	36ce7ef222	Fixes for the Omega chest giving duplicated items (#202)	2016-09-10 23:05:29 -04:00
Connor James	454e1c8c11	AntiCheat 1.2 (#200) ... * Implement Anticheat 1.2 hooks * Add default check thresholds for unknown check types * Add violation level support for new checks * Add ban waves for KillAura type D * Amend DELETE_PENDING now that it's not hardcoded * Add instant bans for high VL Glide/Speed * Don't specify hack type in banwave ban message	2016-09-10 23:01:13 -04:00
Sam	38473dcffd	Fix metal taking too little damage with full iron (#203)	2016-09-10 22:47:52 -04:00
LCastr0	f6b06c63ac	Fixes for the Omega chest giving duplicated items	2016-09-10 00:43:08 -03:00
AlexTheCoder	23a330d449	Add monster maze and bawk bawk battles to mixed arcade display in compass and set beta button to new oitq payload gamemode	2016-09-08 03:50:45 -04:00
Shaun Bennett	e12ed35da1	Fix NPE and kit upgrades issue	2016-09-07 23:13:28 -04:00
Shaun Bennett	493086fcf3	Merge pull request #198 from Mineplex-LLC/update/developer-servers ... Update/developer servers	2016-09-07 21:21:35 -04:00
Shaun Bennett	9318ba4de2	Merge branch 'develop' into bugfix/samczsun ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java	2016-09-07 20:12:57 -04:00
Shaun Bennett	7fbd6087eb	Merge pull request #187 from Mineplex-LLC/update/oitq ... Skywars Update Patch	2016-09-07 20:08:08 -04:00
samczsun	fba449ca03	Don't rearrange GUI if all dev servers are ingame	2016-09-07 19:17:47 -04:00
samczsun	a8adf23c15	Allow dev servers	2016-09-07 11:45:42 -04:00
Keir Nellyer	7b6f0ae221	PC-953 Make report ids in /reportstats command clickable	2016-09-07 16:40:05 +01:00
Sam	bed563876a	Add a comment to explain usage of KitUpgradeShop	2016-09-07 14:18:07 +01:00
Shaun Bennett	ba322f0df1	Merge pull request #195 from Mineplex-LLC/update/emergency-support-fixes ... Update/emergency support fixes	2016-09-07 07:57:53 -04:00
Shaun Bennett	b1b9900c9e	Add offline stat checking	2016-09-07 07:47:19 -04:00
Keir Nellyer	e2840f36b5	PC-958 Don't allow chat abuse reports of players who haven't spoken ... in chat	2016-09-07 11:28:20 +01:00
Keir Nellyer	640a8d3516	PC-958 Allow reporting of offline players	2016-09-07 09:50:10 +01:00
AlexTheCoder	225583a13d	Remove join restrictions on beta servers from unranked players	2016-09-06 21:36:30 -04:00
Sam	5bf35d49db	Message inconsistancy	2016-09-06 21:38:43 +01:00
Sam	be268991b0	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-09-06 21:37:33 +01:00
Sam	7a5a6c3d00	Fix duplicate message	2016-09-06 19:55:31 +01:00
Keir Nellyer	353cdb2413	Merge remote-tracking branch 'origin/feature/report-v2' into feature/report-v2	2016-09-06 17:28:03 +01:00
Keir Nellyer	b1b275fc67	PC-958 Prepare codebase for reporting of offline players	2016-09-06 17:27:48 +01:00
Keir Nellyer	94b5a6e760	PC-952 Add /reportinfo	2016-09-06 16:43:51 +01:00
AlexTheCoder	64db10c91a	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/emergency-support-fixes	2016-09-05 20:27:09 -04:00
AlexTheCoder	a124aa3d85	Fix items added via support server not showing up in customer service logs	2016-09-05 20:25:02 -04:00
samczsun	444fe5d151	Remove hacky reflection method to get server name	2016-09-05 18:37:17 -04:00
samczsun	08090f5e06	PC-818 ... Seismic Charges can no longer remove barrier blocks	2016-09-05 18:25:16 -04:00
samczsun	11c97691a9	PC-937 ... This commit allows Arcade to consider spectating and vanished players when deciding to autostart a game	2016-09-05 18:25:16 -04:00
samczsun	6490ab3786	Don't hide banwave animation from staff	2016-09-05 18:25:16 -04:00
samczsun	3aaa9b2514	Sort tab list properly	2016-09-05 18:25:16 -04:00
samczsun	6b1d551a37	Remove please investigate	2016-09-05 18:25:16 -04:00
samczsun	0678f7287d	No fake levels for those who don't want it	2016-09-05 18:25:16 -04:00
samczsun	d09b27bfe1	Fix disguises prevent join, join rank check bugs	2016-09-05 18:25:16 -04:00
samczsun	c18d771715	Unbreak Squid in SSM	2016-09-05 18:25:16 -04:00
Keir Nellyer	e2455bbc9d	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-09-05 20:04:12 +01:00
cnr	ccd81c1820	Fix BlockIgniteEvent NPE in MavericksManager	2016-09-05 13:42:24 -05:00
Sam	12130d41e6	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-09-05 17:59:51 +01:00
Sam	8ebaad4736	Beta ready commit	2016-09-05 17:59:49 +01:00
Keir Nellyer	acd63c90a1	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java # Plugins/Mineplex.Core/src/mineplex/core/preferences/UserPreferences.java # Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/ExclusivePreferencesPage.java # Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java	2016-09-05 14:26:06 +01:00
AlexTheCoder	a7b0c9de05	Fix unnecessary calls to mysql/mssql databases in support server	2016-09-05 04:46:13 -05:00
AlexTheCoder	504432d87b	Fix titan command not being registered	2016-09-05 04:46:01 -05:00
AlexTheCoder	9ce49b10c0	Add a command to allow support agents to check for ownership of internal sales packages	2016-09-05 04:45:51 -05:00
AlexTheCoder	ffb6073532	Fix unnecessary calls to mysql/mssql databases in support server	2016-09-04 23:44:54 -04:00
AlexTheCoder	b5771550ad	Fix titan command not being registered	2016-09-04 23:28:25 -04:00
AlexTheCoder	866c3ee7c9	Add a command to allow support agents to check for ownership of internal sales packages	2016-09-04 22:11:05 -04:00
AlexTheCoder	29bb2a3895	Add an enjin chargeback command and fix punishing in support servers	2016-09-04 00:39:44 -05:00
AlexTheCoder	b3478d70e8	Update support packages	2016-09-04 00:39:44 -05:00
AlexTheCoder	5b80f3b6ac	Fix clan banner being removed from support server information	2016-09-04 00:39:44 -05:00
AlexTheCoder	e2d3763ec0	Add an enjin chargeback command and fix punishing in support servers	2016-09-03 15:42:32 -04:00
Sam	34ee62bdc3	Fix NPE	2016-09-03 20:32:10 +01:00
AlexTheCoder	3088d79cf5	Update support packages	2016-09-03 15:16:59 -04:00
Sam	b3212fc003	Particle changes	2016-09-03 20:13:08 +01:00
Sam	4b1c93150b	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-09-03 20:12:39 +01:00
Sam	8d5d0c6272	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-09-03 18:29:37 +01:00
Sam	c3c61b8189	Merge fix	2016-09-03 18:29:18 +01:00
Sam	fc0217f1fd	More magic OITQ	2016-09-03 18:25:17 +01:00
Sam	e0424c78b2	Added spawn barrier	2016-09-03 18:24:56 +01:00
Sam	7eb148cc59	Ultimate colour change	2016-09-03 18:24:44 +01:00
AlexTheCoder	09a535466a	Fix clan banner being removed from support server information	2016-09-03 11:37:45 -04:00
Shaun Bennett	e57d009341	Remove unused import!	2016-09-03 01:11:50 -04:00
Shaun Bennett	586a768c7b	Fix enjin listener else bug	2016-09-03 00:59:15 -04:00
cnr	c9358d8c5a	Add power play to support server	2016-09-02 19:10:30 -05:00
Keir Nellyer	a5efacc12f	PC-955 Fix closing gui showing incorrect suspect name	2016-09-02 14:31:38 +01:00
cnr	2bce540c5d	Disable Antihack in the staff server	2016-09-02 02:51:34 -05:00
cnr	374142e63f	Merge branch 'update/the-smoothest-release-we-will-never-have' into develop	2016-09-02 00:42:51 -05:00
TadahTech	e2f974e1e6	Add sounds and messages to basketball.	2016-09-02 00:40:23 -05:00
cnr	ae0d30558c	Merge branch 'update/the-smoothest-release-we-will-never-have' into develop	2016-09-02 00:12:12 -05:00
AlexTheCoder	9abbe1bfb9	Update support whitelist and op list	2016-09-02 00:10:36 -05:00
cnr	f6db5393a3	Merge branch 'project-cosmetics' into develop	2016-09-02 00:08:23 -05:00
cnr	71b880793f	Implement power play logging and initial rewards	2016-09-02 00:01:49 -05:00
TadahTech	9e0bb6ff96	Tweak invite starting index. ... Disable NextBestGame in an MPS	2016-09-01 20:59:28 -05:00
TadahTech	d8486abbfd	Fix minor best game issues.	2016-09-01 20:05:53 -05:00
Keir Nellyer	78048ac279	PC-947 Add bypass for handling reports created or made against for developer	2016-09-01 18:21:50 +01:00
Keir Nellyer	d39dae748c	PC-947 Don't allow staff members to handle reports created by or made against them	2016-09-01 17:55:36 +01:00
TadahTech	a6360249b7	Use party if a player has it.	2016-09-01 08:47:43 -05:00
TadahTech	6f3d7dcd29	Merge branches 'develop' and 'update/the-smoothest-release-we-will-never-have' of https://github.com/Mineplex-LLC/Minecraft-PC into update/the-smoothest-release-we-will-never-have	2016-09-01 08:45:43 -05:00
TadahTech	41936e0efc	Remove users from the map.	2016-09-01 08:31:16 -05:00
TadahTech	fdc54e1dd1	Fix BestGame not cancelling for parties.	2016-09-01 08:29:51 -05:00
cnr	05f640266f	Fix basketball scoring infinite loop	2016-09-01 06:36:47 -05:00
TadahTech	107a296239	Fuck you intellij	2016-09-01 05:49:59 -05:00
TadahTech	53846acbf6	Dont let Minestrike use NextBestGame	2016-09-01 05:39:47 -05:00
TadahTech	9fcee07427	Fix people getting stuck in chests.	2016-09-01 05:34:37 -05:00
TadahTech	68743cf73c	Mavs changes.	2016-09-01 03:24:38 -05:00
TadahTech	46053e82e1	Mavs changes.	2016-09-01 02:35:31 -05:00
TadahTech	c0c75ea375	Allow team selecting to work on the mavs hub.	2016-08-31 23:46:29 -05:00
cnr	9cd5b73432	Merge branch 'update/basketball-game' into develop	2016-08-31 23:19:51 -05:00
cnr	55086efd91	Merge branch 'feature/shadowmute' into develop	2016-08-31 23:16:57 -05:00
LCastr0	8e8719070c	Changes Omega Chest to not be craftable ... Changes LockCosmetic and PowerPlay commands to be JNR_DEV+	2016-08-31 23:26:41 -03:00
Sam	57292414c6	Gems for winners	2016-08-31 22:55:13 +01:00
Keir Nellyer	725892e93b	PC-957 Show warning message when a user's report is marked as abusive	2016-08-31 16:38:35 +01:00
Keir Nellyer	8f28ab3f0d	PC-949 /reportclose argument "<conclusion>" should be "<reason>"	2016-08-31 16:30:55 +01:00
Sam	0b7fdc01eb	Initial balence change	2016-08-31 16:30:50 +01:00
Keir Nellyer	97e06053d1	PC-948 Don't send handler to server if they are already connected to it	2016-08-31 16:25:14 +01:00
Keir Nellyer	04432d44d7	This can be an in-line return	2016-08-31 15:04:15 +01:00
Sam	6a139d5c55	Tiny code improvement	2016-08-31 13:28:48 +01:00
Sam	7599630328	Pyromancer Ultimate name change	2016-08-31 13:27:07 +01:00
Sam	8d222aafec	Fix increasing loop in Overtime	2016-08-31 13:26:54 +01:00
Sam	1bfebf358f	Add Overtime	2016-08-31 12:07:50 +01:00
Sam	47df09b770	Handle null sound	2016-08-31 12:07:35 +01:00
Sam	b1faecea49	Kit Fire incorrect values	2016-08-31 12:07:25 +01:00
Keir Nellyer	41bae9d5f8	Add bottom margin so that big chat logs do not collide with footer	2016-08-31 10:45:38 +01:00
Keir Nellyer	a7d224b7e4	Fix reports duplicating themselves and causing massive issues	2016-08-30 23:18:12 +01:00
Keir Nellyer	96b74444e5	Fix duplicate message entries	2016-08-30 22:54:58 +01:00
AlexTheCoder	8397f53d39	Remove unneeded teleportation in clans hubs	2016-08-30 03:27:11 -04:00
AlexTheCoder	ba02dea404	Fix me being dumb	2016-08-30 03:22:55 -04:00
TadahTech	90ce21db3d	Update preferences	2016-08-30 00:51:51 -05:00
AlexTheCoder	8ca214a4d8	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game	2016-08-30 01:37:14 -04:00
TadahTech	a68f7395e4	Use proper server group / remove testing.	2016-08-30 00:10:38 -05:00
AlexTheCoder	5108a6f08d	Convert to npc for entering mavericks lobby	2016-08-30 01:02:26 -04:00
AlexTheCoder	d7d8ef021e	Disable using cosmetics inside mavericks hub	2016-08-30 00:47:48 -04:00
TadahTech	94bfc9aa15	Use proper server group / remove testing.	2016-08-29 22:33:01 -05:00
TadahTech	dfced7186f	Finish tweaks for the hub	2016-08-29 22:32:07 -05:00
AlexTheCoder	463c03e9d1	Add pitch and yaw to npcs	2016-08-29 22:11:53 -04:00
Shaun Bennett	f72647e1d4	Merge with develop	2016-08-29 21:56:03 -04:00
Shaun Bennett	e7d876e865	Fix string.format param order	2016-08-29 21:33:00 -04:00
TadahTech	39ea280098	NextBestGame code and new hub releases	2016-08-29 20:21:36 -05:00
Alexander Meech	464c9fcdc3	Update steal chance	2016-08-29 20:37:02 -04:00
LCastr0	3687c7ad98	PowerPlayClub update	2016-08-29 21:32:11 -03:00
Shaun Bennett	f3e38031ab	Add shadowmuting	2016-08-29 18:57:07 -04:00
Sam	7a3ce9813c	Payload (OITQ)	2016-08-29 23:08:04 +01:00
Sam	9454e1f409	Skywars and Kit Progression	2016-08-29 23:07:48 +01:00
Keir Nellyer	b30f395d88	Update chat snap site for backend changes	2016-08-29 12:21:57 +01:00
Sam	ec8ed76270	Convert old perks to new perks	2016-08-28 09:06:07 +01:00
Sam	88f4813534	Perk related issue	2016-08-28 09:05:49 +01:00
Sam	ccd855da84	Name the ultimates	2016-08-28 09:05:31 +01:00
Sam	54e8f8e5e8	Code improvement and cleanup	2016-08-28 09:05:11 +01:00
Sam	34c6e1cab7	Add the base of kit progression	2016-08-28 09:04:46 +01:00
Sam	d81ed348f3	Remove used import	2016-08-28 09:04:09 +01:00
Keir Nellyer	022e9f6bd4	Players can have more than 1 active report open against them	2016-08-27 22:38:54 +01:00
Keir Nellyer	3f18c0cc6b	Fix join/leave report handling	2016-08-27 22:35:12 +01:00
Keir Nellyer	cd9423a8e4	De-couple chatsnap from report system	2016-08-27 22:21:56 +01:00
Sam	a35c162dc4	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-08-26 21:26:16 +01:00
Sam	efc14ee13f	Another merge fix	2016-08-26 21:26:14 +01:00
Sam	4bc49e6133	Solve merge conflicts	2016-08-26 21:21:18 +01:00
LCastr0	3e38eb5990	Fixes to the merging conflicts	2016-08-25 20:13:59 -03:00
LCastr0	25d64c6dee	Changes to lock command	2016-08-25 20:12:00 -03:00
Sam	c2344a0494	Magnet not giving the kill	2016-08-25 20:26:18 +01:00
Sam	265ab620e4	Fix Magnet affecting teams members	2016-08-25 20:10:13 +01:00
Sam	9c5ab7c67e	Remove Fire Aspect 2	2016-08-25 20:09:50 +01:00
TadahTech	2a861460c6	Remove unused variables	2016-08-25 05:12:29 -05:00
TadahTech	b3b8f44b3a	Fix perks not being registered.	2016-08-25 05:11:52 -05:00
TadahTech	f976f56fb7	Merge branches 'develop' and 'feature/lobby-update' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/lobby-update	2016-08-25 04:26:21 -05:00
TadahTech	ebfd00ebc3	Fix centering of the Preference Menu	2016-08-25 04:04:53 -05:00
TadahTech	f9cc505908	Minor tweaks to soccer fields	2016-08-25 04:02:17 -05:00
TadahTech	19cfcc414b	Fix stacking minecarts	2016-08-25 03:58:39 -05:00
TadahTech	41b40fa12c	Fix painting breaking.	2016-08-25 03:54:10 -05:00
cnr	8617572980	Fix preferences menu interaction in Clans{,Hub}	2016-08-25 02:26:42 -05:00
TadahTech	77e0090531	Tweak preferences	2016-08-25 00:17:31 -05:00
TadahTech	f518185518	Tweak parkour	2016-08-24 22:55:39 -05:00
TadahTech	1654850e8c	Final Changes	2016-08-24 22:26:38 -05:00
TadahTech	ba2bee4f25	Merge branches 'develop' and 'feature/lobby-update' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/lobby-update ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/progression/ProgressiveKit.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeDetailsButton.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeMenuButton.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitDisplayMenu.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitInformationTrackerMenu.java # Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java	2016-08-24 21:29:01 -05:00
TadahTech	bca19788db	Merge branches 'develop' and 'feature/lobby-update' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/lobby-update ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/progression/ProgressiveKit.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeDetailsButton.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeMenuButton.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitDisplayMenu.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitInformationTrackerMenu.java # Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java	2016-08-24 21:28:36 -05:00
cnr	352e1e0eb2	Merge branch 'update/skywars-finalised' into develop	2016-08-24 17:22:01 -05:00
cnr	df1fc60d3d	Merge branch 'update/skywars-finalised' into develop	2016-08-24 17:12:58 -05:00
Sam	4088d2a311	Air teleportation fix ... Makes it less likey that a player would die of fall damage when using the eye of ender	2016-08-24 19:50:38 +01:00
Keir Nellyer	469a72afc0	JavaDocs	2016-08-23 16:40:25 +01:00
TadahTech	c9d14dc522	Update clans to new preferences. Remove debug messages.	2016-08-23 03:12:36 -05:00
TadahTech	bbe44e7d75	Remove debug.	2016-08-23 02:04:07 -05:00
TadahTech	02f703e68e	Remove debug.	2016-08-23 01:57:39 -05:00
TadahTech	42c228773c	Fix entity directions	2016-08-23 01:52:19 -05:00
TadahTech	3b9d6adfbc	Lobby Update	2016-08-23 01:37:07 -05:00
Sam	2c37d17db3	Slight code change	2016-08-22 19:42:30 +01:00
Sam	e0f319ea09	Change kit internal names ... Changes the kit internal names to match the current skywars ones in order so that kit progression experience is carried over during this update.	2016-08-22 17:28:51 +01:00
Keir Nellyer	dcfeaab5e1	Show invalid usage with alias used	2016-08-22 16:48:59 +01:00
Keir Nellyer	fb369d3df9	Add command to unban player from report system	2016-08-22 16:36:42 +01:00
Keir Nellyer	f805ceccdc	Don't include aborted reports in report statistics	2016-08-22 16:07:14 +01:00
xGamingDudex	7fb6ff58d0	Moved gadgets to use a whitelist system instead of blacklist for ... collisions	2016-08-22 01:00:29 +02:00
Sam	7db41a8be5	Reduce Earth kit scaling	2016-08-20 22:45:17 +01:00
Sam	28bbda23f5	Remove debug commands	2016-08-20 22:44:54 +01:00
Sam	e6530a6f44	More tweaks and fixes	2016-08-20 12:14:01 +01:00
xGamingDudex	e64324b36c	Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698	2016-08-20 11:40:15 +02:00
Keir Nellyer	bde51e6a54	The server of the handler now handles sending periodic message, instead of it being done through Redis ... This also fixes server restarts breaking handler messages.	2016-08-19 18:08:36 +01:00
Sam	dc5c2430cd	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-08-19 17:58:27 +01:00
Keir Nellyer	d05a69ac69	Fix handler message disappearing when changing server	2016-08-19 17:27:05 +01:00
Keir Nellyer	6367321315	Fix weird colouring	2016-08-19 17:26:08 +01:00
Keir Nellyer	eabaa1e68a	Move limit statistic limit to query and sort returned results	2016-08-19 17:01:26 +01:00
Keir Nellyer	834e6b5fdf	Switch to using UtilPlayer.message	2016-08-19 16:48:05 +01:00
Keir Nellyer	26aff936a0	Rename /reportstat command to /reportstats	2016-08-19 16:46:49 +01:00
Keir Nellyer	779efe3f47	Improve display of /reportstat	2016-08-19 16:46:25 +01:00
Keir Nellyer	bbb40a7b6e	A report is considered expired once it's priority is < 1	2016-08-19 16:23:19 +01:00
Keir Nellyer	b6f0e84a02	Fix sql error when attempting to reinsert same report mapping	2016-08-19 16:21:44 +01:00
Keir Nellyer	2a62abfd33	Push chat snapshots at save time instead of handle time	2016-08-19 16:07:06 +01:00
Keir Nellyer	a1a604757b	Remove old todo	2016-08-19 15:48:02 +01:00
Keir Nellyer	5b685a3a86	Fixed query for getting unhandled reports to behave well with abused reports	2016-08-19 15:46:59 +01:00
Keir Nellyer	2211e6c4ef	Fix query for getting reports a user is handling to ignore aborted reports	2016-08-19 15:03:54 +01:00
Keir Nellyer	514757924d	More descriptive message when aborting a report	2016-08-19 14:31:15 +01:00
Keir Nellyer	373c82c11b	Fix query for getting unhandled reports	2016-08-19 14:30:59 +01:00
Keir Nellyer	ee78cf2bb9	Cancel messaging task if handler is no longer present	2016-08-19 14:30:24 +01:00
Keir Nellyer	10a6cbfe3b	Remove handler from report object when aborting a report	2016-08-19 14:29:15 +01:00
Keir Nellyer	24d4da6aa2	Fix query to fetch report not fetching reports with no handler	2016-08-19 14:19:52 +01:00
Keir Nellyer	e6609d59c9	Fix incorrect MySQL operator	2016-08-19 14:01:17 +01:00
Sam	c4cb5d8db4	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-08-19 12:56:24 +01:00
cnr	5365f1269f	Delay Anticheat enable in Clans ... This ensure the anticheat has registered GameStartEvent before we fire it	2016-08-18 20:46:24 -05:00
cnr	72ddfd5d85	Disable server spawn radius in Clans ... Defer to the spawn claim area, instead	2016-08-18 20:44:01 -05:00
LCastr0	84c6720d1c	Fix merging errors	2016-08-18 18:30:32 -03:00
LCastr0	f4175ed724	Added PowerPlay managers, commands, button inside Carl to claim PowerPlay bonus... Includes a new SQL table, will be sent to Connor and Jaws so they can release it correctly! :D	2016-08-18 18:07:32 -03:00
Sam	3b11a2e985	Killstreaks	2016-08-18 22:02:33 +01:00
Keir Nellyer	b4ae149d89	Handlers can now abort a report allowing it to be handled by another ... member of staff	2016-08-18 14:42:53 +01:00
cnr	a79fa9cd46	Update GWEN preference name to reflect its purpose	2016-08-18 01:59:31 -05:00
cnr	08e1b765f7	Send local Anticheat messages regardless of preference	2016-08-18 01:59:31 -05:00
cnr	78fe41a8af	Update Anticheat ban message and duration	2016-08-18 01:59:30 -05:00
cnr	999237fe69	Accurately report game TPS	2016-08-18 01:59:05 -05:00
cnr	405f67f8b2	Implement/activate Anticheat phase two ... - Remove anticheat guardians from Arcade - Uncomment/implement Anticheat phase two actions - Specifically: immediate ban on Kill Aura type A, VL 200. - Give moderators less-specific messages, and limit messages by severity	2016-08-17 23:23:20 -04:00
AlexTheCoder	c66e485c9e	Fix arrow knockback	2016-08-17 23:22:30 -04:00
Sam	6c1bd88631	Increase passive knockback	2016-08-17 23:33:31 +01:00
Sam	1565b66395	Ore level changes	2016-08-17 23:33:17 +01:00
Sam	8d6e4a5fd3	Remove some unused code and cleanup	2016-08-17 22:28:22 +01:00
xGamingDudex	69275cb79c	Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698	2016-08-17 20:57:18 +02:00
Keir Nellyer	3126d540e7	/reportstat command progress	2016-08-16 21:30:37 +01:00
Sam	0176f31f1e	Complete implementation of kit progression	2016-08-16 18:55:26 +01:00
Keir Nellyer	3760166599	Remove remnants of old user report preference	2016-08-16 14:13:01 +01:00
Sam	604f5bc2cc	Update to work with new scoreboard system	2016-08-16 11:03:12 +01:00
Sam	29a07c60ab	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-08-16 11:02:15 +01:00
Sam	84e5b38380	Testing session feedback	2016-08-16 10:53:37 +01:00
Sam	dac4d9595c	Change scoreboard to use new system	2016-08-15 20:28:12 +01:00
Sam	6839006bd1	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-08-15 20:25:01 +01:00
Sam	d5d8f07085	Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple	2016-08-15 19:21:56 +01:00
Sam	df606d5e07	Changed game logic to try out multiple round concept	2016-08-15 19:19:20 +01:00
Sam	09741d4d2a	Added VersionModule (The new way to check client versions for games)	2016-08-15 19:18:51 +01:00
Sam	ea7d877d36	Some attempt at per player kits	2016-08-15 17:45:24 +01:00
cnr	08e65cb17e	Implement MineplexLink spectator check	2016-08-14 17:40:28 -04:00
xGamingDudex	6e32906805	More Gadget Collision patches	2016-08-14 22:50:48 +02:00
xGamingDudex	045445791a	Fixed gadget collision checks	2016-08-14 21:06:28 +02:00
xGamingDudex	e71cec874e	Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698	2016-08-14 20:09:01 +02:00
Sam	8f4303cf39	Progress on Upgrade Details	2016-08-13 22:40:33 +01:00
Shaun Bennett	0f4f1a3582	Remove pointless try/catch	2016-08-13 01:39:56 -05:00
Shaun Bennett	c99a23d670	Add region and server to chat payload	2016-08-13 00:57:39 -05:00
Sam	33cb4db338	Minestrike - Stop vanished players being assigned teams on join	2016-08-12 19:52:23 +01:00
Sam	2915a5e3b9	Add mid-game kit changing NPCs	2016-08-11 21:16:49 +01:00
Sam	69fd78bbf2	Remove Shurikens	2016-08-11 19:05:13 +01:00
Shaun Bennett	a744566cd3	Add AntiSpam front end	2016-08-11 11:34:17 -05:00
Keir Nellyer	a8e891f247	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java	2016-08-11 14:53:57 +01:00
Sam	60a46c8c10	Fire burst is now instant	2016-08-11 14:26:25 +01:00
Keir Nellyer	5b516fd7bd	Show player name in black if not suspect	2016-08-11 11:37:09 +01:00
Keir Nellyer	09b458af68	Mega-hack to remove unwanted whitespace (allowing the page to render ... correctly)	2016-08-11 11:37:09 +01:00
Keir Nellyer	ebea70d078	Remove echo port debug line	2016-08-11 11:35:13 +01:00
Keir Nellyer	735eccca37	Move font styling over to stylesheet	2016-08-11 11:35:13 +01:00
cnr	4562b00dcb	Repurpose MAC reports pref for GWEN reports	2016-08-11 04:01:14 -04:00
cnr	7b1ac5ded2	Merge branch 'update/clans' into develop	2016-08-10 21:27:43 -04:00
samczsun	7de9da3d1c	Complete rework of disguising and antihack hook ... This commit completely rewrites DisguiseManager, DisguisePlayer, and PlayerDisguiseManager. Changes to disguising means that much of the core was also changed, primarily having to do with mapping by UUID versus player names. Several new API classes were added, such as EntitySelector, Managers, UtilTasks, and a brand new scoreboard API which is much more optimized and allows for much longer lines The new anticheat is hooked as well, with implementation for guardians which follow the players around. Release two code is also included, but is currently disabled via a boolean.	2016-08-10 21:03:30 -04:00
Sam	82b2541e34	PC-827 ... Team SSM - Teammates can no longer cancel each other's Blaze Firefly	2016-08-10 21:47:13 +01:00
Sam	df646b0659	PC-897 ... SG - Spectators can no longer punch fireballs from the world border	2016-08-10 21:46:37 +01:00
Sam	a02699d84a	PC-898 ... SSM - Fixes an issue where kit armor would not appear correctly in your inventory.	2016-08-10 21:46:02 +01:00
Sam	933861176d	PC-662 ... Castle Siege - Fixes the game not ending if the whole of one team left.	2016-08-10 21:45:27 +01:00
Sam	e05f90372a	Add kit upgrade details	2016-08-10 19:05:40 +01:00
Keir Nellyer	ff7a427787	Handle party chat correctly	2016-08-10 16:57:44 +01:00
Keir Nellyer	cbdce80483	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-08-10 16:01:47 +01:00
xGamingDudex	907ac7473f	Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698	2016-08-10 16:52:37 +02:00
Keir Nellyer	e43c241338	Display suspect username in red in chat log	2016-08-10 15:30:17 +01:00
Sam	87dd4c5632	Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple	2016-08-09 20:23:58 +01:00
Sam	c19825cbb0	Remove unused imports	2016-08-09 20:23:50 +01:00
Alexander Meech	5fca64b86b	Remove safezone requirement for observer mode	2016-08-09 15:10:45 -04:00
Keir Nellyer	84d7838e13	Allow setting of alternative MySQL port	2016-08-09 15:37:45 +01:00
Keir Nellyer	bc1265a828	Remove custom font on player ranks to match rest of site	2016-08-09 15:23:15 +01:00
Keir Nellyer	d627c6e98e	Improve css styling slightly	2016-08-09 15:20:49 +01:00
Keir Nellyer	31800ee1e7	Colour suspect messages	2016-08-09 15:17:19 +01:00
Sam	950a46ad12	Fix Throwable Dirt's velocity	2016-08-09 14:06:39 +01:00
Sam	5fd5245978	Use attack name	2016-08-09 13:07:17 +01:00
Sam	95c23585c8	Missed a file	2016-08-09 12:53:54 +01:00
Sam	acd5e0c1d2	Added minecart colors	2016-08-09 12:53:34 +01:00
AlexTheCoder	e5a96e8189	Fix incorrect casing in mapping outposts	2016-08-08 21:54:27 -04:00
Sam	2f3ff052ff	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-08-08 22:59:55 +01:00
Sam	4c825cf80b	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-08-08 22:48:33 +01:00
Sam	3bab7ffe44	Use attack name for Snowballs and Eggs	2016-08-08 22:48:13 +01:00
Sam	239761962d	Now 1.9!	2016-08-08 20:49:24 +01:00
Keir Nellyer	6294e66484	Show report category on report site	2016-08-08 16:51:40 +01:00
Sam	93e49bc8a6	Stop placing and dropping of skill items	2016-08-08 16:44:13 +01:00
cnr	4180f03a52	Use the correct SalesPackageBase for gadgets	2016-08-07 22:40:26 -04:00
AlexTheCoder	5a2871528f	Small aesthetic change to ghasts	2016-08-07 18:53:35 -04:00
AlexTheCoder	73cb42c7ab	Make outposts actually end after they expire	2016-08-07 18:53:23 -04:00
AlexTheCoder	cce871b0e2	Stop runes being applied to stacks of items	2016-08-07 18:53:05 -04:00
AlexTheCoder	4e8ed68efd	Stop bows from selling in stacks	2016-08-07 18:52:48 -04:00
AlexTheCoder	36e6c7ce33	Fix slight error in amplifier end messages	2016-08-07 18:52:21 -04:00
AlexTheCoder	e16d88e52b	Add 'Safe' items replacing normal trapped chests and make craters not spam message when they explode	2016-08-07 18:52:00 -04:00
AlexTheCoder	5985731909	Make block drop rate 30% like normal TNT	2016-08-07 17:55:38 -04:00
AlexTheCoder	36aa1f9317	Stop swords and bows from being sold in stacks	2016-08-07 15:02:23 -04:00
AlexTheCoder	95302177f8	Add cooldowns to all gui items tied to giving rewards to prevent some exploitation	2016-08-07 14:47:14 -04:00
Sam	280ff577fa	Metal Kit skill item placing and dropping	2016-08-07 01:25:48 +01:00
Sam	44274bcc64	Projectiles, Enchanted armor & StackOverFlows ... Fixes an issue where players with enchanted armor would cause the server to frezze for an extended amount of time due to a stackoverflow error when hit by projectiles such as snowballs or eggs.	2016-08-07 01:23:03 +01:00
Sam	4173c96d32	Fixes inconsistency with the scoreboard	2016-08-06 23:56:54 +01:00
AlexTheCoder	c5d979e5dc	Remove unnecessary while loop	2016-08-06 03:08:29 -04:00
AlexTheCoder	8eb74de2e8	Make outposts not try to block all right clicking everywhere -.-	2016-08-05 21:34:31 -04:00
Sam	691fc309c4	Documentation	2016-08-05 22:11:25 +01:00
Sam	e6bdfe8ba7	Per player fireworks	2016-08-05 22:11:15 +01:00
AlexTheCoder	4e0971ab0a	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans	2016-08-05 14:35:57 -04:00
AlexTheCoder	5b03692c97	Add in cooldowns for other clans shop buttons to stop autoclick exploits	2016-08-05 14:33:59 -04:00
AlexTheCoder	599c47a8c2	Prevent stacks of runes being consumed on one item	2016-08-05 14:33:21 -04:00
AlexTheCoder	a56f72b6af	Unify standard for event spawn points	2016-08-05 14:32:30 -04:00
AlexTheCoder	4637bc8531	Prevent war times from displaying as negative	2016-08-05 14:31:13 -04:00
AlexTheCoder	223fb0e526	Use custom explosion calculations as opposed to default mineplex explosion handling	2016-08-05 14:30:00 -04:00
AlexTheCoder	d73ced0e87	Stop portals from spawning in mid-air	2016-08-05 14:28:49 -04:00
AlexTheCoder	6170f9df87	Actually enable create button by removing stray '!'	2016-08-05 14:27:07 -04:00
AlexTheCoder	027b6b3fc4	Prevent players from using /c home after recently being in combat	2016-08-05 14:25:47 -04:00
AlexTheCoder	ce6a0b376c	Prevent players using the gui to bypass join cooldowns	2016-08-05 14:24:56 -04:00
AlexTheCoder	e01b57ceac	Implement auto restart system for clans servers in off-peak times	2016-08-05 14:24:00 -04:00
AlexTheCoder	ee1f2a7ef9	Make trapped chests more resistant to being opened and allow all chest types to be opened by besiegers, as well as preventing recruits from using hoppers to get items out of chests (PC-611)	2016-08-05 14:22:17 -04:00
AlexTheCoder	1ab5c8229b	Make bosses clean up after themselves and be more error-resistant	2016-08-05 13:40:05 -04:00
AlexTheCoder	14f140143b	Re-enable music in hub gadgets	2016-08-05 13:34:33 -04:00
AlexTheCoder	bf7065732b	Fix jukeboxes not being removed from the world from cosmetics and scoreboards attempting to use data from indices they do not have	2016-08-05 13:34:04 -04:00
Keir Nellyer	1854b71757	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 ... # Conflicts: # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java	2016-08-05 17:05:01 +01:00
Sam	2c6fc85fee	Logic fix and message change	2016-08-04 17:59:28 +01:00
cnr	0ca4fe2d38	Disable MAC kick for suspicious movement	2016-08-04 12:41:59 -04:00
Sam	618a132806	Payload path marker logic change	2016-08-04 17:29:40 +01:00
Sam	24c1e5fc3b	Kit items are now unbreakable	2016-08-04 17:29:01 +01:00
Sam	23b7064d43	Island ores bug	2016-08-04 16:56:13 +01:00
Sam	190ced7d97	Metal Kit tweaks	2016-08-04 16:55:52 +01:00
xXVevzZXx	91cf391724	some adjustments to UHC Survivalgames	2016-08-04 00:33:24 -04:00
cnr	3610f78b37	Merge branch 'feature/thanks' into develop	2016-08-03 22:23:46 -04:00
Shaun Bennett	85c4c181ec	Reload ThankData when a player is /thank - Allows rewards to appear immediately at carl	2016-08-03 18:22:36 -05:00
Shaun Bennett	e113bedea5	Fix accidentally refactoring "thanks" in strings	2016-08-03 15:11:31 -05:00
Shaun Bennett	72f078fe54	Fix using wrong name, add missing jooq files	2016-08-03 15:04:06 -05:00
Shaun Bennett	6d93efc1a2	Adjust button text as well	2016-08-03 14:57:30 -05:00
Shaun Bennett	ad6c1dd970	Adjust some text wording	2016-08-03 14:55:33 -05:00
Shaun Bennett	2e80838376	Update ClaimTips lore	2016-08-03 14:25:07 -05:00
Shaun Bennett	a61906acfa	Ignore "Testing" boostergroup when announcing activation	2016-08-03 14:24:49 -05:00
Shaun Bennett	ca13b8f29e	Fix compile errors	2016-08-03 14:18:26 -05:00
Shaun Bennett	1ae7f6cb25	Integrate the new ThankManager into Amplifiers	2016-08-03 14:03:12 -05:00
cnr	3f0938815d	Merge branch 'update/clans' into develop	2016-08-03 12:39:52 -04:00
AlexTheCoder	fb3cfecc79	Move recharge handler	2016-08-02 20:44:09 -04:00
Sam	2b8754aa32	Metal Kit bug fixes	2016-08-02 23:34:12 +01:00
Keir Nellyer	c327309a65	Switch over to new method of determining if user is banned, this will allow unbanning of players in the near future	2016-08-02 16:46:14 +01:00
Shaun Bennett	f41cd8c104	Add /thank command. Update jooq files	2016-08-02 00:10:46 -05:00
md_5	dad453bd84	Remove Sentry - Unused	2016-08-02 11:42:16 +10:00
Sam	62a1968b01	Experimental Metal Kit	2016-08-02 01:13:16 +01:00
AlexTheCoder	4fdbb1fc9d	Fix assorted bugs	2016-08-01 14:48:44 -04:00
Sam	bd00ac8446	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-08-01 19:34:40 +01:00
Sam	2c37af32ca	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-08-01 19:19:34 +01:00
Sam	4085453f0f	Ninja Dash stopping/not working on rails	2016-08-01 18:47:17 +01:00
Sam	71f9fd97d6	End Effect change ... Reduced the amount of TNT thrown and reduced the velocity at which they are fired.	2016-08-01 18:46:35 +01:00
Sam	8f96b15454	Ninja Dash damage radius fix	2016-08-01 17:18:01 +01:00
Sam	84a4aa5157	Reduce Shuriken damage	2016-07-31 13:47:28 +01:00
Sam	1fde433c50	More changes and fixes	2016-07-30 22:53:36 +01:00
AlexTheCoder	cd237b8d3b	Make players teleport to shops once they return to the nether	2016-07-30 17:42:57 -04:00
AlexTheCoder	d12d353c20	Fix pronoun in message autoreply	2016-07-30 17:36:03 -04:00
AlexTheCoder	2d39dbfb58	Move clans admin text	2016-07-30 17:34:03 -04:00
AlexTheCoder	fe92633802	Add claim limit override for admin claiming	2016-07-30 16:49:39 -04:00
AlexTheCoder	d1d366dcf8	Add a cooldown to clans shops to reduce chance of edge-case negative gold balances	2016-07-30 09:46:02 -04:00
AlexTheCoder	9e2ba8c653	Fix fissure applying to anvils	2016-07-30 09:36:38 -04:00
Sam	063e05c0f3	Move subtle changes and fixes	2016-07-29 19:07:24 +01:00
AlexTheCoder	ecb56bf450	Fix players being able to use de-blink to teleport between worlds	2016-07-29 13:35:09 -04:00
Keir Nellyer	635e07c5a2	This wasn't meant to be included in the last commit	2016-07-29 15:09:21 +01:00
Keir Nellyer	bb9dbf1da4	PC-877 Vanish report handler when teleporting to offender's server	2016-07-29 15:08:03 +01:00
Keir Nellyer	806ec2460a	Add Gameplay report category for gameplay related reports	2016-07-29 13:20:06 +01:00
Keir Nellyer	43c94e95b3	PC-875 Players should only be banned after 3 abusive reports (currently is set to 1)	2016-07-29 12:58:08 +01:00
Keir Nellyer	9c76fec54e	PC-874 Show label for report closure reason when closing a report	2016-07-29 12:56:14 +01:00
AlexTheCoder	96e0625548	Fix mislabeling of shop item in user display	2016-07-29 03:15:22 -04:00
cnr	d853f8467c	Merge branch 'update/clans' into develop	2016-07-28 22:56:23 -05:00
TadahTech	9529789159	Remove 3 second chat delay.	2016-07-28 22:54:04 -05:00
AlexTheCoder	62e0a39ee8	Fix some medium graphics issues	2016-07-28 23:28:47 -04:00
cnr	8d0dc0ce08	Merge branch 'feature/party-v2' into develop	2016-07-28 21:19:52 -05:00
AlexTheCoder	f53503f16a	Move code in sync runnable	2016-07-28 21:07:29 -04:00
AlexTheCoder	dddfb4420c	Fix players being allowed to recall through worlds	2016-07-28 21:05:25 -04:00
AlexTheCoder	841a44b8a6	Make clan create button functional	2016-07-28 21:02:04 -04:00
AlexTheCoder	16804a860c	Made duping usage for class shop impossible	2016-07-28 20:22:30 -04:00
AlexTheCoder	97d5d21a55	Fix lightning orb duping	2016-07-28 19:43:43 -04:00
AlexTheCoder	853fe31fbe	Merge branch 'update/clans' of github.com:Mineplex-LLC/Minecraft-PC into update/clans	2016-07-28 19:11:39 -04:00
AlexTheCoder	3aad06cc8a	Make Clans displayed as FULL instead of BETA in server compass	2016-07-28 19:11:14 -04:00
AlexTheCoder	47d79bbad5	Fix bugs arising during clans release	2016-07-28 19:08:47 -04:00
AlexTheCoder	f3944527f8	Display clans purchases properly in support server	2016-07-28 19:08:24 -04:00
LCastr0	ab8d6daa2c	GitHub being annoying again	2016-07-28 19:59:49 -03:00
Sam	9b71f8c30b	Typo in KitBarrage	2016-07-28 22:49:58 +01:00
Sam	6c11037460	First QA testing session feedback	2016-07-28 22:39:05 +01:00
LCastr0	ab52965e44	Power Play button inside Carl, and the power play manager	2016-07-28 18:07:10 -03:00
Sam	771f643b42	Jumping disabled during Pyromancer ULT	2016-07-28 21:01:29 +01:00
cnr	a498bc13db	Reinstate async wrappers for clans gold access	2016-07-28 14:59:43 -05:00
Sam	446aec5187	Add "for Team X" when picking up the Arrow powerup	2016-07-28 20:19:50 +01:00
Sam	ba03051689	Add 1 second respawn delay	2016-07-28 19:33:16 +01:00
Sam	d30703c570	Completed game logic & Kit fixes	2016-07-28 19:31:15 +01:00
Shaun Bennett	9c42f4c147	Use the proper boostergroup for amplifier thanks	2016-07-28 13:27:48 -05:00
Keir Nellyer	5dd35d45c4	PC-873 Alert user regardless of usage if banned from using /report	2016-07-28 17:41:20 +01:00
Keir Nellyer	8ee6ab6a1b	Display message to reporters of a report when it is closed	2016-07-28 17:17:12 +01:00
AlexTheCoder	f0be7794f5	Lower skeleton king passive rate	2016-07-28 06:16:20 -04:00
AlexTheCoder	4efe1fe76d	Make boss portals open where the boss spawned	2016-07-28 05:46:26 -04:00
AlexTheCoder	c30d30b2e7	Fixes event mobs getting stuck outside	2016-07-28 05:33:37 -04:00
TadahTech	ab9bf2f405	Fixes possible bug with party leaders not seeing chat. ... Adds pling when you received an invite.	2016-07-28 03:40:24 -05:00
AlexTheCoder	639e089901	Disable clans tutorial	2016-07-28 04:28:34 -04:00
AlexTheCoder	aef94e13a8	Fix message not being sent	2016-07-28 04:18:29 -04:00
AlexTheCoder	b718a72366	Fix shop chunk size being too small for map	2016-07-28 02:59:03 -04:00
cnr	dd38a1dd76	Merge branch 'update/clans' into develop	2016-07-27 20:40:35 -05:00
AlexTheCoder	d5a1312c48	Update border size to match new map	2016-07-27 20:46:40 -04:00
cnr	05e59ae9cc	Revert "Revert "Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing"" ... This reverts commit 917b83250d.	2016-07-27 19:03:04 -05:00
Sam	00c0e38b82	Kit upgrades now display	2016-07-27 23:02:40 +01:00
xXVevzZXx	749fa36a5a	remove debug and check for Integer class	2016-07-27 16:47:08 -05:00
cnr	646ce96250	Ensure gold balance row is present	2016-07-27 16:15:03 -05:00
AlexTheCoder	62871686b0	Update clans store items to currency changes	2016-07-27 16:57:07 -04:00
cnr	dfbebe11f4	Use separate gold balances for each clans server	2016-07-27 15:52:07 -05:00
AlexTheCoder	031a9575ae	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans	2016-07-27 15:13:18 -04:00
AlexTheCoder	6180bea5cc	Update clans drop aesthetics and spawn/shop locations	2016-07-27 15:07:11 -04:00
xXVevzZXx	43c45f4094	add timer to dragon escape	2016-07-27 13:59:35 -05:00
Sam	8648581140	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-07-27 19:57:25 +01:00
Sam	ee38cb4c39	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-07-27 19:56:36 +01:00
Sam	888d3fb1aa	Payload logic progress	2016-07-27 19:56:31 +01:00
cnr	167c0f2b5e	Reimplement EnergyShopButton with new machinery	2016-07-27 13:52:03 -05:00
cnr	3cddf35d12	Refactor out legacy ConfirmationPage	2016-07-27 13:52:03 -05:00
cnr	3d0cc2a5fd	Refactor Clans gold dependency out of core	2016-07-27 13:52:03 -05:00
cnr	dc96258055	Merge branch 'feature/party-v2' into develop	2016-07-27 13:19:25 -05:00
Shaun Bennett	0d46bc4609	Add Amplifier thank button	2016-07-27 13:17:36 -05:00
Keir Nellyer	4dbbe6c32a	Allow Collector instance to be configured in parameters	2016-07-27 16:49:50 +01:00
Keir Nellyer	97d72e97e4	Variable refactorings for consistency	2016-07-27 16:09:38 +01:00
Keir Nellyer	f2435c3b43	Packet class refactorings	2016-07-27 16:08:23 +01:00
Keir Nellyer	20fc867578	Display rank 'ALL' as 'Player'	2016-07-27 15:52:22 +01:00
Keir Nellyer	d474139220	Don't show Punish GUI unless report result is ACCEPTED	2016-07-27 15:46:54 +01:00
Keir Nellyer	63917297ef	Show /report and /reportclose command usage when attempting to use the command incorrectly	2016-07-27 15:45:12 +01:00
xGamingDudex	72b5507390	Fixed PC-120	2016-07-27 12:29:07 +02:00
xGamingDudex	161381f393	Fixed PC-698	2016-07-27 12:09:59 +02:00
AlexTheCoder	157c969e8d	Completely prevent players in parties from joining Clans servers	2016-07-27 05:51:49 -04:00
AlexTheCoder	d162750aec	Keep nether loaded if its not empty	2016-07-27 04:47:03 -04:00
AlexTheCoder	ea3cb36d3a	Clean up miniboss mobs after their chunk unloads	2016-07-27 04:43:00 -04:00
AlexTheCoder	85cf005eba	Small clans economy changes	2016-07-26 22:33:19 -04:00
AlexTheCoder	9c700425fd	More javadocs	2016-07-26 22:32:46 -04:00
Keir Nellyer	2a167745a6	Update chatsnap url	2016-07-26 16:51:59 +01:00
AlexTheCoder	d98ca0ab3c	Remove unused miniboss	2016-07-26 09:00:37 -04:00