Mineplex2018-withcommit

JarvisBigBalls/Mineplex2018-withcommit

Author	SHA1	Message	Date
Alexander Meech	0caa84f703	Optimize Clan Banners (#221 ) * Optimize BannerRepository.java * Optimize banner loading in BannerManager.java * Optimize banner loading in ClansManager.java * Remove unnecessary runAsync * Optimize Siege Weapon storage * Forgot a ! in my while loop	2016-09-29 23:04:19 -04:00
Timothy Andis	7d4c817856	Game Lobby/Playwire/Command Fixes (#223 ) * Tweak team locations to accommodate MPS' Disable certain commands from being used. * Change PlayWire things. * Update MPS locations. * Update. * Remove debug * Remove debug. Ty Sam	2016-09-29 23:00:26 -04:00
Keir Nellyer	2a2cd5024a	Change message displayed when an error occurs	2016-09-30 01:56:49 +01:00
Keir Nellyer	ee532c1b8e	Improve exception handling	2016-09-30 01:44:49 +01:00
Keir Nellyer	de72f119fe	Don't allow players to handle new accounts in exceptional cases	2016-09-30 01:28:07 +01:00
Keir Nellyer	4818936943	Prevent double exception logging	2016-09-30 01:16:30 +01:00
Keir Nellyer	45eeac8cee	Prevent double exception printing when an error occurs whilst saving a report	2016-09-30 01:05:50 +01:00
Keir Nellyer	26d6540b2f	Fix closing reason being truncated with long closing messages	2016-09-30 00:36:52 +01:00
Keir Nellyer	dd5a284d55	Print stacktrace when unable to fetch report player is handling	2016-09-30 00:29:57 +01:00
Sam	22f8a1496a	Guardian fixes	2016-09-29 22:44:03 +01:00
Shaun Bennett	9d6985ddcd	Fix MPS zip file name, null amp stand	2016-09-29 09:10:25 -04:00
Shaun Bennett	b3d8c72953	Add Game Lobby world settings (#220 )	2016-09-29 00:22:42 -04:00
Shaun Bennett	7ff6e33941	LegacyGameLobbyManager bug fixes	2016-09-28 23:05:02 -04:00
Timothy Andis	620e219b14	Change MPS world zip (#219 ) * Change MPS map name	2016-09-28 21:32:51 -04:00
Shaun Bennett	b27e1ffbd1	Reward shards on thank claim instead of when being thanked	2016-09-28 21:28:07 -04:00
Shaun Bennett	3ede0e5644	Merge Report System v2 (#216 ) Report system (v2)	2016-09-28 17:39:26 -04:00
Timothy Andis	3d7647b26b	Game Lobby Update (#215 ) * Game Lobby update. Phase 1. * Correctly apply kit data to players who use the next best game feature. * I can do integer comparisons, I promise. * So much stuff, all minor. * Suck it Carl. * Fix Party bug. Update LobbyManager * Allow QA to test KitProgression @shaun cherry pick this plz. * Proper generation check (testing) Remove debugging from NextBestGame * Correct Amplifier looking direction. Fix Death tag hard coded kits Misc podium work. * ClansHub and Tweaks to the lobby manager * WA Tweak.	2016-09-28 10:17:05 -04:00
Keir Nellyer	31dcc87385	Slight code cleanup	2016-09-28 10:51:55 +01:00
Keir Nellyer	f8ad302d80	Simplify handling of optional reason	2016-09-28 10:41:56 +01:00
Keir Nellyer	6f77c05f1e	Players should still be report banned if they reach abuse threshold even if reportCloser is not present Also alert players of report closing regardless of whether reportCloser is present	2016-09-28 10:40:39 +01:00
Keir Nellyer	84e1a7291b	Report result gui should handle messaging of player invoking team assignment	2016-09-28 10:35:49 +01:00
Keir Nellyer	e54f70d194	JavaDocs for abortReport and assignTeam methods	2016-09-28 10:31:54 +01:00
Sam	c4e36b2269	Moppletop's September Bug Sprint (#214 ) * Earth Cost issue * Instances of "Tip" to "Thank" * PC-930 Fix an infinite loop when the game ends. * PC-959 Fixes an issue where people could spam drop grenades. * PC-668 Cosmetic Set bonuses no longer carry into MS games * Changes metal's passive Metal's passive is now that it gains 0.5 hearts per armor piece. This avoids the problem of being unkillable	2016-09-27 21:11:49 -04:00
Sam	78e6f3bf71	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm	2016-09-27 19:02:56 +01:00
Sam	68c62acb00	Guardian changes	2016-09-27 19:02:54 +01:00
Keir Nellyer	1543b539ba	Refactor unbox optional collection to utility class	2016-09-26 11:01:27 +01:00
Keir Nellyer	f42681c390	Remove old todo	2016-09-26 10:33:46 +01:00
Keir Nellyer	f63561b05e	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-09-26 10:19:13 +01:00
Keir Nellyer	125428d09e	Make getReport return Optional as it is quite likely that this will return null	2016-09-26 10:02:30 +01:00
Sam	96e1e944e1	Addition of the GWEN kit and a billion other things	2016-09-25 22:32:23 +01:00
samczsun	b35d933e56	Fix PlayWire error, handle future errors properly	2016-09-25 16:28:02 -04:00
samczsun	3f3241bec9	Reformat developer servers	2016-09-25 16:28:01 -04:00
Keir Nellyer	32385d4064	Update error message for non-titans, due to change made in previous commit	2016-09-25 02:28:42 +01:00
Keir Nellyer	a413df9f52	Limit feature to titans for damage limitation	2016-09-25 02:01:10 +01:00
Keir Nellyer	42ea7f85af	Remove un-required tab changes	2016-09-25 01:36:23 +01:00
Keir Nellyer	17b98888fc	Update database upgrade script for latest changes	2016-09-25 01:29:18 +01:00
Sam	f8a135cf50	Full system conversion	2016-09-25 00:56:06 +01:00
Sam	315a50aa16	Whoops	2016-09-24 21:34:45 +01:00
Sam	baafa62713	Just more converting	2016-09-24 21:09:25 +01:00
LCastr0	1475243d8a	Added MetalMan to the GUI for testings	2016-09-23 23:14:10 -03:00
Sam	f5a7f35d94	More kits	2016-09-23 18:58:14 +01:00
samczsun	187c6ec67c	Remove debug messages	2016-09-22 21:25:40 -04:00
samczsun	548e23a212	Fix fetching timestamp from wrong column	2016-09-22 21:21:16 -04:00
Sam	f6acedba5f	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm	2016-09-22 17:11:25 +01:00
Sam	2ba2b21577	Progress on converting SSM to a new cleaner system	2016-09-22 17:11:21 +01:00
Keir Nellyer	b24429783b	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java	2016-09-22 16:28:16 +01:00
Keir Nellyer	df17177892	PC-1003 Forgot to commit some changes from last commit	2016-09-22 16:10:31 +01:00
Keir Nellyer	ea74826d0c	PC-1003 Prevent rogue Report objects being cached and cause handler message spam	2016-09-22 16:01:11 +01:00
Keir Nellyer	6494720d2e	PC-998 Limit chat messages to 3 minutes	2016-09-22 15:48:01 +01:00
Shaun Bennett	79e6903c8b	Enable Speed and Glide punishments, remove hack from ban reason	2016-09-22 08:44:58 -04:00
Shaun Bennett	7f447f8084	Setup compass for game changes	2016-09-22 00:33:48 -04:00
Shaun Bennett	a3d210871d	Add ignored checks to GWEN (#211 )	2016-09-21 23:21:02 -04:00
Shaun Bennett	e15804fc15	Prevent players from joining 1.9+ games with 1.8 clients (#212 )	2016-09-21 23:19:55 -04:00
Shaun Bennett	9be26a92d1	Remove NCP	2016-09-21 22:21:49 -04:00
Sam	ac967f6b18	OITQP no longer in Beta (#210 ) * Convert OITQP into a module based system. * More magic modules * Achievements and Stats * Achievement menu update * Removed some Util methods I added that were never used. * Missed a few things * To Alex, Love Sam * Gem and achievement kits	2016-09-21 22:05:21 -04:00
Sarah	c1c46aceb8	Skyfall Game(#208 ) * basic prototype of the game Skyfall * new crumble mechanic * Developing basic game with basic mechanics and basic kits. * Fix merge issues * Add Supply Grop and Deathmatch and change map crumbling * Make cosmetical changes for QA and add Stat Trackers and Achievements * Add version requirement * Change scoreboard layout * Dont crumble the first island, but the islands over the spawn points * Remove Surefoot, fix TNT, remove boats and remove elytra on contact with water/lava * Unused imports * Fix kit description, modify island crumbling and add ring damage * Revert to normal crumble values * Add Javadoc * Remove more unused imports * Check for material data on ring generation * Add Block effect for Booster Ring recharge * Unused imports... * Add Elytra removal message and countdown * "Fix" food issues and some other minor things * Add chest refill to scoreboard from beginning * Fix supply drop * Unused imports..... * Re-enable Anti Cheat * Add java doc, remove system messages and add exeptions * The end of the great label debate * Fix method naming conventions * Remove more labels * Disable Booster kit	2016-09-21 21:57:38 -04:00
samczsun	7252906d30	Better synchronization of Managers	2016-09-21 21:37:57 -04:00
samczsun	92a0d606d4	Fix timings	2016-09-21 21:37:57 -04:00
samczsun	ec4add259d	Teleport players back to center of arcade lobby	2016-09-21 21:37:57 -04:00
Timothy Andis	bf61296948	PlayWire Ad integration (#207 ) * PlayWire integration. * Tweak PlayWire display. Update the GUI command. Temp set cooldown to 10 seconds for testing WILL BE REMOVED * PlayWire stuff. * PlayWire streaks and tweaks.	2016-09-21 21:24:58 -04:00
Keir Nellyer	1eecfbafee	Small code improvement	2016-09-21 16:33:05 +01:00
Keir Nellyer	c6eb23812f	PC-1001 Do not show private messages between users unless reporter is involved	2016-09-21 13:21:23 +01:00
Keir Nellyer	09287ddefc	PC-1002 Automatic reports bans show the id of the report which caused the ban	2016-09-21 12:22:55 +01:00
Keir Nellyer	e73b06b5ab	PC-998 Change cache time for chat messages to 5 minutes	2016-09-21 11:46:03 +01:00
Sam	209ea32ef9	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm	2016-09-20 09:18:20 +01:00
Keir Nellyer	32563904fa	PC-997 Show total counts when showing report statistics	2016-09-19 10:38:03 +01:00
LCastr0	f0c7b1d6aa	Whoops, forgot this	2016-09-18 16:18:33 -03:00
LCastr0	537dc28daa	Used proper method to add specific prizes	2016-09-18 16:16:57 -03:00
LCastr0	ae6868b76a	Added Witch Morph Added Metal Man morph	2016-09-16 20:46:52 -03:00
Keir Nellyer	2cdab061b6	PC-886 Move report bans over to punishment gui	2016-09-16 17:40:14 +01:00
Keir Nellyer	ebe212c8ff	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-09-15 17:30:27 +01:00
William Burns	199d6cba3e	Add a period to the anticheat ban message. (#206 )	2016-09-14 20:50:08 -04:00
Alexander Meech	93c227a22d	Change Mavs Basketball to 5 Minutes (#201 ) * Update ScoringManager.java * Update Basketball.java	2016-09-14 20:49:24 -04:00
Keir Nellyer	da5a8d5b46	PC-966 Reports assigned to RC now have a higher priority instead of no decay effect	2016-09-14 21:51:06 +01:00
Keir Nellyer	a64ba4db2a	Include sender as being a recipient for testing reasons when checking if player can create a chat abuse report	2016-09-14 21:44:57 +01:00
Sam	1458cb84b9	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm	2016-09-14 20:14:05 +01:00
Keir Nellyer	9af606ae20	Ensure suspect messages actually involved the reporter	2016-09-14 14:53:39 +01:00
Keir Nellyer	efe532e8a6	Clean-up createReport method	2016-09-14 14:37:44 +01:00
Keir Nellyer	464099dc87	Correctly handle weird cases whereby an account may be involved in multiple open reports of the same category	2016-09-14 14:26:12 +01:00
Keir Nellyer	2be0522599	Attach JavaDocs and small method renames	2016-09-14 14:14:11 +01:00
Keir Nellyer	425d814ac4	PC-966 When selecting a new report for a user to handle, always prioritise reports assigned to teams that the user is a member of	2016-09-14 12:14:14 +01:00
Keir Nellyer	5ad4f2831d	PC-966 Only allow members of team to handle report if team assigned to report	2016-09-14 12:13:41 +01:00
Keir Nellyer	20c4488c5f	PC-966 Add gui button for passing report to RC team Misc. other changes	2016-09-13 18:28:09 +01:00
Keir Nellyer	d115097eb9	PC-966 Implement support for teams to be assigned to a report	2016-09-13 17:01:47 +01:00
Keir Nellyer	f1d1585585	PC-966 Implement method to get members of a team	2016-09-12 18:13:10 +01:00
Keir Nellyer	ee6e8a9656	PC-966 Implement report user cache	2016-09-12 18:07:01 +01:00
Keir Nellyer	a39d894d85	PC-966 Add support for saving report teams to database	2016-09-12 17:54:00 +01:00
Keir Nellyer	fae7e93f1a	PC-966 Add support for loading report teams from database	2016-09-12 17:08:11 +01:00
Keir Nellyer	a5e5be4329	PC-951 Fix handler message task not being cancelled when closing report	2016-09-12 11:56:21 +01:00
Keir Nellyer	5e5cb3284a	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-09-12 10:11:31 +01:00
cnr	6de3640243	Disable immediate ban actions for Glide and Speed	2016-09-11 17:54:50 -05:00
LCastr0	36ce7ef222	Fixes for the Omega chest giving duplicated items (#202 )	2016-09-10 23:05:29 -04:00
Connor James	454e1c8c11	AntiCheat 1.2 (#200 ) * Implement Anticheat 1.2 hooks * Add default check thresholds for unknown check types * Add violation level support for new checks * Add ban waves for KillAura type D * Amend DELETE_PENDING now that it's not hardcoded * Add instant bans for high VL Glide/Speed * Don't specify hack type in banwave ban message	2016-09-10 23:01:13 -04:00
Sam	38473dcffd	Fix metal taking too little damage with full iron (#203 )	2016-09-10 22:47:52 -04:00
LCastr0	f6b06c63ac	Fixes for the Omega chest giving duplicated items	2016-09-10 00:43:08 -03:00
AlexTheCoder	23a330d449	Add monster maze and bawk bawk battles to mixed arcade display in compass and set beta button to new oitq payload gamemode	2016-09-08 03:50:45 -04:00
Shaun Bennett	e12ed35da1	Fix NPE and kit upgrades issue	2016-09-07 23:13:28 -04:00
Shaun Bennett	493086fcf3	Merge pull request #198 from Mineplex-LLC/update/developer-servers Update/developer servers	2016-09-07 21:21:35 -04:00
Shaun Bennett	9318ba4de2	Merge branch 'develop' into bugfix/samczsun # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java	2016-09-07 20:12:57 -04:00
Shaun Bennett	7fbd6087eb	Merge pull request #187 from Mineplex-LLC/update/oitq Skywars Update Patch	2016-09-07 20:08:08 -04:00
samczsun	fba449ca03	Don't rearrange GUI if all dev servers are ingame	2016-09-07 19:17:47 -04:00
samczsun	a8adf23c15	Allow dev servers	2016-09-07 11:45:42 -04:00
Keir Nellyer	7b6f0ae221	PC-953 Make report ids in /reportstats command clickable	2016-09-07 16:40:05 +01:00
Sam	bed563876a	Add a comment to explain usage of KitUpgradeShop	2016-09-07 14:18:07 +01:00
Shaun Bennett	ba322f0df1	Merge pull request #195 from Mineplex-LLC/update/emergency-support-fixes Update/emergency support fixes	2016-09-07 07:57:53 -04:00
Shaun Bennett	b1b9900c9e	Add offline stat checking	2016-09-07 07:47:19 -04:00
Keir Nellyer	e2840f36b5	PC-958 Don't allow chat abuse reports of players who haven't spoken in chat	2016-09-07 11:28:20 +01:00
Keir Nellyer	640a8d3516	PC-958 Allow reporting of offline players	2016-09-07 09:50:10 +01:00
AlexTheCoder	225583a13d	Remove join restrictions on beta servers from unranked players	2016-09-06 21:36:30 -04:00
Sam	5bf35d49db	Message inconsistancy	2016-09-06 21:38:43 +01:00
Sam	be268991b0	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-09-06 21:37:33 +01:00
Sam	7a5a6c3d00	Fix duplicate message	2016-09-06 19:55:31 +01:00
Keir Nellyer	353cdb2413	Merge remote-tracking branch 'origin/feature/report-v2' into feature/report-v2	2016-09-06 17:28:03 +01:00
Keir Nellyer	b1b275fc67	PC-958 Prepare codebase for reporting of offline players	2016-09-06 17:27:48 +01:00
Keir Nellyer	94b5a6e760	PC-952 Add /reportinfo	2016-09-06 16:43:51 +01:00
AlexTheCoder	64db10c91a	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/emergency-support-fixes	2016-09-05 20:27:09 -04:00
AlexTheCoder	a124aa3d85	Fix items added via support server not showing up in customer service logs	2016-09-05 20:25:02 -04:00
samczsun	444fe5d151	Remove hacky reflection method to get server name	2016-09-05 18:37:17 -04:00
samczsun	08090f5e06	PC-818 Seismic Charges can no longer remove barrier blocks	2016-09-05 18:25:16 -04:00
samczsun	11c97691a9	PC-937 This commit allows Arcade to consider spectating and vanished players when deciding to autostart a game	2016-09-05 18:25:16 -04:00
samczsun	6490ab3786	Don't hide banwave animation from staff	2016-09-05 18:25:16 -04:00
samczsun	3aaa9b2514	Sort tab list properly	2016-09-05 18:25:16 -04:00
samczsun	6b1d551a37	Remove please investigate	2016-09-05 18:25:16 -04:00
samczsun	0678f7287d	No fake levels for those who don't want it	2016-09-05 18:25:16 -04:00
samczsun	d09b27bfe1	Fix disguises prevent join, join rank check bugs	2016-09-05 18:25:16 -04:00
samczsun	c18d771715	Unbreak Squid in SSM	2016-09-05 18:25:16 -04:00
Keir Nellyer	e2455bbc9d	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-09-05 20:04:12 +01:00
cnr	ccd81c1820	Fix BlockIgniteEvent NPE in MavericksManager	2016-09-05 13:42:24 -05:00
Sam	12130d41e6	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-09-05 17:59:51 +01:00
Sam	8ebaad4736	Beta ready commit	2016-09-05 17:59:49 +01:00
Keir Nellyer	acd63c90a1	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java # Plugins/Mineplex.Core/src/mineplex/core/preferences/UserPreferences.java # Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/ExclusivePreferencesPage.java # Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java	2016-09-05 14:26:06 +01:00
AlexTheCoder	a7b0c9de05	Fix unnecessary calls to mysql/mssql databases in support server	2016-09-05 04:46:13 -05:00
AlexTheCoder	504432d87b	Fix titan command not being registered	2016-09-05 04:46:01 -05:00
AlexTheCoder	9ce49b10c0	Add a command to allow support agents to check for ownership of internal sales packages	2016-09-05 04:45:51 -05:00
AlexTheCoder	ffb6073532	Fix unnecessary calls to mysql/mssql databases in support server	2016-09-04 23:44:54 -04:00
AlexTheCoder	b5771550ad	Fix titan command not being registered	2016-09-04 23:28:25 -04:00
AlexTheCoder	866c3ee7c9	Add a command to allow support agents to check for ownership of internal sales packages	2016-09-04 22:11:05 -04:00
AlexTheCoder	29bb2a3895	Add an enjin chargeback command and fix punishing in support servers	2016-09-04 00:39:44 -05:00
AlexTheCoder	b3478d70e8	Update support packages	2016-09-04 00:39:44 -05:00
AlexTheCoder	5b80f3b6ac	Fix clan banner being removed from support server information	2016-09-04 00:39:44 -05:00
AlexTheCoder	e2d3763ec0	Add an enjin chargeback command and fix punishing in support servers	2016-09-03 15:42:32 -04:00
Sam	34ee62bdc3	Fix NPE	2016-09-03 20:32:10 +01:00
AlexTheCoder	3088d79cf5	Update support packages	2016-09-03 15:16:59 -04:00
Sam	b3212fc003	Particle changes	2016-09-03 20:13:08 +01:00
Sam	4b1c93150b	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-09-03 20:12:39 +01:00
Sam	8d5d0c6272	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-09-03 18:29:37 +01:00
Sam	c3c61b8189	Merge fix	2016-09-03 18:29:18 +01:00
Sam	fc0217f1fd	More magic OITQ	2016-09-03 18:25:17 +01:00
Sam	e0424c78b2	Added spawn barrier	2016-09-03 18:24:56 +01:00
Sam	7eb148cc59	Ultimate colour change	2016-09-03 18:24:44 +01:00
AlexTheCoder	09a535466a	Fix clan banner being removed from support server information	2016-09-03 11:37:45 -04:00
Shaun Bennett	e57d009341	Remove unused import!	2016-09-03 01:11:50 -04:00
Shaun Bennett	586a768c7b	Fix enjin listener else bug	2016-09-03 00:59:15 -04:00
cnr	c9358d8c5a	Add power play to support server	2016-09-02 19:10:30 -05:00
Keir Nellyer	a5efacc12f	PC-955 Fix closing gui showing incorrect suspect name	2016-09-02 14:31:38 +01:00
cnr	2bce540c5d	Disable Antihack in the staff server	2016-09-02 02:51:34 -05:00
cnr	374142e63f	Merge branch 'update/the-smoothest-release-we-will-never-have' into develop	2016-09-02 00:42:51 -05:00
TadahTech	e2f974e1e6	Add sounds and messages to basketball.	2016-09-02 00:40:23 -05:00
cnr	ae0d30558c	Merge branch 'update/the-smoothest-release-we-will-never-have' into develop	2016-09-02 00:12:12 -05:00
AlexTheCoder	9abbe1bfb9	Update support whitelist and op list	2016-09-02 00:10:36 -05:00
cnr	f6db5393a3	Merge branch 'project-cosmetics' into develop	2016-09-02 00:08:23 -05:00
cnr	71b880793f	Implement power play logging and initial rewards	2016-09-02 00:01:49 -05:00
TadahTech	9e0bb6ff96	Tweak invite starting index. Disable NextBestGame in an MPS	2016-09-01 20:59:28 -05:00
TadahTech	d8486abbfd	Fix minor best game issues.	2016-09-01 20:05:53 -05:00
Keir Nellyer	78048ac279	PC-947 Add bypass for handling reports created or made against for developer	2016-09-01 18:21:50 +01:00
Keir Nellyer	d39dae748c	PC-947 Don't allow staff members to handle reports created by or made against them	2016-09-01 17:55:36 +01:00
TadahTech	a6360249b7	Use party if a player has it.	2016-09-01 08:47:43 -05:00
TadahTech	6f3d7dcd29	Merge branches 'develop' and 'update/the-smoothest-release-we-will-never-have' of https://github.com/Mineplex-LLC/Minecraft-PC into update/the-smoothest-release-we-will-never-have	2016-09-01 08:45:43 -05:00
TadahTech	41936e0efc	Remove users from the map.	2016-09-01 08:31:16 -05:00
TadahTech	fdc54e1dd1	Fix BestGame not cancelling for parties.	2016-09-01 08:29:51 -05:00
cnr	05f640266f	Fix basketball scoring infinite loop	2016-09-01 06:36:47 -05:00
TadahTech	107a296239	Fuck you intellij	2016-09-01 05:49:59 -05:00
TadahTech	53846acbf6	Dont let Minestrike use NextBestGame	2016-09-01 05:39:47 -05:00
TadahTech	9fcee07427	Fix people getting stuck in chests.	2016-09-01 05:34:37 -05:00
TadahTech	68743cf73c	Mavs changes.	2016-09-01 03:24:38 -05:00
TadahTech	46053e82e1	Mavs changes.	2016-09-01 02:35:31 -05:00
TadahTech	c0c75ea375	Allow team selecting to work on the mavs hub.	2016-08-31 23:46:29 -05:00
cnr	9cd5b73432	Merge branch 'update/basketball-game' into develop	2016-08-31 23:19:51 -05:00
cnr	55086efd91	Merge branch 'feature/shadowmute' into develop	2016-08-31 23:16:57 -05:00
LCastr0	8e8719070c	Changes Omega Chest to not be craftable Changes LockCosmetic and PowerPlay commands to be JNR_DEV+	2016-08-31 23:26:41 -03:00
Sam	57292414c6	Gems for winners	2016-08-31 22:55:13 +01:00
Keir Nellyer	725892e93b	PC-957 Show warning message when a user's report is marked as abusive	2016-08-31 16:38:35 +01:00
Keir Nellyer	8f28ab3f0d	PC-949 /reportclose argument "<conclusion>" should be "<reason>"	2016-08-31 16:30:55 +01:00
Sam	0b7fdc01eb	Initial balence change	2016-08-31 16:30:50 +01:00
Keir Nellyer	97e06053d1	PC-948 Don't send handler to server if they are already connected to it	2016-08-31 16:25:14 +01:00
Keir Nellyer	04432d44d7	This can be an in-line return	2016-08-31 15:04:15 +01:00
Sam	6a139d5c55	Tiny code improvement	2016-08-31 13:28:48 +01:00
Sam	7599630328	Pyromancer Ultimate name change	2016-08-31 13:27:07 +01:00
Sam	8d222aafec	Fix increasing loop in Overtime	2016-08-31 13:26:54 +01:00
Sam	1bfebf358f	Add Overtime	2016-08-31 12:07:50 +01:00
Sam	47df09b770	Handle null sound	2016-08-31 12:07:35 +01:00
Sam	b1faecea49	Kit Fire incorrect values	2016-08-31 12:07:25 +01:00
Keir Nellyer	41bae9d5f8	Add bottom margin so that big chat logs do not collide with footer	2016-08-31 10:45:38 +01:00
Keir Nellyer	a7d224b7e4	Fix reports duplicating themselves and causing massive issues	2016-08-30 23:18:12 +01:00
Keir Nellyer	96b74444e5	Fix duplicate message entries	2016-08-30 22:54:58 +01:00
AlexTheCoder	8397f53d39	Remove unneeded teleportation in clans hubs	2016-08-30 03:27:11 -04:00
AlexTheCoder	ba02dea404	Fix me being dumb	2016-08-30 03:22:55 -04:00
TadahTech	90ce21db3d	Update preferences	2016-08-30 00:51:51 -05:00
AlexTheCoder	8ca214a4d8	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game	2016-08-30 01:37:14 -04:00
TadahTech	a68f7395e4	Use proper server group / remove testing.	2016-08-30 00:10:38 -05:00
AlexTheCoder	5108a6f08d	Convert to npc for entering mavericks lobby	2016-08-30 01:02:26 -04:00
AlexTheCoder	d7d8ef021e	Disable using cosmetics inside mavericks hub	2016-08-30 00:47:48 -04:00
TadahTech	94bfc9aa15	Use proper server group / remove testing.	2016-08-29 22:33:01 -05:00
TadahTech	dfced7186f	Finish tweaks for the hub	2016-08-29 22:32:07 -05:00
AlexTheCoder	463c03e9d1	Add pitch and yaw to npcs	2016-08-29 22:11:53 -04:00
Shaun Bennett	f72647e1d4	Merge with develop	2016-08-29 21:56:03 -04:00
Shaun Bennett	e7d876e865	Fix string.format param order	2016-08-29 21:33:00 -04:00
TadahTech	39ea280098	NextBestGame code and new hub releases	2016-08-29 20:21:36 -05:00
Alexander Meech	464c9fcdc3	Update steal chance	2016-08-29 20:37:02 -04:00
LCastr0	3687c7ad98	PowerPlayClub update	2016-08-29 21:32:11 -03:00
Shaun Bennett	f3e38031ab	Add shadowmuting	2016-08-29 18:57:07 -04:00
Sam	7a3ce9813c	Payload (OITQ)	2016-08-29 23:08:04 +01:00
Sam	9454e1f409	Skywars and Kit Progression	2016-08-29 23:07:48 +01:00
Keir Nellyer	b30f395d88	Update chat snap site for backend changes	2016-08-29 12:21:57 +01:00
Sam	ec8ed76270	Convert old perks to new perks	2016-08-28 09:06:07 +01:00
Sam	88f4813534	Perk related issue	2016-08-28 09:05:49 +01:00
Sam	ccd855da84	Name the ultimates	2016-08-28 09:05:31 +01:00
Sam	54e8f8e5e8	Code improvement and cleanup	2016-08-28 09:05:11 +01:00
Sam	34c6e1cab7	Add the base of kit progression	2016-08-28 09:04:46 +01:00
Sam	d81ed348f3	Remove used import	2016-08-28 09:04:09 +01:00
Keir Nellyer	022e9f6bd4	Players can have more than 1 active report open against them	2016-08-27 22:38:54 +01:00
Keir Nellyer	3f18c0cc6b	Fix join/leave report handling	2016-08-27 22:35:12 +01:00
Keir Nellyer	cd9423a8e4	De-couple chatsnap from report system	2016-08-27 22:21:56 +01:00
Sam	a35c162dc4	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-08-26 21:26:16 +01:00
Sam	efc14ee13f	Another merge fix	2016-08-26 21:26:14 +01:00
Sam	4bc49e6133	Solve merge conflicts	2016-08-26 21:21:18 +01:00
LCastr0	3e38eb5990	Fixes to the merging conflicts	2016-08-25 20:13:59 -03:00
LCastr0	25d64c6dee	Changes to lock command	2016-08-25 20:12:00 -03:00
Sam	c2344a0494	Magnet not giving the kill	2016-08-25 20:26:18 +01:00
Sam	265ab620e4	Fix Magnet affecting teams members	2016-08-25 20:10:13 +01:00
Sam	9c5ab7c67e	Remove Fire Aspect 2	2016-08-25 20:09:50 +01:00
TadahTech	2a861460c6	Remove unused variables	2016-08-25 05:12:29 -05:00
TadahTech	b3b8f44b3a	Fix perks not being registered.	2016-08-25 05:11:52 -05:00
TadahTech	f976f56fb7	Merge branches 'develop' and 'feature/lobby-update' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/lobby-update	2016-08-25 04:26:21 -05:00
TadahTech	ebfd00ebc3	Fix centering of the Preference Menu	2016-08-25 04:04:53 -05:00
TadahTech	f9cc505908	Minor tweaks to soccer fields	2016-08-25 04:02:17 -05:00
TadahTech	19cfcc414b	Fix stacking minecarts	2016-08-25 03:58:39 -05:00
TadahTech	41b40fa12c	Fix painting breaking.	2016-08-25 03:54:10 -05:00
cnr	8617572980	Fix preferences menu interaction in Clans{,Hub}	2016-08-25 02:26:42 -05:00
TadahTech	77e0090531	Tweak preferences	2016-08-25 00:17:31 -05:00
TadahTech	f518185518	Tweak parkour	2016-08-24 22:55:39 -05:00
TadahTech	1654850e8c	Final Changes	2016-08-24 22:26:38 -05:00
TadahTech	ba2bee4f25	Merge branches 'develop' and 'feature/lobby-update' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/lobby-update # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/progression/ProgressiveKit.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeDetailsButton.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeMenuButton.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitDisplayMenu.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitInformationTrackerMenu.java # Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java	2016-08-24 21:29:01 -05:00
TadahTech	bca19788db	Merge branches 'develop' and 'feature/lobby-update' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/lobby-update # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/progression/ProgressiveKit.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeDetailsButton.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeMenuButton.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitDisplayMenu.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitInformationTrackerMenu.java # Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java	2016-08-24 21:28:36 -05:00
cnr	352e1e0eb2	Merge branch 'update/skywars-finalised' into develop	2016-08-24 17:22:01 -05:00
cnr	df1fc60d3d	Merge branch 'update/skywars-finalised' into develop	2016-08-24 17:12:58 -05:00
Sam	4088d2a311	Air teleportation fix Makes it less likey that a player would die of fall damage when using the eye of ender	2016-08-24 19:50:38 +01:00
Keir Nellyer	469a72afc0	JavaDocs	2016-08-23 16:40:25 +01:00
TadahTech	c9d14dc522	Update clans to new preferences. Remove debug messages.	2016-08-23 03:12:36 -05:00
TadahTech	bbe44e7d75	Remove debug.	2016-08-23 02:04:07 -05:00
TadahTech	02f703e68e	Remove debug.	2016-08-23 01:57:39 -05:00
TadahTech	42c228773c	Fix entity directions	2016-08-23 01:52:19 -05:00
TadahTech	3b9d6adfbc	Lobby Update	2016-08-23 01:37:07 -05:00
Sam	2c37d17db3	Slight code change	2016-08-22 19:42:30 +01:00
Sam	e0f319ea09	Change kit internal names Changes the kit internal names to match the current skywars ones in order so that kit progression experience is carried over during this update.	2016-08-22 17:28:51 +01:00
Keir Nellyer	dcfeaab5e1	Show invalid usage with alias used	2016-08-22 16:48:59 +01:00
Keir Nellyer	fb369d3df9	Add command to unban player from report system	2016-08-22 16:36:42 +01:00
Keir Nellyer	f805ceccdc	Don't include aborted reports in report statistics	2016-08-22 16:07:14 +01:00
xGamingDudex	7fb6ff58d0	Moved gadgets to use a whitelist system instead of blacklist for collisions	2016-08-22 01:00:29 +02:00
Sam	7db41a8be5	Reduce Earth kit scaling	2016-08-20 22:45:17 +01:00
Sam	28bbda23f5	Remove debug commands	2016-08-20 22:44:54 +01:00
Sam	e6530a6f44	More tweaks and fixes	2016-08-20 12:14:01 +01:00
xGamingDudex	e64324b36c	Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698	2016-08-20 11:40:15 +02:00
Keir Nellyer	bde51e6a54	The server of the handler now handles sending periodic message, instead of it being done through Redis This also fixes server restarts breaking handler messages.	2016-08-19 18:08:36 +01:00
Sam	dc5c2430cd	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-08-19 17:58:27 +01:00
Keir Nellyer	d05a69ac69	Fix handler message disappearing when changing server	2016-08-19 17:27:05 +01:00
Keir Nellyer	6367321315	Fix weird colouring	2016-08-19 17:26:08 +01:00
Keir Nellyer	eabaa1e68a	Move limit statistic limit to query and sort returned results	2016-08-19 17:01:26 +01:00
Keir Nellyer	834e6b5fdf	Switch to using UtilPlayer.message	2016-08-19 16:48:05 +01:00
Keir Nellyer	26aff936a0	Rename /reportstat command to /reportstats	2016-08-19 16:46:49 +01:00
Keir Nellyer	779efe3f47	Improve display of /reportstat	2016-08-19 16:46:25 +01:00
Keir Nellyer	bbb40a7b6e	A report is considered expired once it's priority is < 1	2016-08-19 16:23:19 +01:00
Keir Nellyer	b6f0e84a02	Fix sql error when attempting to reinsert same report mapping	2016-08-19 16:21:44 +01:00
Keir Nellyer	2a62abfd33	Push chat snapshots at save time instead of handle time	2016-08-19 16:07:06 +01:00
Keir Nellyer	a1a604757b	Remove old todo	2016-08-19 15:48:02 +01:00
Keir Nellyer	5b685a3a86	Fixed query for getting unhandled reports to behave well with abused reports	2016-08-19 15:46:59 +01:00
Keir Nellyer	2211e6c4ef	Fix query for getting reports a user is handling to ignore aborted reports	2016-08-19 15:03:54 +01:00
Keir Nellyer	514757924d	More descriptive message when aborting a report	2016-08-19 14:31:15 +01:00
Keir Nellyer	373c82c11b	Fix query for getting unhandled reports	2016-08-19 14:30:59 +01:00
Keir Nellyer	ee78cf2bb9	Cancel messaging task if handler is no longer present	2016-08-19 14:30:24 +01:00
Keir Nellyer	10a6cbfe3b	Remove handler from report object when aborting a report	2016-08-19 14:29:15 +01:00
Keir Nellyer	24d4da6aa2	Fix query to fetch report not fetching reports with no handler	2016-08-19 14:19:52 +01:00
Keir Nellyer	e6609d59c9	Fix incorrect MySQL operator	2016-08-19 14:01:17 +01:00
Sam	c4cb5d8db4	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-08-19 12:56:24 +01:00
cnr	5365f1269f	Delay Anticheat enable in Clans This ensure the anticheat has registered GameStartEvent before we fire it	2016-08-18 20:46:24 -05:00
cnr	72ddfd5d85	Disable server spawn radius in Clans Defer to the spawn claim area, instead	2016-08-18 20:44:01 -05:00
LCastr0	84c6720d1c	Fix merging errors	2016-08-18 18:30:32 -03:00
LCastr0	f4175ed724	Added PowerPlay managers, commands, button inside Carl to claim PowerPlay bonus... Includes a new SQL table, will be sent to Connor and Jaws so they can release it correctly! :D	2016-08-18 18:07:32 -03:00
Sam	3b11a2e985	Killstreaks	2016-08-18 22:02:33 +01:00
Keir Nellyer	b4ae149d89	Handlers can now abort a report allowing it to be handled by another member of staff	2016-08-18 14:42:53 +01:00
cnr	a79fa9cd46	Update GWEN preference name to reflect its purpose	2016-08-18 01:59:31 -05:00
cnr	08e1b765f7	Send local Anticheat messages regardless of preference	2016-08-18 01:59:31 -05:00
cnr	78fe41a8af	Update Anticheat ban message and duration	2016-08-18 01:59:30 -05:00
cnr	999237fe69	Accurately report game TPS	2016-08-18 01:59:05 -05:00
cnr	405f67f8b2	Implement/activate Anticheat phase two - Remove anticheat guardians from Arcade - Uncomment/implement Anticheat phase two actions - Specifically: immediate ban on Kill Aura type A, VL 200. - Give moderators less-specific messages, and limit messages by severity	2016-08-17 23:23:20 -04:00
AlexTheCoder	c66e485c9e	Fix arrow knockback	2016-08-17 23:22:30 -04:00
Sam	6c1bd88631	Increase passive knockback	2016-08-17 23:33:31 +01:00
Sam	1565b66395	Ore level changes	2016-08-17 23:33:17 +01:00
Sam	8d6e4a5fd3	Remove some unused code and cleanup	2016-08-17 22:28:22 +01:00
xGamingDudex	69275cb79c	Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698	2016-08-17 20:57:18 +02:00
Keir Nellyer	3126d540e7	/reportstat command progress	2016-08-16 21:30:37 +01:00
Sam	0176f31f1e	Complete implementation of kit progression	2016-08-16 18:55:26 +01:00
Keir Nellyer	3760166599	Remove remnants of old user report preference	2016-08-16 14:13:01 +01:00
Sam	604f5bc2cc	Update to work with new scoreboard system	2016-08-16 11:03:12 +01:00
Sam	29a07c60ab	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-08-16 11:02:15 +01:00
Sam	84e5b38380	Testing session feedback	2016-08-16 10:53:37 +01:00
Sam	dac4d9595c	Change scoreboard to use new system	2016-08-15 20:28:12 +01:00
Sam	6839006bd1	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-08-15 20:25:01 +01:00
Sam	d5d8f07085	Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple	2016-08-15 19:21:56 +01:00
Sam	df606d5e07	Changed game logic to try out multiple round concept	2016-08-15 19:19:20 +01:00
Sam	09741d4d2a	Added VersionModule (The new way to check client versions for games)	2016-08-15 19:18:51 +01:00
Sam	ea7d877d36	Some attempt at per player kits	2016-08-15 17:45:24 +01:00
cnr	08e65cb17e	Implement MineplexLink spectator check	2016-08-14 17:40:28 -04:00
xGamingDudex	6e32906805	More Gadget Collision patches	2016-08-14 22:50:48 +02:00
xGamingDudex	045445791a	Fixed gadget collision checks	2016-08-14 21:06:28 +02:00
xGamingDudex	e71cec874e	Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698	2016-08-14 20:09:01 +02:00
Sam	8f4303cf39	Progress on Upgrade Details	2016-08-13 22:40:33 +01:00
Shaun Bennett	0f4f1a3582	Remove pointless try/catch	2016-08-13 01:39:56 -05:00
Shaun Bennett	c99a23d670	Add region and server to chat payload	2016-08-13 00:57:39 -05:00
Sam	33cb4db338	Minestrike - Stop vanished players being assigned teams on join	2016-08-12 19:52:23 +01:00
Sam	2915a5e3b9	Add mid-game kit changing NPCs	2016-08-11 21:16:49 +01:00
Sam	69fd78bbf2	Remove Shurikens	2016-08-11 19:05:13 +01:00
Shaun Bennett	a744566cd3	Add AntiSpam front end	2016-08-11 11:34:17 -05:00
Keir Nellyer	a8e891f247	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java	2016-08-11 14:53:57 +01:00
Sam	60a46c8c10	Fire burst is now instant	2016-08-11 14:26:25 +01:00
Keir Nellyer	5b516fd7bd	Show player name in black if not suspect	2016-08-11 11:37:09 +01:00
Keir Nellyer	09b458af68	Mega-hack to remove unwanted whitespace (allowing the page to render correctly)	2016-08-11 11:37:09 +01:00
Keir Nellyer	ebea70d078	Remove echo port debug line	2016-08-11 11:35:13 +01:00
Keir Nellyer	735eccca37	Move font styling over to stylesheet	2016-08-11 11:35:13 +01:00
cnr	4562b00dcb	Repurpose MAC reports pref for GWEN reports	2016-08-11 04:01:14 -04:00
cnr	7b1ac5ded2	Merge branch 'update/clans' into develop	2016-08-10 21:27:43 -04:00
samczsun	7de9da3d1c	Complete rework of disguising and antihack hook This commit completely rewrites DisguiseManager, DisguisePlayer, and PlayerDisguiseManager. Changes to disguising means that much of the core was also changed, primarily having to do with mapping by UUID versus player names. Several new API classes were added, such as EntitySelector, Managers, UtilTasks, and a brand new scoreboard API which is much more optimized and allows for much longer lines The new anticheat is hooked as well, with implementation for guardians which follow the players around. Release two code is also included, but is currently disabled via a boolean.	2016-08-10 21:03:30 -04:00
Sam	82b2541e34	PC-827 Team SSM - Teammates can no longer cancel each other's Blaze Firefly	2016-08-10 21:47:13 +01:00
Sam	df646b0659	PC-897 SG - Spectators can no longer punch fireballs from the world border	2016-08-10 21:46:37 +01:00
Sam	a02699d84a	PC-898 SSM - Fixes an issue where kit armor would not appear correctly in your inventory.	2016-08-10 21:46:02 +01:00
Sam	933861176d	PC-662 Castle Siege - Fixes the game not ending if the whole of one team left.	2016-08-10 21:45:27 +01:00
Sam	e05f90372a	Add kit upgrade details	2016-08-10 19:05:40 +01:00
Keir Nellyer	ff7a427787	Handle party chat correctly	2016-08-10 16:57:44 +01:00
Keir Nellyer	cbdce80483	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-08-10 16:01:47 +01:00
xGamingDudex	907ac7473f	Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698	2016-08-10 16:52:37 +02:00
Keir Nellyer	e43c241338	Display suspect username in red in chat log	2016-08-10 15:30:17 +01:00
Sam	87dd4c5632	Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple	2016-08-09 20:23:58 +01:00
Sam	c19825cbb0	Remove unused imports	2016-08-09 20:23:50 +01:00
Alexander Meech	5fca64b86b	Remove safezone requirement for observer mode	2016-08-09 15:10:45 -04:00
Keir Nellyer	84d7838e13	Allow setting of alternative MySQL port	2016-08-09 15:37:45 +01:00
Keir Nellyer	bc1265a828	Remove custom font on player ranks to match rest of site	2016-08-09 15:23:15 +01:00
Keir Nellyer	d627c6e98e	Improve css styling slightly	2016-08-09 15:20:49 +01:00
Keir Nellyer	31800ee1e7	Colour suspect messages	2016-08-09 15:17:19 +01:00
Sam	950a46ad12	Fix Throwable Dirt's velocity	2016-08-09 14:06:39 +01:00
Sam	5fd5245978	Use attack name	2016-08-09 13:07:17 +01:00
Sam	95c23585c8	Missed a file	2016-08-09 12:53:54 +01:00
Sam	acd5e0c1d2	Added minecart colors	2016-08-09 12:53:34 +01:00
AlexTheCoder	e5a96e8189	Fix incorrect casing in mapping outposts	2016-08-08 21:54:27 -04:00
Sam	2f3ff052ff	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-08-08 22:59:55 +01:00
Sam	4c825cf80b	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-08-08 22:48:33 +01:00
Sam	3bab7ffe44	Use attack name for Snowballs and Eggs	2016-08-08 22:48:13 +01:00
Sam	239761962d	Now 1.9!	2016-08-08 20:49:24 +01:00
Keir Nellyer	6294e66484	Show report category on report site	2016-08-08 16:51:40 +01:00
Sam	93e49bc8a6	Stop placing and dropping of skill items	2016-08-08 16:44:13 +01:00
cnr	4180f03a52	Use the correct SalesPackageBase for gadgets	2016-08-07 22:40:26 -04:00
AlexTheCoder	5a2871528f	Small aesthetic change to ghasts	2016-08-07 18:53:35 -04:00
AlexTheCoder	73cb42c7ab	Make outposts actually end after they expire	2016-08-07 18:53:23 -04:00
AlexTheCoder	cce871b0e2	Stop runes being applied to stacks of items	2016-08-07 18:53:05 -04:00
AlexTheCoder	4e8ed68efd	Stop bows from selling in stacks	2016-08-07 18:52:48 -04:00
AlexTheCoder	36e6c7ce33	Fix slight error in amplifier end messages	2016-08-07 18:52:21 -04:00
AlexTheCoder	e16d88e52b	Add 'Safe' items replacing normal trapped chests and make craters not spam message when they explode	2016-08-07 18:52:00 -04:00
AlexTheCoder	5985731909	Make block drop rate 30% like normal TNT	2016-08-07 17:55:38 -04:00
AlexTheCoder	36aa1f9317	Stop swords and bows from being sold in stacks	2016-08-07 15:02:23 -04:00
AlexTheCoder	95302177f8	Add cooldowns to all gui items tied to giving rewards to prevent some exploitation	2016-08-07 14:47:14 -04:00
Sam	280ff577fa	Metal Kit skill item placing and dropping	2016-08-07 01:25:48 +01:00
Sam	44274bcc64	Projectiles, Enchanted armor & StackOverFlows Fixes an issue where players with enchanted armor would cause the server to frezze for an extended amount of time due to a stackoverflow error when hit by projectiles such as snowballs or eggs.	2016-08-07 01:23:03 +01:00
Sam	4173c96d32	Fixes inconsistency with the scoreboard	2016-08-06 23:56:54 +01:00
AlexTheCoder	c5d979e5dc	Remove unnecessary while loop	2016-08-06 03:08:29 -04:00
AlexTheCoder	8eb74de2e8	Make outposts not try to block all right clicking everywhere -.-	2016-08-05 21:34:31 -04:00
Sam	691fc309c4	Documentation	2016-08-05 22:11:25 +01:00
Sam	e6bdfe8ba7	Per player fireworks	2016-08-05 22:11:15 +01:00
AlexTheCoder	4e0971ab0a	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans	2016-08-05 14:35:57 -04:00
AlexTheCoder	5b03692c97	Add in cooldowns for other clans shop buttons to stop autoclick exploits	2016-08-05 14:33:59 -04:00
AlexTheCoder	599c47a8c2	Prevent stacks of runes being consumed on one item	2016-08-05 14:33:21 -04:00
AlexTheCoder	a56f72b6af	Unify standard for event spawn points	2016-08-05 14:32:30 -04:00
AlexTheCoder	4637bc8531	Prevent war times from displaying as negative	2016-08-05 14:31:13 -04:00
AlexTheCoder	223fb0e526	Use custom explosion calculations as opposed to default mineplex explosion handling	2016-08-05 14:30:00 -04:00
AlexTheCoder	d73ced0e87	Stop portals from spawning in mid-air	2016-08-05 14:28:49 -04:00
AlexTheCoder	6170f9df87	Actually enable create button by removing stray '!'	2016-08-05 14:27:07 -04:00
AlexTheCoder	027b6b3fc4	Prevent players from using /c home after recently being in combat	2016-08-05 14:25:47 -04:00
AlexTheCoder	ce6a0b376c	Prevent players using the gui to bypass join cooldowns	2016-08-05 14:24:56 -04:00
AlexTheCoder	e01b57ceac	Implement auto restart system for clans servers in off-peak times	2016-08-05 14:24:00 -04:00
AlexTheCoder	ee1f2a7ef9	Make trapped chests more resistant to being opened and allow all chest types to be opened by besiegers, as well as preventing recruits from using hoppers to get items out of chests (PC-611)	2016-08-05 14:22:17 -04:00
AlexTheCoder	1ab5c8229b	Make bosses clean up after themselves and be more error-resistant	2016-08-05 13:40:05 -04:00
AlexTheCoder	14f140143b	Re-enable music in hub gadgets	2016-08-05 13:34:33 -04:00
AlexTheCoder	bf7065732b	Fix jukeboxes not being removed from the world from cosmetics and scoreboards attempting to use data from indices they do not have	2016-08-05 13:34:04 -04:00
Keir Nellyer	1854b71757	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 # Conflicts: # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java	2016-08-05 17:05:01 +01:00
Sam	2c6fc85fee	Logic fix and message change	2016-08-04 17:59:28 +01:00
cnr	0ca4fe2d38	Disable MAC kick for suspicious movement	2016-08-04 12:41:59 -04:00
Sam	618a132806	Payload path marker logic change	2016-08-04 17:29:40 +01:00
Sam	24c1e5fc3b	Kit items are now unbreakable	2016-08-04 17:29:01 +01:00
Sam	23b7064d43	Island ores bug	2016-08-04 16:56:13 +01:00
Sam	190ced7d97	Metal Kit tweaks	2016-08-04 16:55:52 +01:00
xXVevzZXx	91cf391724	some adjustments to UHC Survivalgames	2016-08-04 00:33:24 -04:00
cnr	3610f78b37	Merge branch 'feature/thanks' into develop	2016-08-03 22:23:46 -04:00
Shaun Bennett	85c4c181ec	Reload ThankData when a player is /thank - Allows rewards to appear immediately at carl	2016-08-03 18:22:36 -05:00
Shaun Bennett	e113bedea5	Fix accidentally refactoring "thanks" in strings	2016-08-03 15:11:31 -05:00
Shaun Bennett	72f078fe54	Fix using wrong name, add missing jooq files	2016-08-03 15:04:06 -05:00
Shaun Bennett	6d93efc1a2	Adjust button text as well	2016-08-03 14:57:30 -05:00
Shaun Bennett	ad6c1dd970	Adjust some text wording	2016-08-03 14:55:33 -05:00
Shaun Bennett	2e80838376	Update ClaimTips lore	2016-08-03 14:25:07 -05:00
Shaun Bennett	a61906acfa	Ignore "Testing" boostergroup when announcing activation	2016-08-03 14:24:49 -05:00
Shaun Bennett	ca13b8f29e	Fix compile errors	2016-08-03 14:18:26 -05:00
Shaun Bennett	1ae7f6cb25	Integrate the new ThankManager into Amplifiers	2016-08-03 14:03:12 -05:00
cnr	3f0938815d	Merge branch 'update/clans' into develop	2016-08-03 12:39:52 -04:00
AlexTheCoder	fb3cfecc79	Move recharge handler	2016-08-02 20:44:09 -04:00
Sam	2b8754aa32	Metal Kit bug fixes	2016-08-02 23:34:12 +01:00
Keir Nellyer	c327309a65	Switch over to new method of determining if user is banned, this will allow unbanning of players in the near future	2016-08-02 16:46:14 +01:00
Shaun Bennett	f41cd8c104	Add /thank command. Update jooq files	2016-08-02 00:10:46 -05:00
md_5	dad453bd84	Remove Sentry - Unused	2016-08-02 11:42:16 +10:00
Sam	62a1968b01	Experimental Metal Kit	2016-08-02 01:13:16 +01:00
AlexTheCoder	4fdbb1fc9d	Fix assorted bugs	2016-08-01 14:48:44 -04:00
Sam	bd00ac8446	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-08-01 19:34:40 +01:00
Sam	2c37af32ca	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-08-01 19:19:34 +01:00
Sam	4085453f0f	Ninja Dash stopping/not working on rails	2016-08-01 18:47:17 +01:00
Sam	71f9fd97d6	End Effect change Reduced the amount of TNT thrown and reduced the velocity at which they are fired.	2016-08-01 18:46:35 +01:00
Sam	8f96b15454	Ninja Dash damage radius fix	2016-08-01 17:18:01 +01:00
Sam	84a4aa5157	Reduce Shuriken damage	2016-07-31 13:47:28 +01:00
Sam	1fde433c50	More changes and fixes	2016-07-30 22:53:36 +01:00
AlexTheCoder	cd237b8d3b	Make players teleport to shops once they return to the nether	2016-07-30 17:42:57 -04:00
AlexTheCoder	d12d353c20	Fix pronoun in message autoreply	2016-07-30 17:36:03 -04:00
AlexTheCoder	2d39dbfb58	Move clans admin text	2016-07-30 17:34:03 -04:00
AlexTheCoder	fe92633802	Add claim limit override for admin claiming	2016-07-30 16:49:39 -04:00
AlexTheCoder	d1d366dcf8	Add a cooldown to clans shops to reduce chance of edge-case negative gold balances	2016-07-30 09:46:02 -04:00
AlexTheCoder	9e2ba8c653	Fix fissure applying to anvils	2016-07-30 09:36:38 -04:00
Sam	063e05c0f3	Move subtle changes and fixes	2016-07-29 19:07:24 +01:00
AlexTheCoder	ecb56bf450	Fix players being able to use de-blink to teleport between worlds	2016-07-29 13:35:09 -04:00
Keir Nellyer	635e07c5a2	This wasn't meant to be included in the last commit	2016-07-29 15:09:21 +01:00
Keir Nellyer	bb9dbf1da4	PC-877 Vanish report handler when teleporting to offender's server	2016-07-29 15:08:03 +01:00
Keir Nellyer	806ec2460a	Add Gameplay report category for gameplay related reports	2016-07-29 13:20:06 +01:00
Keir Nellyer	43c94e95b3	PC-875 Players should only be banned after 3 abusive reports (currently is set to 1)	2016-07-29 12:58:08 +01:00
Keir Nellyer	9c76fec54e	PC-874 Show label for report closure reason when closing a report	2016-07-29 12:56:14 +01:00
AlexTheCoder	96e0625548	Fix mislabeling of shop item in user display	2016-07-29 03:15:22 -04:00
cnr	d853f8467c	Merge branch 'update/clans' into develop	2016-07-28 22:56:23 -05:00
TadahTech	9529789159	Remove 3 second chat delay.	2016-07-28 22:54:04 -05:00
AlexTheCoder	62e0a39ee8	Fix some medium graphics issues	2016-07-28 23:28:47 -04:00
cnr	8d0dc0ce08	Merge branch 'feature/party-v2' into develop	2016-07-28 21:19:52 -05:00
AlexTheCoder	f53503f16a	Move code in sync runnable	2016-07-28 21:07:29 -04:00
AlexTheCoder	dddfb4420c	Fix players being allowed to recall through worlds	2016-07-28 21:05:25 -04:00
AlexTheCoder	841a44b8a6	Make clan create button functional	2016-07-28 21:02:04 -04:00
AlexTheCoder	16804a860c	Made duping usage for class shop impossible	2016-07-28 20:22:30 -04:00
AlexTheCoder	97d5d21a55	Fix lightning orb duping	2016-07-28 19:43:43 -04:00
AlexTheCoder	853fe31fbe	Merge branch 'update/clans' of github.com:Mineplex-LLC/Minecraft-PC into update/clans	2016-07-28 19:11:39 -04:00
AlexTheCoder	3aad06cc8a	Make Clans displayed as FULL instead of BETA in server compass	2016-07-28 19:11:14 -04:00
AlexTheCoder	47d79bbad5	Fix bugs arising during clans release	2016-07-28 19:08:47 -04:00
AlexTheCoder	f3944527f8	Display clans purchases properly in support server	2016-07-28 19:08:24 -04:00
LCastr0	ab8d6daa2c	GitHub being annoying again	2016-07-28 19:59:49 -03:00
Sam	9b71f8c30b	Typo in KitBarrage	2016-07-28 22:49:58 +01:00
Sam	6c11037460	First QA testing session feedback	2016-07-28 22:39:05 +01:00
LCastr0	ab52965e44	Power Play button inside Carl, and the power play manager	2016-07-28 18:07:10 -03:00
Sam	771f643b42	Jumping disabled during Pyromancer ULT	2016-07-28 21:01:29 +01:00
cnr	a498bc13db	Reinstate async wrappers for clans gold access	2016-07-28 14:59:43 -05:00
Sam	446aec5187	Add "for Team X" when picking up the Arrow powerup	2016-07-28 20:19:50 +01:00
Sam	ba03051689	Add 1 second respawn delay	2016-07-28 19:33:16 +01:00
Sam	d30703c570	Completed game logic & Kit fixes	2016-07-28 19:31:15 +01:00
Shaun Bennett	9c42f4c147	Use the proper boostergroup for amplifier thanks	2016-07-28 13:27:48 -05:00
Keir Nellyer	5dd35d45c4	PC-873 Alert user regardless of usage if banned from using /report	2016-07-28 17:41:20 +01:00
Keir Nellyer	8ee6ab6a1b	Display message to reporters of a report when it is closed	2016-07-28 17:17:12 +01:00
AlexTheCoder	f0be7794f5	Lower skeleton king passive rate	2016-07-28 06:16:20 -04:00
AlexTheCoder	4efe1fe76d	Make boss portals open where the boss spawned	2016-07-28 05:46:26 -04:00
AlexTheCoder	c30d30b2e7	Fixes event mobs getting stuck outside	2016-07-28 05:33:37 -04:00
TadahTech	ab9bf2f405	Fixes possible bug with party leaders not seeing chat. Adds pling when you received an invite.	2016-07-28 03:40:24 -05:00
AlexTheCoder	639e089901	Disable clans tutorial	2016-07-28 04:28:34 -04:00
AlexTheCoder	aef94e13a8	Fix message not being sent	2016-07-28 04:18:29 -04:00
AlexTheCoder	b718a72366	Fix shop chunk size being too small for map	2016-07-28 02:59:03 -04:00
cnr	dd38a1dd76	Merge branch 'update/clans' into develop	2016-07-27 20:40:35 -05:00
AlexTheCoder	d5a1312c48	Update border size to match new map	2016-07-27 20:46:40 -04:00
cnr	05e59ae9cc	Revert "Revert "Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing"" This reverts commit `917b83250d`.	2016-07-27 19:03:04 -05:00
Sam	00c0e38b82	Kit upgrades now display	2016-07-27 23:02:40 +01:00
xXVevzZXx	749fa36a5a	remove debug and check for Integer class	2016-07-27 16:47:08 -05:00
cnr	646ce96250	Ensure gold balance row is present	2016-07-27 16:15:03 -05:00
AlexTheCoder	62871686b0	Update clans store items to currency changes	2016-07-27 16:57:07 -04:00
cnr	dfbebe11f4	Use separate gold balances for each clans server	2016-07-27 15:52:07 -05:00
AlexTheCoder	031a9575ae	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans	2016-07-27 15:13:18 -04:00
AlexTheCoder	6180bea5cc	Update clans drop aesthetics and spawn/shop locations	2016-07-27 15:07:11 -04:00
xXVevzZXx	43c45f4094	add timer to dragon escape	2016-07-27 13:59:35 -05:00
Sam	8648581140	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-07-27 19:57:25 +01:00
Sam	ee38cb4c39	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-07-27 19:56:36 +01:00
Sam	888d3fb1aa	Payload logic progress	2016-07-27 19:56:31 +01:00
cnr	167c0f2b5e	Reimplement EnergyShopButton with new machinery	2016-07-27 13:52:03 -05:00
cnr	3cddf35d12	Refactor out legacy ConfirmationPage	2016-07-27 13:52:03 -05:00
cnr	3d0cc2a5fd	Refactor Clans gold dependency out of core	2016-07-27 13:52:03 -05:00
cnr	dc96258055	Merge branch 'feature/party-v2' into develop	2016-07-27 13:19:25 -05:00
Shaun Bennett	0d46bc4609	Add Amplifier thank button	2016-07-27 13:17:36 -05:00
Keir Nellyer	4dbbe6c32a	Allow Collector instance to be configured in parameters	2016-07-27 16:49:50 +01:00
Keir Nellyer	97d72e97e4	Variable refactorings for consistency	2016-07-27 16:09:38 +01:00
Keir Nellyer	f2435c3b43	Packet class refactorings	2016-07-27 16:08:23 +01:00
Keir Nellyer	20fc867578	Display rank 'ALL' as 'Player'	2016-07-27 15:52:22 +01:00
Keir Nellyer	d474139220	Don't show Punish GUI unless report result is ACCEPTED	2016-07-27 15:46:54 +01:00
Keir Nellyer	63917297ef	Show /report and /reportclose command usage when attempting to use the command incorrectly	2016-07-27 15:45:12 +01:00
xGamingDudex	72b5507390	Fixed PC-120	2016-07-27 12:29:07 +02:00
xGamingDudex	161381f393	Fixed PC-698	2016-07-27 12:09:59 +02:00
AlexTheCoder	157c969e8d	Completely prevent players in parties from joining Clans servers	2016-07-27 05:51:49 -04:00
AlexTheCoder	d162750aec	Keep nether loaded if its not empty	2016-07-27 04:47:03 -04:00
AlexTheCoder	ea3cb36d3a	Clean up miniboss mobs after their chunk unloads	2016-07-27 04:43:00 -04:00
AlexTheCoder	85cf005eba	Small clans economy changes	2016-07-26 22:33:19 -04:00
AlexTheCoder	9c700425fd	More javadocs	2016-07-26 22:32:46 -04:00
Keir Nellyer	2a167745a6	Update chatsnap url	2016-07-26 16:51:59 +01:00
AlexTheCoder	d98ca0ab3c	Remove unused miniboss	2016-07-26 09:00:37 -04:00
AlexTheCoder	bb5d766ba6	Patch war point evasion by committing suicide in safezones	2016-07-26 07:35:11 -04:00
AlexTheCoder	34d5fb5e24	Fix craters getting glitched in wilderness	2016-07-26 07:15:40 -04:00
AlexTheCoder	e396acc69c	Fix clans ips being added to the bungee rotator	2016-07-26 07:15:09 -04:00
AlexTheCoder	4df8de58a6	More javadocs	2016-07-26 05:51:42 -04:00
AlexTheCoder	bf5e9f1d76	ADD JAVADOCS TO CLANS	2016-07-26 05:50:43 -04:00
AlexTheCoder	61eca3ced0	Removed auto disguising from clans hub and removed clans tnt protection	2016-07-26 00:54:31 -04:00
AlexTheCoder	7b358adba1	Prevent runed pickaxe from destroying the nether	2016-07-25 20:26:23 -04:00
AlexTheCoder	b41ad2e087	Fix NPC orientation in clans hub	2016-07-25 12:28:25 -04:00
AlexTheCoder	aecaa89443	Update clans hub spawn location	2016-07-25 12:08:37 -04:00
AlexTheCoder	9a73784b7c	Make clans in the hub route through clans hubs	2016-07-25 11:18:10 -04:00
AlexTheCoder	a1fd021f8d	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans	2016-07-25 10:59:38 -04:00
AlexTheCoder	6f0d21120e	Serious tweaks to gameplay and begin documentation	2016-07-25 10:59:03 -04:00
AlexTheCoder	0ecdce4edc	Add clans hub to maven	2016-07-25 10:58:32 -04:00
AlexTheCoder	979bb92034	Allow treasure chests to be placed in other locations instead of fixing them in the main hub's configuration	2016-07-25 10:57:15 -04:00
AlexTheCoder	25b0ae5916	Add support for sending players back to any clans hub via portal	2016-07-25 10:56:30 -04:00
AlexTheCoder	275ab52f79	Create a clans-only hub	2016-07-25 10:55:18 -04:00
AlexTheCoder	9fab8366b7	Add support for clans hub connection inside bungees	2016-07-25 10:52:48 -04:00
TadahTech	5180e46be7	Revert party chat symbol to "@". Change team chat symbol to "#".	2016-07-24 22:17:50 -05:00
Sam	80eb7b2fd3	Gives Super Arrow on start.	2016-07-24 22:44:50 +01:00
Sam	576b92a5ce	Ultimates added to QuiverPayload	2016-07-24 22:06:14 +01:00
TadahTech	a23c2c4e1c	Update UI to reflect allowing upgrades to be shown, per kit.	2016-07-24 16:05:19 -05:00
Sam	ef797aa599	Velocity fix	2016-07-24 21:41:42 +01:00
Sam	76da92f42e	QuiverPayload added Basic implementation added	2016-07-24 21:27:31 +01:00
LCastr0	f4c40c61bb	Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics	2016-07-24 13:18:53 -03:00
LCastr0	195a82f78f	Github is annoying me about this, but I don't know what it is	2016-07-24 13:18:33 -03:00
LCastr0	0dce530438	PowerPlayClub managers and stuff	2016-07-24 13:15:32 -03:00
Sam	a8503d2fb8	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-07-24 11:50:48 +01:00
Sam	4728a50ca9	Small message change Avoids using two variables	2016-07-24 11:49:57 +01:00
TadahTech	ceccf2d2ac	Don't give the item when a game is in progress.	2016-07-23 22:36:53 -05:00
TadahTech	133376fb94	Relocation of Full server check in party invites. Fixes a bug where people cannot invite players to their party, regardless of which server they are on, when the inivters server is full.	2016-07-23 19:50:57 -05:00
Sam	50de769e36	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-07-24 00:13:13 +01:00
Sam	03b3c1864d	Map crumble issue Fixes an issue where the max distance of a map would not be calculated correctly affecting the map crumble	2016-07-24 00:12:48 +01:00
Sam	d3c9957f95	Ultimate length tweaks	2016-07-23 23:43:06 +01:00
Sam	43aae5e076	Ultimate visual and gameplay improvements	2016-07-22 22:47:29 +01:00
AlexTheCoder	818ed4c9a9	Set up clans monetization features in the shop and fix some hardcoded names in core	2016-07-22 00:18:34 -04:00
AlexTheCoder	869dfc1dfa	Finalize Amplifier system	2016-07-21 20:21:11 -04:00
TadahTech	5d0b5f80c0	Fix Party server sending. Tweak playercount and GUI display	2016-07-21 18:01:43 -05:00
Keir Nellyer	369246f635	Fix out of bounds statement parameter caused by earlier removal of report preferences	2016-07-21 23:11:48 +01:00
Keir Nellyer	c5f3f2b2d6	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-07-21 22:44:43 +01:00
AlexTheCoder	891a3231d8	Change banner GUI	2016-07-21 17:37:02 -04:00
AlexTheCoder	b87c6cfff0	Fix git removing class	2016-07-21 17:27:41 -04:00
AlexTheCoder	75cc75f40c	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans	2016-07-21 17:25:15 -04:00
AlexTheCoder	55c63364f2	Fix KOTH starting in other hub worlds and hub basketball teams always being null	2016-07-21 16:57:24 -04:00
TadahTech	2b8930eee8	Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2	2016-07-21 15:32:49 -05:00
TadahTech	d7c5184980	Party fixes and tweaks.	2016-07-21 15:24:48 -05:00
AlexTheCoder	286a7aa32a	Even more debug	2016-07-21 16:16:38 -04:00
AlexTheCoder	4a77a587f8	Fix git removing a class	2016-07-21 16:11:05 -04:00
AlexTheCoder	b5ce35544f	Fix merge conflict	2016-07-21 15:48:56 -04:00
AlexTheCoder	fc3ceddf4d	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game Conflicts: Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java	2016-07-21 15:47:59 -04:00
AlexTheCoder	97ef408e14	Debug	2016-07-21 15:46:48 -04:00
Shaun Bennett	9ed0bbe43a	Fix NPC's for unloaded worlds	2016-07-21 14:22:38 -05:00
xXVevzZXx	0262452b6a	Add enchantments to items, lower arrow spawn rate and limit, give players some steak and make armor unbreakable.	2016-07-21 13:59:35 -05:00
AlexTheCoder	11992129d1	Convert to EntityPortalEnterEvent	2016-07-21 14:01:08 -04:00
AlexTheCoder	d59882007b	Slightly increase boundaries	2016-07-21 13:55:09 -04:00
AlexTheCoder	37cf863625	Tiny fixes	2016-07-21 13:46:13 -04:00
AlexTheCoder	57f9f7db4b	Fix ClassCastException	2016-07-21 13:25:17 -04:00
AlexTheCoder	1f2b1557d5	Work on amplifiers and deleting banners when the clan is deleted	2016-07-21 13:20:45 -04:00
Keir Nellyer	9b58c53e90	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-07-21 16:11:09 +01:00
Sam	faece2c5f8	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-07-21 11:13:15 +01:00
Sam	f48009d9f8	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-07-21 11:12:23 +01:00
Sam	e7658b4bf2	New kits and upgrades for old kits	2016-07-21 11:05:21 +01:00
AlexTheCoder	e5cd38c11b	Revert enjin changes	2016-07-21 05:20:47 -04:00
AlexTheCoder	2615ef74dd	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans	2016-07-21 05:09:54 -04:00
AlexTheCoder	1dedde41a8	Banners and beginning javadocs	2016-07-21 05:09:31 -04:00
TadahTech	b48f97fd2e	Fix stupid JOOQ issue and IntelliJ.	2016-07-21 03:46:18 -05:00
TadahTech	b734dc4e87	Remove Pay wall for Party sizes	2016-07-21 02:59:15 -05:00
TadahTech	9f0f4e0018	Fix possible cross server invite spamming.	2016-07-21 02:20:02 -05:00
TadahTech	f1b3c4756d	Use UUID's instead of playernames.	2016-07-21 02:16:26 -05:00
TadahTech	4cab91f251	Use getPlayerExact.	2016-07-21 02:05:37 -05:00
TadahTech	76ac89266e	-sigh- a hotfix. Won't invite players across servers who are already in parties. Fix transferring ownership to non-party members	2016-07-21 02:05:10 -05:00
cnr	e7da161f35	Revert "Fixed PC-706" This reverts commit `96d16be5b7`.	2016-07-20 20:07:06 -05:00
cnr	b0f5b536b1	Merge branch 'feature/party-v2' into develop	2016-07-20 18:06:14 -05:00
Shaun Bennett	31d6a2542d	Replace runSync call with runAsync	2016-07-20 18:03:01 -05:00
Shaun Bennett	b136372d1b	Gem fountain changes; increase goal, link to eu	2016-07-20 18:03:01 -05:00
TadahTech	c3b7a81730	Don't show all buttons in all menus. Protected fields != private fields.	2016-07-20 17:48:24 -05:00
cnr	9a06cce0a0	Merge branch 'feature/party-v2' into develop	2016-07-20 16:41:50 -05:00
TadahTech	0fc64c45a8	Update JoinResponseReason	2016-07-20 16:33:26 -05:00
TadahTech	96261c1a6d	Party PR Updates.	2016-07-20 16:18:49 -05:00
TadahTech	67a185acc9	Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2	2016-07-20 15:52:59 -05:00
AlexTheCoder	ff210271c9	Add javadocs	2016-07-20 12:21:15 -04:00
AlexTheCoder	0b4c9d78ff	Finalize game integration into map	2016-07-20 11:22:14 -04:00
AlexTheCoder	29d52ac075	More work on Nether	2016-07-20 10:42:24 -04:00
Keir Nellyer	1ca7519963	Make index preservation faster	2016-07-20 13:19:21 +01:00
Keir Nellyer	85c1bc1728	Ensure returned list really is in the original order	2016-07-20 13:08:33 +01:00
TadahTech	136eb078ef	PC-426: Update UX for non-premium players: Removes the in game advertisement display when selecting servers. Removes all chat throttling. Adds a message sent on join to the player, promoting the newest sale or promotion.	2016-07-20 06:59:37 -05:00
Keir Nellyer	a78c71793a	Made filter method return results in the same order they were entered and generally improved method code	2016-07-20 12:46:10 +01:00
Keir Nellyer	48f9085c79	Small changes to report close functionality	2016-07-20 11:58:09 +01:00
Keir Nellyer	856f91da24	Update close report command syntax	2016-07-20 10:40:42 +01:00
Keir Nellyer	5c3f78b428	Fix query used to fetch report(s) account is handling	2016-07-20 10:40:03 +01:00
Sam	d53a917627	getAbilityDetails using map and list interface Changes so it uses the interface rather than the concrete class.	2016-07-19 22:38:32 +01:00
Sam	7e26480452	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-07-19 22:29:00 +01:00
Sam	3411a3b978	Throwable Dirt colliding issues Fixes the falling dirt block colliding with the thrower.	2016-07-19 22:28:56 +01:00
Sam	8b552a69de	Removal of debug message	2016-07-19 21:45:03 +01:00
Sam	765958a421	Code cleanup for PerkDirtCannon Cleans up some bad code in PerkDirtCannon and now removes the dirt blocks on death.	2016-07-19 20:51:14 +01:00
Sam	7470078da9	Typo in PerkFireBurst Should say Blaze Rod instead of Snowblock	2016-07-19 20:50:19 +01:00
Sam	588e32e1b1	Addition knockback perk for Earth Kit Adds a perk so that the Earth kit takes 75% less knockback while on the ground	2016-07-19 20:49:27 +01:00
Sam	0390822fd7	IceBridge item no longer droppable	2016-07-19 20:48:36 +01:00
Sam	63a0eebd02	Increased chance enchanted of armour	2016-07-19 20:48:12 +01:00
Keir Nellyer	80f0113183	Fix commands out of sync error by storing the result of the query	2016-07-19 17:56:27 +01:00
AlexTheCoder	0eac157701	Implement basketball features in the hub and begin setting up coordinates	2016-07-19 12:45:38 -04:00
Keir Nellyer	fccc1834a5	Rewrite view.php to work without MySQL native driver	2016-07-19 17:31:46 +01:00
Keir Nellyer	1c1825710d	Merge remote-tracking branch 'origin/feature/report-v2' into feature/report-v2	2016-07-19 16:38:19 +01:00
Keir Nellyer	37a06816dd	Modify /reportclose to no longer require a report id parameter	2016-07-19 16:37:53 +01:00
TadahTech	c32e647d9e	Add private messaging system	2016-07-18 22:21:09 -05:00
TadahTech	ce4289fa00	Don't do weather.	2016-07-18 22:13:32 -05:00
TadahTech	c8075b2b47	Merge remote-tracking branch 'origin/feature/party-v2' into feature/party-v2	2016-07-18 19:04:26 -05:00
TadahTech	b4aa303923	Bug fixes.	2016-07-18 19:04:02 -05:00
TadahTech	36f2873e15	Map Parser update.	2016-07-18 19:00:11 -05:00
AlexTheCoder	5ecfaef413	Merge branch 'feature/mavericks-master-builders' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game	2016-07-18 16:28:22 -04:00
AlexTheCoder	c58d226680	More work on Nether and Runes	2016-07-18 16:26:05 -04:00
Keir Nellyer	d9240e1589	Invalid PHPDoc made me write bad code :P	2016-07-18 19:29:05 +01:00
Keir Nellyer	ca835bb4c6	Remove all try...finally clauses as they aren't supported in PHP 5.4	2016-07-18 19:08:37 +01:00
Keir Nellyer	976e8788b7	Update report message if a player reports another player multiple times	2016-07-18 18:37:21 +01:00
Keir Nellyer	103f31afc1	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-07-18 17:17:11 +01:00
Keir Nellyer	17c7f36b04	Fix getInvolvedUsers not getting reporters	2016-07-18 14:37:23 +01:00
Keir Nellyer	c89b35f2f1	Remove redundant categories array	2016-07-18 14:36:21 +01:00
AlexTheCoder	4238a1c385	Implement rune system and main nether minibosses	2016-07-17 07:14:08 -04:00
xXVevzZXx	370b0693d9	fix the server thinking it's the next week	2016-07-17 05:20:21 -05:00
cnr	0ae4b0c5e0	Temporarily disable anti-xray in UHC	2016-07-16 23:08:18 -05:00
AlexTheCoder	98e88d1b77	Disable bosses not scheduled for initial releases	2016-07-16 22:00:38 -04:00
AlexTheCoder	08850d909f	Further work on brood mother boss and nether	2016-07-16 21:59:03 -04:00
LCastr0	7c300acaa3	No particles for vanished players!	2016-07-16 20:00:21 -03:00
Sam	e2af4df44b	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-07-16 21:22:57 +01:00
Shaun Bennett	34f718b2ec	Fix improper gem/shard reward handling	2016-07-16 06:27:16 -05:00
Sam	30111eb940	Duplicate enchantment fix	2016-07-16 11:16:57 +01:00
Sam	951e07488a	GI changes from testing session	2016-07-16 11:15:33 +01:00
Sam	f012e8d4ed	Merge from develop	2016-07-16 08:41:15 +01:00
Sam	8523d56bbf	Merge fix	2016-07-16 08:33:41 +01:00
Keir Nellyer	6756d04aa7	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-07-15 23:56:08 +01:00
Keir Nellyer	3a8722a1a2	Remove redundant files and variables	2016-07-15 23:54:20 +01:00
Sam	d901fce3ac	Experimental Skywars Kits	2016-07-15 23:07:17 +01:00
Keir Nellyer	0d9aad37f9	Optimise imports	2016-07-15 16:31:25 +01:00
xXVevzZXx	728a91da0f	adding damage outsid ethe loop	2016-07-15 04:57:44 +02:00
xXVevzZXx	3070835662	enable armor protection and fix shotguns	2016-07-15 04:39:53 +02:00
xXVevzZXx	6c7f2d8b0d	fix damage in DM prepare, eating grenades and no health regen	2016-07-15 02:28:22 +02:00
Keir Nellyer	f0c2686ca7	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-07-14 23:01:11 +01:00
Keir Nellyer	16f451efba	Add MySQL upgrade scripts	2016-07-14 22:59:56 +01:00
Keir Nellyer	da7806147d	These brackets don't need to be here	2016-07-14 22:39:59 +01:00
Keir Nellyer	7b5adc717d	Prevent non-handlers from closing a report	2016-07-14 22:16:53 +01:00
Keir Nellyer	1885854bc4	Simplify and shorten createReport method	2016-07-14 22:06:25 +01:00
Keir Nellyer	209ca20959	Rename "reportPlayer" to "createReport" for method name consistency	2016-07-14 21:13:06 +01:00
Keir Nellyer	f75806d2dd	Ensure messages shown to players are consistent	2016-07-14 21:11:43 +01:00
Keir Nellyer	4ed51b5747	Fix getProfiles and getReports methods	2016-07-14 21:01:49 +01:00
Keir Nellyer	65e8b92c1a	Small refactorings (class relocations and renames)	2016-07-14 20:15:14 +01:00
Keir Nellyer	15b5198dbb	Ensure words are fully capitalised Previously only the first word was capitalised.	2016-07-14 19:25:53 +01:00
Keir Nellyer	7f48151c8c	Made handler messages slightly more prettier	2016-07-14 19:19:16 +01:00
cnr	d54e47d8ea	Check for uptimes field	2016-07-14 11:22:10 -05:00
cnr	a0847b8d1a	Fix null ServerGroup uptimes value for MPSes	2016-07-14 08:08:24 -05:00
cnr	1a2e0df6ca	Only allow OPs to use minestrike debug commands	2016-07-14 07:28:33 -05:00
cnr	1d1c3ef1be	Merge branch 'thanos-mineware' into develop	2016-07-14 03:41:00 -05:00
Thanos Paravantis	40345bc93c	Fix Bawk Bawk Battles game start	2016-07-14 11:23:39 +03:00
cnr	4d0903dba7	Fix compile error	2016-07-14 03:11:59 -05:00
Shaun Bennett	e28320b361	Fix disableCustom not firing properly	2016-07-14 02:47:49 -05:00
cnr	7cc44c8bfc	Merge branch 'thanos-mineware' into develop	2016-07-14 00:22:01 -05:00
Thanos Paravantis	906762e9db	Remove debug commands	2016-07-14 08:17:36 +03:00
cnr	917b83250d	Revert "Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing" This reverts commit `30287a0832`, reversing changes made to `b8650d741d`.	2016-07-14 00:10:37 -05:00
samczsun	7dcf7378ef	Many changes Fix spectator race condition Refactor out cut clean into modules Add combat log module Add antixray module	2016-07-13 21:30:54 -05:00
cnr	a7b30f4f59	Merge branch 'thanos-mineware' into develop	2016-07-13 21:26:25 -05:00
cnr	4343fa3512	Merge branch 'project-cosmetics' into develop	2016-07-13 21:22:41 -05:00
Shaun Bennett	a34ac42093	Amplifiers adjustment - shards only	2016-07-13 19:26:23 -05:00
LCastr0	6af04b5438	Fixes for winroom gadget disable messages	2016-07-13 18:21:08 -03:00
Thanos Paravantis	6082418fc7	Update game tags on the hub game compass	2016-07-13 23:59:37 +03:00
Thanos Paravantis	4e985b85e6	Make final challenge changes - Increase Color Change delay - Make Tag Master not count for players jumping into the void	2016-07-13 23:59:01 +03:00
Shaun Bennett	369dabffae	Amplifier updates - move to boost shards only	2016-07-13 15:07:24 -05:00
Thanos Paravantis	711a04ffa8	Add Bawk Bawk Battles to hub compass	2016-07-13 21:40:31 +03:00
Thanos Paravantis	3497a4c095	Remove unused debug messages	2016-07-13 19:29:48 +03:00
AlexTheCoder	9c3aee6373	Convert all possible gem vote rewards to treasure shard vote rewards to comply with Mojang EULA	2016-07-13 11:17:24 -05:00
Thanos Paravantis	6c11b718af	Remove suppress warnings annotations	2016-07-13 19:03:39 +03:00
Thanos Paravantis	dab3e09837	Achievement fixes, minor challenge changes - Fishing Day was marked as deprecated. - Surf Up will no longer track waves in which players were killed. - Make Bouncing Shadow not count players that lost. - Tag Master will now select alive players only. - Removed debug messages.	2016-07-13 18:52:14 +03:00
Thanos Paravantis	ad32f4e2f1	Remove unnecessary new string declaration	2016-07-13 18:05:35 +03:00
Thanos Paravantis	839d9263fd	Prevent game crash if started with one player	2016-07-13 18:03:38 +03:00
Thanos Paravantis	efce89a7e7	Fix Color Change platforms not removed properly	2016-07-13 17:47:17 +03:00
Thanos Paravantis	2e5d7c023f	Fix Tag Master, show bouncing block full score	2016-07-13 17:13:02 +03:00
AlexTheCoder	2034b5536e	Update and enable Clans Freezing	2016-07-13 09:42:46 -04:00
cnr	7df228a8fa	Move WinEffectGadget schematics to update folder	2016-07-13 06:36:42 -05:00
Thanos Paravantis	6cef42d7a4	Fix merge issues	2016-07-13 13:36:59 +03:00
Thanos Paravantis	179b59af2c	Merge branch 'develop' into thanos-mineware	2016-07-13 13:28:03 +03:00
Thanos Paravantis	943dc88ca4	Modify challenge list, change display messages	2016-07-13 13:23:15 +03:00
cnr	e40abd4859	Merge branch 'thanos-mineware' into develop	2016-07-13 05:04:50 -05:00
Sam	2f6e140b34	Item in hand change (Devourer) Changes the item in the NPC's hand for Devourer from OBSIDIAN to a DIAMOND_CHESTPLATE	2016-07-12 21:57:37 +01:00
Sam	5382afedda	Sharpshooter arrow limit changed to 4	2016-07-12 21:56:25 +01:00
cnr	85db0ad613	Remove global rawr	2016-07-12 15:51:47 -05:00
xXVevzZXx	654ab281ea	Add option of "uptimes" to servergroups	2016-07-12 15:44:29 -05:00
Thanos Paravantis	0f3b2da8b7	Fix Bouncing Block, re-add features for testing	2016-07-12 23:02:01 +03:00
cnr	daddaa477e	Merge branch 'update/brawl-games' into develop	2016-07-12 06:45:32 -05:00
AlexTheCoder	f0db20dbc2	Fix some minor spelling and grammar issues and implement a requested player freezing system for Clans	2016-07-12 05:21:50 -04:00
AlexTheCoder	3acca23e7e	Remove emerald drops from Skeleton King minions and decrease the range EventCreatures can go from their spawn	2016-07-12 05:20:22 -04:00
xXVevzZXx	9cf5a6fb9e	Fix Absorption in OP MB, add more arrows to OP MB, fix not being able to purchase primary weapon in MS, fix skin bug in MS and fix helmet drop when scoping in Strike Games	2016-07-12 05:39:21 +02:00
xXVevzZXx	ac8a920484	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/brawl-games # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/GunModule.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/Gun.java	2016-07-12 03:07:31 +02:00
Sam	5bf0ef545b	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-07-11 23:19:39 +01:00
AlexTheCoder	d3270b9289	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans	2016-07-11 14:50:16 -04:00
AlexTheCoder	30287a0832	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing	2016-07-11 14:46:08 -04:00
AlexTheCoder	69c9ef8074	Implement small ability tweaks for Game Insights team	2016-07-11 14:45:54 -04:00
Sam	f40299e402	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-07-11 18:34:48 +01:00
AlexTheCoder	0be317e5be	Implement tweaks and finalize implementations for bosses and fix loot dropping bugs	2016-07-11 11:36:48 -04:00
Thanos Paravantis	6a87be13f0	Remove features that contain bugs	2016-07-11 01:02:19 +03:00
Keir Nellyer	e1adf7d4e2	JavaDocs	2016-07-10 13:32:20 -04:00
Thanos Paravantis	416b978c4f	Apply chicken attack and completion improvements - Chicken spectators will no longer receive the compass to prevent them from teleporting near players. - The winner of the game will not see the "You have completed the challenge." message as the game will end afterwards.	2016-07-10 15:16:17 +03:00
Thanos Paravantis	5a7e7c7623	Challenge bug fixes and improvements - Added crumble feature to Block Lobbers - Increased TNT height on Water Horror - Increased Lava Run difficulty - Fixed unclickable Bawk's Food Kit - Fixed chickens not attacking properly on chicken attack - Fixed dominant team not winning on team based challenges - Fixed spectators being able to break blocks on Treasure Digger	2016-07-10 13:32:24 +03:00
Keir Nellyer	3b38a0ab65	Make interval display seconds when interval is less than a minute	2016-07-09 23:51:48 -04:00
Keir Nellyer	e607960b6a	Fix time intervals on report site not displaying correctly Before this would display values such as "0 minute ago" and "1 minutes ago".	2016-07-09 23:48:14 -04:00
Keir Nellyer	b808121d68	Make ReportResult and ReportMessage timezone friendly. This switches all if not most of the report feature code to using the new Java 8 date time API since it is much better for handling timezone's. This commit also creates a few new methods in UtilTime as they are used throughout the "report" and "chatsnap" packages. They may also come in useful for other developers using timezones.	2016-07-09 23:41:39 -04:00
Keir Nellyer	3f8eaf0da7	Missing semi-colon	2016-07-09 22:56:32 -04:00
Keir Nellyer	be8050a556	Make player ranks display better on report site	2016-07-09 22:47:38 -04:00
Keir Nellyer	edf63dcafd	Print exceptions for everything!!!	2016-07-09 18:09:26 -04:00
Keir Nellyer	ac95a59f81	Mark reports as expired when an expired report is detected Also wrote JavaDocs for expireReport and saveReport methods.	2016-07-09 15:47:31 -04:00
Keir Nellyer	d7736e9e02	Wait until report data has been saved to the database, otherwise the message task will not function until it's second iteration	2016-07-09 15:32:46 -04:00
Keir Nellyer	400a6adab2	Show message when report has been closed Also run Bukkit API methods synchronously.	2016-07-09 15:24:41 -04:00
Keir Nellyer	e26ced1438	First report handler detail message should be instant	2016-07-09 14:59:27 -04:00
Keir Nellyer	5c6cac2849	Remove debug line	2016-07-09 14:57:55 -04:00
Keir Nellyer	c909cd4733	A report is active if it is being handled but has not yet been closed	2016-07-09 14:55:42 -04:00
Keir Nellyer	6a78556fda	Ninja fix for previous commit	2016-07-09 14:49:00 -04:00
Keir Nellyer	aadb3df715	A report is no longer active if a result for it has been set	2016-07-09 14:48:26 -04:00
Keir Nellyer	29b1110f6b	Access to SnapshotsManager inside ReportManager is no longer required	2016-07-09 14:40:17 -04:00
Keir Nellyer	1eb3fb4aa3	Modify GET_REPORTS_HANDLING query to ignore closed reports	2016-07-09 14:38:12 -04:00
Keir Nellyer	c98c352546	Prevent reputation from being 0, this causes all reports the player opens to be instantly closed	2016-07-09 14:37:23 -04:00
Keir Nellyer	87df6804c9	Improve code and error logging	2016-07-09 14:36:30 -04:00
Keir Nellyer	0783f3b693	Fix sql error when a report is closed due to expiration	2016-07-09 11:31:51 -04:00
Thanos Paravantis	a9f41ab269	Refactor project classes	2016-07-09 12:00:06 +03:00
Keir Nellyer	abea5bbf81	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-07-08 23:27:07 -04:00
Keir Nellyer	5c83f09456	SnapshotRepository no longer extends MinecraftRepository It doesn't need to.	2016-07-08 23:26:33 -04:00
Keir Nellyer	d9288277d5	Push chat snapshots from all servers This fixes an issue whereby the handler would not be able to see chat snapshots unless they begin the handling process whilst connected to the same server as the offender.	2016-07-08 23:22:55 -04:00
xGamingDudex	b8650d741d	Fixed PC-707 Fixed arrows damaging the shooter. Fixed all instances of arrows bouncing of targets.	2016-07-08 16:48:17 -05:00
xGamingDudex	96d16be5b7	Fixed PC-706 Tweaked settings to reasonable values in local testing.	2016-07-08 16:48:11 -05:00
Timothy Andis	2cac4c9c66	Remove toLowerCase owner method	2016-07-08 16:17:48 -05:00
Keir Nellyer	a0d046ab8b	Optimize getting of ReportProfile's from database	2016-07-08 17:14:41 -04:00
Sam	d7f71f2d15	Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple	2016-07-08 22:10:20 +01:00
Sam	34565b2975	PC-699 /bc in MPS is now protected by the filter	2016-07-08 22:09:48 +01:00
TadahTech	cbb0fa37fb	Lang tweaks.	2016-07-08 15:32:25 -05:00
cnr	5b98bfddce	Update YouTube link to landing + sub confirmation	2016-07-08 15:20:50 -05:00
Sam	07b65ad1c9	PC-621 Doors can now be opened in Block Hunt	2016-07-08 21:01:15 +01:00
Sam	af9611dcfd	Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple	2016-07-08 21:00:34 +01:00
Thanos Paravantis	331c1bcf91	Merge branch 'develop' into thanos-mineware	2016-07-08 22:29:59 +03:00
Thanos Paravantis	7887c96cc9	Decrease delay between challenges	2016-07-08 22:28:53 +03:00
TadahTech	1313db4071	Commit lost file.	2016-07-08 14:06:16 -05:00
Thanos Paravantis	7ba7414101	Improvements, refactoring and bug fixes - Fixed heights not being calculated correctly on Kangaroo Jump. - Fixed platform not being removed entirely on Color Change (needs confirmation). - Fixed death effect items not spawning on Treasure Digger. - Fixed TNT not reaching players on Water Horror. - Fixed Dogs Vs Cats hologram being displayed continuously (flashing) (needs confirmation). - Increased score hologram elevation rate. - Spawn locations are automatically centered. - Border is now far away from challenges. - Refactored main game class.	2016-07-08 21:30:43 +03:00
TadahTech	ce72d25832	Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2	2016-07-08 13:09:02 -05:00
TadahTech	8c7308add5	Add documentation. Refactor code. Remove most command backend capabilities to limit user error. Cleanup.	2016-07-08 13:08:34 -05:00
Sam	42c578be9d	PC-612 Fixes an issue that removing Co-host from someone would remove their creative mode in Master Builders.	2016-07-08 17:54:42 +01:00
Sam	c16f9ec9ec	PC-688 Changes the description in Draw My Thing so that it reflects changes made to the tip system.	2016-07-08 17:53:22 +01:00
Sam	c607654c51	PC-692 Fixes an issue that allowed staff spectators to damage the King in Castle Siege	2016-07-08 17:50:33 +01:00
Sam	7940eeb0ee	PC-633 Allows humans in Wither Assault to place blocks under the map, allowing them to no longer get stuck	2016-07-08 17:49:38 +01:00
Sam	aae24d862a	Revert "PC-692" This reverts commit `7865b1ef80`.	2016-07-08 17:38:53 +01:00
Sam	7865b1ef80	PC-692 Allows humans in Wither Assault to place blocks anywhere so that players are not able to get stuck in the ground	2016-07-08 17:37:32 +01:00
Alex-The-Coder	e8a1c9bcba	Add damage check to the Enchantment Handler... ...to avoid performing calculations where it is not necessary	2016-07-08 07:42:00 -04:00
xGamingDudex	4aad663bec	Left over from merge	2016-07-08 03:59:16 +02:00
xGamingDudex	5349d26115	Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into feature/mavericks-master-builders	2016-07-08 03:41:13 +02:00
xGamingDudex	d276d8ca5d	Removed "Failure" feature and cleaned some code	2016-07-08 03:40:37 +02:00
Keir Nellyer	1ce1c796f4	Repository classes no longer need to extend MinecraftRepository	2016-07-07 21:12:08 -04:00
Keir Nellyer	b9f1dcbcd5	Make method `getReportPrefix(Report)` simpler	2016-07-07 21:05:41 -04:00
Keir Nellyer	8d2916c23e	Create JavaDoc's for all methods in ReportManager	2016-07-07 21:04:16 -04:00
xGamingDudex	c50ec49ad9	Minor updates Tweaked some location values. Added more event handling to the reveiw hub and mavericks hub. Added builder info holograms to all sides of the display slots in the mavericks hub.	2016-07-08 02:59:33 +02:00
Keir Nellyer	cb555a41ab	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-07-07 20:47:19 -04:00
xGamingDudex	2659e9be09	Removed failure and smaller updates	2016-07-08 02:06:34 +02:00
Keir Nellyer	0dc17bf6fa	Further code cleanup	2016-07-07 18:12:52 -04:00
Keir Nellyer	58df3022a5	Completely remove old staff notifications system	2016-07-07 18:08:19 -04:00
Sam	da9ad913b2	Finalisation of update	2016-07-07 23:03:23 +01:00
Keir Nellyer	dc566c8fb3	Remove redundant ReportServer entry from Maven POM	2016-07-07 17:59:55 -04:00
Keir Nellyer	bc2b7884ee	Make this code a lot smarter	2016-07-07 17:57:19 -04:00
Keir Nellyer	e6de1ec13e	Renamed for easier understanding of the class's function	2016-07-07 17:51:05 -04:00
Keir Nellyer	aab5daa446	Remove old ReportServer and move site related files to ReportSite directory	2016-07-07 17:49:06 -04:00
Keir Nellyer	4361379eaa	Close expired reports when they are detected This improves performance and allows for easier database maintenance.	2016-07-07 15:35:47 -04:00
Keir Nellyer	4e0287ad03	Re-import report feature classes in Hub and Arcade	2016-07-07 14:01:18 -04:00
Keir Nellyer	77a98bc250	Remove spammy and useless report notifications	2016-07-07 13:58:09 -04:00
Keir Nellyer	fa02b18ffb	These shouldn't be batched as there will only ever be a single query	2016-07-07 13:28:08 -04:00
Keir Nellyer	175c3523f8	Remove todo relating to removal of database cleanup of chat entries after a report has been closed An external cleanup job/script will be used to remove old data	2016-07-07 13:19:42 -04:00
xXVevzZXx	783b20a0dc	Disable champions abilities in smash dom and disable supply chests, adjust peace announcement in Strike games, Absorbtion fix in OP MB, Countdown in CHanging Kits, more Arrows in OP MB, regen hunger in skysmash, scoped players drop helmets now, fix stuff with identifiers in GunModule	2016-07-07 15:08:57 +02:00
cnr	443576ba1a	Update YouTube link and send shard reward message	2016-07-06 20:15:41 -05:00
samczsun	63b6158fe4	More UHC Fixes Fixes: PC-137 PC-138 PC-497 PC-665 PC-710 PC-719 PC-754 Also fixes chunk synchronization issue, plugs potential memory leaks Fancy spectating Use enum priorities	2016-07-06 15:55:12 -04:00
Shaun Bennett	8cf470cfd0	Update fountain goals	2016-07-06 13:39:56 -05:00
cnr	17f89f6937	Merge branch 'project-cosmetics' into develop	2016-07-06 13:00:29 -05:00
Thanos Paravantis	04f0ef199c	Make CustomFirework singleton class public	2016-07-06 20:47:28 +03:00
LCastr0	63500c19c9	Removed commented lines Added javadocs to GadgetChangeEvent	2016-07-06 14:45:05 -03:00
Thanos Paravantis	989dd98212	Fix players not losing on Pick a Side	2016-07-06 20:41:26 +03:00
Thanos Paravantis	6a66d6cc92	Lower barrier spawn chance on Cloud Fall	2016-07-06 20:40:51 +03:00
Thanos Paravantis	7319965c45	Temporarily fix challenge completion/lose issues	2016-07-06 20:40:15 +03:00
Thanos Paravantis	47f62e2c89	Make lava run a bit more difficult	2016-07-06 20:39:37 +03:00
xXVevzZXx	36285ee101	Improve GunModule with editable variables	2016-07-06 18:55:13 +02:00
xXVevzZXx	4dedd27227	finish up editing of arrays for gamemodes	2016-07-06 18:34:15 +02:00
Thanos Paravantis	185ba600ca	Merge branch 'develop' into thanos-mineware	2016-07-06 17:48:31 +03:00
Thanos Paravantis	e326fd322c	Update Pick a Side, refactor Reverse Tag	2016-07-06 17:45:51 +03:00
Thanos Paravantis	29434b786e	Apply completion/lost bug fixes	2016-07-06 17:45:22 +03:00
xXVevzZXx	3e77ce0f00	make arrays parseable by variables	2016-07-06 14:03:41 +02:00
xXVevzZXx	a430f7e94d	Add chat messages for Peace Phase, remove arrows from chests, disable crafting, fix dropped pumpkins and disable weapon enchantments	2016-07-06 13:45:31 +02:00
Thanos Paravantis	ab4174cfb9	Refactor Red Light, Green Light and Volley Pig	2016-07-06 12:04:04 +03:00
Thanos Paravantis	e0d133ab67	Broadcast a message when timer runs out	2016-07-06 11:10:57 +03:00
Thanos Paravantis	de74716abf	Refactor Treasure Digger and Volley Pig	2016-07-06 11:10:21 +03:00
Thanos Paravantis	ae60d05bbb	Refactor Wave Crush	2016-07-06 10:25:20 +03:00
Thanos Paravantis	b40346417a	Remove unused project files	2016-07-06 10:25:05 +03:00
LCastr0	67adb34311	Fixes for the WinRooms Removed Freedom Chests from the menu	2016-07-06 00:00:50 -03:00
AlexTheCoder	eccd7deedc	Fix merge errors and properly force disable particles by checking the game's settings	2016-07-05 17:25:01 -04:00
AlexTheCoder	8c93f92a92	Tweak all Necromancer abilities so they function well together and give the Necromancer a semi-AI for movement	2016-07-05 17:08:38 -04:00
Thanos Paravantis	0eab6db116	Soccer bug fixes and minor improvements - Slimeball will no longer be able to get stacked. - Players in soccer mode will not able to stack others. - Guardian lazer can no longer be used in the soccer field. - Players in soccer won't get knockback, except if they double jump.	2016-07-05 15:39:10 -05:00
Thanos Paravantis	607b92984e	Fix hologram elevation speed	2016-07-05 23:18:29 +03:00
Keir Nellyer	67213ec696	Tie all these together	2016-07-05 16:14:30 -04:00
TadahTech	9f58e57a67	Bug fixes.	2016-07-05 14:35:37 -05:00

... 14 15 16 17 18 ...

9749 Commits