1002 Commits

Author	SHA1	Message	Date
Jesse Boyd	d31dbc7c7c	Fix debugimportworlds 1.13 ... because someone changed PlotId.fromString to throw an exception without updating things that call it	2019-04-17 22:07:33 +10:00
Jesse Boyd	000e3de35d	Don't allow importing using base directory	2019-04-17 14:36:31 +10:00
Jesse Boyd	7e63ffe745	Optimize vanilla world generation* ... *For single plot worlds Reuse base world data. Instead of taking several seconds, it should now take tens of milliseconds.	2019-04-17 14:30:05 +10:00
Jesse Boyd	0fdc5eafbd	Allow single plot areas to load survival worlds	2019-04-17 13:46:33 +10:00
Jesse Boyd	59f89980a3	Don't need ratio out of 100 anymore	2019-04-17 13:13:56 +10:00
Jesse Boyd	50acf4f51f	Print exception on failed schematic setup	2019-04-13 13:06:21 +10:00
Jesse Boyd	6916752434	Fixes #2322	2019-04-12 12:11:03 +10:00
Jesse Boyd	6cea26f436	Add random collection	2019-04-10 17:10:44 +10:00
Jesse Boyd	533edc5f40	Change default threshold to -1	2019-04-10 17:10:17 +10:00
Jesse Boyd	97903f3870	Fix you are not in a plot area for single plot worlds	2019-04-10 11:34:21 +10:00
Jesse Boyd	9225a13808	sorry for breaking roads	2019-04-09 00:29:13 +10:00
Jesse Boyd	5d515b3863	This shouldn't have been made private	2019-04-06 12:55:45 +11:00
Jesse Boyd	676ef0159a	only change plotY if height not 256	2019-04-06 03:54:27 +11:00
Jesse Boyd	3e3951a3e7	*negate	2019-04-06 02:07:39 +11:00
Jesse Boyd	c71fe00741	Missed this as well	2019-04-06 02:07:14 +11:00
Jesse Boyd	69a029a555	Fix plot schematic y	2019-04-06 01:54:02 +11:00
Sauilitired	3f194f90ce	Unbreakify things	2019-04-04 18:31:47 +02:00
Sauilitired	7e401a83cf	Make PlotLoc's immutable	2019-04-04 18:26:10 +02:00
dordsor21	69b05932eb	Update to gradle 5. gradlew clean assemble build actually WORKS	2019-04-03 17:15:09 +01:00
Sauilitired	f5388b9737	Merge remote-tracking branch 'origin/breaking' into breaking	2019-04-01 17:40:10 +02:00
Sauilitired	6323fb0041	Add plot like/dislikes	2019-04-01 17:39:28 +02:00
Jesse Boyd	b1835f0998	whoops, wrong schematic	2019-04-01 21:45:55 +11:00
Jesse Boyd	1c9c0d0207	Schematic fixes ... The 1.13 schematic format uses the `.schem` extension, use that instead Support loading both legacy `.schematic` and `.schem` files for road schematics Fix reading road schematics with an offset	2019-04-01 21:39:10 +11:00
Sauilitired	0f8b7cd588	fixes #2211	2019-04-01 11:14:47 +02:00
Sauilitired	c450e4aed3	Fix interval flags (fixes #2302)	2019-04-01 10:17:50 +02:00
Sauilitired	14badf8cfc	remove rogue debug message	2019-04-01 09:43:29 +02:00
Sauilitired	df3e78ee40	Make the "Display all commands" message configurable too	2019-04-01 09:04:19 +02:00
Sauilitired	11689bf855	Configurable help categories	2019-04-01 09:00:08 +02:00
Sauilitired	4152582ae0	Fix UUID related NPE	2019-04-01 08:35:06 +02:00
Jesse Boyd	3be7511b7c	Fix genChunk setCuboid	2019-04-01 05:01:32 +11:00
Jesse Boyd	f3adeeac0e	Fix single plot area NPEs & generator stackoverflow	2019-04-01 04:44:18 +11:00
Jesse Boyd	67cf1b45ed	Fix another legacy converter NPE	2019-04-01 04:43:44 +11:00
Jesse Boyd	04b9b67c9d	Fixes #2288	2019-03-31 18:31:16 +11:00
Sauilitired	45360f0979	Make sure /plot home ignores server owned plots	2019-03-30 13:32:45 +01:00
Sauilitired	ae57264487	Add server-plot flag, and option to disable on-claim teleportation	2019-03-30 13:27:18 +01:00
Sauilitired	08ebf57c90	Add hide-info flag	2019-03-30 12:50:32 +01:00
Sauilitired	c6ae2456f2	Add support for Paper async chunk generation	2019-03-26 09:27:20 +01:00
Sauilitired	0b77b863ba	Update notifications.	2019-03-18 19:49:22 +01:00
matt	61cb288382	oops sorry. ... Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>	2019-03-15 13:39:51 -04:00
matt	7f14e88c4c	last commit before 4.0.0 ... Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>	2019-03-14 21:49:33 -04:00
matt	ed3cadd439	Formatting fixes and minor performance improvement ... Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>	2019-03-08 19:25:59 -05:00
matt	56c24a6a56	Type weakening and Direction changes ... Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>	2019-03-06 12:47:38 -05:00
matt	4c8457ad14	OCD ... Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>	2019-02-22 11:54:13 -05:00
matt	1755272f81	Merge remote-tracking branch 'origin/breaking' into breaking	2019-02-22 11:51:22 -05:00
matt	25530ed7f0	Doc Updates, Renaming, Reformatting, and a Test ... Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>	2019-02-22 11:51:06 -05:00
dordsor21	53e732b4fe	Make replacing wall on merge configurable ... In case people are doing fun things with road schematics etc :)	2019-02-22 15:21:44 +00:00
dordsor21	7aebd9b74b	Set wall filling on merge	2019-02-22 15:11:35 +00:00
dordsor21	be51d8e159	Correct artifact id for maven	2019-02-22 14:38:18 +00:00
matt	bfc6b62213	Stupid docs ... Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>	2019-02-21 21:31:12 -05:00
matt	a9bebb10da	Merge remote-tracking branch 'origin/breaking' into breaking ... # Conflicts: # Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEExtent.java	2019-02-21 21:18:03 -05:00
matt	2f18ef6828	Critical bug fixes, reformatting, and cleaning ... Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>	2019-02-21 21:14:48 -05:00
dordsor21	350e151214	Don't use streams as they're lower performance for our use cases. ... Some minor reformating too.	2019-02-20 14:50:49 +00:00
dordsor21	d0a4465985	Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking	2019-02-20 11:55:50 +00:00
dordsor21	0ef8b4ad14	Update to WorldEdit's *breaking* Biome handling changes	2019-02-20 11:55:39 +00:00
matt	c5d9412c6c	Cleaning and API Addition ... Begins the process of removing "magic values" for directions in the plugin. Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>	2019-02-19 22:57:35 -05:00
matt	92718a5ec8	Merge branch 'consumers' into breaking	2019-02-19 22:29:59 -05:00
matt	099a807ce0	CLeaning of code ... Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>	2019-02-19 22:29:27 -05:00
matt	df47697ca6	CLeaning of code ... Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>	2019-02-19 19:00:37 -05:00
matt	b7aeeb151d	Replace RunnableVal with java Consumer ... Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>	2019-02-19 18:39:43 -05:00
matt	a64d764cc1	New API method, more 1.13 entity support, and cleanup. ... Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>	2019-02-15 12:50:43 -05:00
dordsor21	477e698f7e	Reformat	2019-02-13 17:13:57 +00:00
matt	11c4a90cc9	Merge remote-tracking branch 'origin/breaking' into breaking	2019-02-13 12:05:42 -05:00
matt	35493662da	Cleanup ... Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>	2019-02-13 12:05:28 -05:00
dordsor21	3e8308ecd7	Catch statement already being null	2019-02-13 13:35:19 +00:00
matt	17027e6292	Javadoc changes and cleaning of old unused code ... Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>	2019-02-08 14:49:37 -05:00
matt	e891873d28	Cleaning and scope changes ... Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>	2019-02-08 11:21:53 -05:00
matt	b39ea1b68b	Cleaning and API clarifications ... Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>	2019-02-06 21:29:51 -05:00
matt	3d8179a4e6	Small tweaks ... Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>	2019-02-06 17:30:25 -05:00
matt	9101cb9218	PlotComment API tweaks. ... Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>	2019-02-06 12:33:14 -05:00
dordsor21	d6a801d854	Reformat	2019-02-06 16:42:27 +00:00
matt	0c780166e0	Documentation and PlotId updates ... minor code tweaks in the plot class too Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>	2019-02-06 00:10:05 -05:00
matt	9a23b718f3	Cleanup of various methods ... mainly just more lambda's Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>	2019-02-05 19:41:03 -05:00
matt	e3d43509cf	Cleanup of some database methods ... Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>	2019-02-04 18:00:05 -05:00
matt	dfbcecb081	Removes Cluster Flags ... Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>	2019-02-04 12:46:27 -05:00
dordsor21	cf82bc5efb	Revert 8ac9b86	2019-02-04 15:18:50 +00:00
dordsor21	51afbdfcdc	Apply correct codestyle	2019-02-04 13:59:11 +00:00
matt	8ac9b862f8	Major cleanup. ... Added todo comments to many 1.13 issues still lingering. Changed access to some methods to be weaker. Removed cluster flags (most of it). Java 8 stuff added. Hid more PlotSetting methods. etc. Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>	2019-01-31 14:20:48 -05:00
NotMyFault	cd8a1a0816	Fixed some translation mismatches	2019-01-27 00:48:03 +01:00
dordsor21	25ed9d2798	Fix road schematic pasting height	2019-01-23 12:23:05 +00:00
Sauilitired	c96a1afaed	Don't fuck up road schematics, I guess	2019-01-22 21:32:24 +01:00
Sauilitired	344a2afeff	Use StringBuilder, like a sane person	2019-01-22 19:54:31 +01:00
Sauilitired	e54f964eca	Fix #2009	2019-01-22 18:51:13 +01:00
Sauilitired	7e56e47046	Fix block list flag permissions	2019-01-21 17:49:36 +01:00
Sauilitired	7edfc313d6	I did an oopsie	2019-01-21 12:24:34 +01:00
Sauilitired	d37f5b9aa8	Fix schematic pasting offsets	2019-01-21 09:53:04 +01:00
Sauilitired	1fbfc767c4	Use PaperLib and make command task return completable futures	2019-01-21 09:20:33 +01:00
dordsor21	bd797b59fe	Allow disabling of scientific notation (disabled by default) for DoubleFlags	2019-01-20 15:56:49 +00:00
dordsor21	0609b3d7f6	Safer generation of the BlockBucketChunk	2019-01-19 16:28:49 +00:00
dordsor21	ca883c211a	Add merge permission changes from master	2019-01-18 19:02:12 +00:00
dordsor21	ea422b5561	Fix NPE on world initialise	2019-01-17 13:19:24 +00:00
dordsor21	223064567f	Plot analysis (#2239) ... * Start to fix (and may have fixed) plot analysis with block buxkets and 1.13 * Standard deviation ought also be multiplied by 100, and only obtain the BlockBucket array once * Add schematics to Plot Analysis Add generateBlockBucketChunk method to SingleWorldGenerator	2019-01-17 01:04:00 +00:00
matt	0817d7de5a	Removed PlotMe converting features. ... Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>	2019-01-15 22:19:29 -05:00
dordsor21	0e0a534620	Fix regenallroads extend (height)	2019-01-16 01:55:45 +00:00
dordsor21	61f8ceaaaa	I'm an idiot and left one of my debug messages in	2019-01-16 01:28:07 +00:00
dordsor21	7e6b11a21b	Fix plot swap and have a nicer static AIR block	2019-01-15 23:58:21 +00:00
dordsor21	28c219c694	/plot leave has a terrible description	2019-01-15 16:20:50 +00:00
dordsor21	f679d3f873	Debug not debug	2019-01-14 18:27:20 +00:00
dordsor21	232b7ccfc1	Don't allow debugroadregen on merged plots	2019-01-14 18:15:44 +00:00
dordsor21	44fc8a55ea	Add "kick" meta check in PlotListener	2019-01-14 17:41:28 +00:00
dordsor21	b2d035cf69	Fix deny-exit flag causing plot kick to break	2019-01-14 17:31:22 +00:00
dordsor21	d81d3c72e4	Update scripts and code to work nicely with each other. ... Fixes #2208	2019-01-12 19:56:11 +00:00
dordsor21	f62777bc1a	Minor: ... Fix BukkitLegacyMappings method map usage Move obtaining legacy block to default clause Task should be async	2019-01-12 18:05:20 +00:00
dordsor21	15ea0f3210	Fix BukkitLegacyMappings having maps the wrong way round & fix PlotBlockListFlag to use PlotBlocks. ... Fixes #2229	2019-01-12 17:39:29 +00:00
dordsor21	0d76e46fa2	Fix requiring restart for /ps load after /ps save & make descriptions nicer	2019-01-11 12:50:38 +00:00
NotMyFault	222585bf01	Update C.java	2019-01-10 22:21:34 +01:00
NotMyFault	63af0de9f0	Update Settings.java	2019-01-10 22:20:30 +01:00
NotMyFault	5df6f2a13e	Update Download.java	2019-01-10 22:18:28 +01:00
NotMyFault	c5f1c60ad7	Delete base.yml	2019-01-10 22:16:22 +01:00
Sauilitired	3ac7785cc3	Skip empty files in DebugPaste	2019-01-10 21:34:52 +01:00
dordsor21	3bbd97e7e1	Fix PlotDeleteEvent and PlotMergeEvent not being called. ... Replaced current PlotMergeEvent with PlotAutoMergeEvent (called when a plot is merged on /plot auto). And made PlotMergeEvent be called for /plot merge command.	2019-01-10 17:10:25 +00:00
Sauilitired	e47b4fef20	Remove update and changelog commands	2019-01-10 17:45:40 +01:00
matt	7302480728	Merge branch 'optional' into breaking	2019-01-09 20:01:32 -05:00
NotMyFault	457c520eb6	Fixing debugpaste description	2019-01-09 23:40:08 +01:00
Sauilitired	053edb823d	Use Incendo pasting instead of Hastebin	2019-01-09 23:12:36 +01:00
dordsor21	727d120e70	Regenallroads: ... - remove the "estimated time" as it's just not remotely correct, nor would it be correct if it were based on actual chunk number - fix the air to be pasted above the road when using regenallroads	2019-01-09 16:15:34 +00:00
dordsor21	ea01a5171b	Add missing admin unlink permission	2019-01-03 22:36:09 +00:00
dordsor21	77ddeabca2	Fix NPE with plot version (update to new versioning within code) ... Also add date and commit to plugin.properties file.	2019-01-03 17:32:21 +00:00
matt	e12a7bb85f	Migrated remaining Optionals	2019-01-02 23:15:42 -05:00
matt	c7b9bfeb4b	Migrate from Guava Optionals to Java Optionals	2019-01-02 23:11:26 -05:00
dordsor21	ae9e52f093	Don't dump g_sch	2019-01-02 13:18:20 +00:00
dordsor21	29868bdd29	Fix road generation for roads of even width	2019-01-01 14:43:41 +00:00
Sauilitired	38a382f8e5	Add missing argument to unlink	2019-01-01 00:55:25 +01:00
dordsor21	7bcc4c4ce3	Fix plot move/swap block rotation issue (switch to BaseBlock). Also fix container inventory pasting. ... Some cleanup. Fixes #2209	2018-12-31 17:15:47 +00:00
dordsor21	8c52e20736	Use BaseBlocks in regenallroads and minor cleanup of HybridUtils. ... Fixes #2210	2018-12-31 16:08:09 +00:00
dordsor21	750be6c5fe	clean merge up	2018-12-28 17:03:00 +00:00
Rick Strafy	6292bff7c9	Fix rotation (#2200) ... * Fix rotation * Clean up some events and utility classes. Try to use as general type declarations as possible. Add configurable override for the unsafe block checker. * Treat tridents as a projectile * Fix rotation and merged with current breaking branch	2018-12-28 09:42:03 +00:00
Sauilitired	12b8ae3eed	Clean up some events and utility classes. Try to use as general type ... declarations as possible. Add configurable override for the unsafe block checker.	2018-12-28 07:39:39 +01:00
dordsor21	660754511b	Fix rotation of road schematics	2018-12-28 00:47:48 +00:00
dordsor21	2846363a2c	Revert "Use our own schematic readers in only create one input stream, and allow for future customisation of schematics if required/wanted." ... This reverts commit 3521b8aa22.	2018-12-27 20:06:02 +00:00
dordsor21	3521b8aa22	Use our own schematic readers in only create one input stream, and allow for future customisation of schematics if required/wanted.	2018-12-27 19:42:56 +00:00
Sauilitired	249b5d4068	Revert dors commit	2018-12-27 17:29:35 +01:00
Sauilitired	76113cb0ab	Allow specifying Y value for default plot home	2018-12-27 16:18:54 +01:00
matt	a529518b91	Minor changes, formatting, comments. ... One notable thing added was the inclusion of more of the new mobs in one of the events.	2018-12-27 00:46:32 -05:00
Alexander Söderberg	75bcd1adec	Update StringMan.java	2018-12-27 01:31:48 +01:00
dordsor21	fba7eac6d8	Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking	2018-12-26 21:18:38 +00:00
dordsor21	6e127db982	Cleanup	2018-12-26 21:18:22 +00:00
Sauilitired	f1cf541606	Merge remote-tracking branch 'origin/breaking' into breaking	2018-12-26 19:16:42 +01:00
Sauilitired	2b9fe5afda	Fix plot music (and plot inventories)	2018-12-26 19:16:34 +01:00
dordsor21	ba47a21971	- Update code style to format annotations nicely ... - Reformat code	2018-12-26 17:21:06 +00:00
dordsor21	8cb2bdc846	Nice code to handle schematic loading and remove the ability to debugroadregen a specific chunk, as it uses a completely different method to actual road generation.	2018-12-26 16:44:39 +00:00
Sauilitired	b05316c000	Recommend paper just like FAWE. I want to be like the cool kids. ... Oh, and fix an issue with `/plot music`. Still broken. Just not the same kind of broken.	2018-12-26 15:29:39 +01:00
Sauilitired	f1378013c1	Fix plot home	2018-12-26 01:39:49 +01:00
Sauilitired	edc758334c	Actually copy over the files as well...	2018-12-25 18:30:42 +01:00
Sauilitired	beb0f5708f	Whoops...	2018-12-25 18:28:07 +01:00
Sauilitired	71baee063c	Update maven info for Core	2018-12-25 18:27:07 +01:00
dordsor21	c14b76b324	Fix rotational blocks in road generation	2018-12-24 23:14:13 +00:00
dordsor21	af23d3d98e	Fix schematic pasting to paste tile entities and blocks with BlockData (e.g. stairs) properly	2018-12-24 17:56:13 +00:00
Sauilitired	9fe9c2662b	Fix legacy conversion of block lists	2018-12-24 08:57:17 +01:00
Sauilitired	9e0c226632	Fix schematic pasting	2018-12-24 08:13:15 +01:00
Sauilitired	4f43788307	Merge remote-tracking branch 'origin/breaking' into breaking	2018-12-24 01:50:45 +01:00
Sauilitired	8dae2555db	Make mv create work again	2018-12-24 01:50:17 +01:00
dordsor21	1bf621fb4b	Fix schematic saving (and improve performance slightly)	2018-12-23 22:49:43 +00:00
Sauilitired	2ede77318a	Add dordsor21 to author list	2018-12-23 20:32:48 +01:00
Sauilitired	5c678e86bb	Fix configuration loading issues	2018-12-23 20:31:29 +01:00
Sauilitired	02937cc543	Add configuration conversion and fix BukkitLegacyMappings	2018-12-23 19:43:36 +01:00
Sauilitired	165cac8b13	Fix bStats problem and commit Setup progress	2018-12-23 17:38:27 +01:00
Sauilitired	7900a95b25	Implement LegacyConverter	2018-12-21 22:55:47 +01:00
Sauilitired	fe12d03916	Remove unused classes.	2018-12-21 21:28:33 +01:00
dordsor21	886081e27f	The local build was a fluke, and I couldn't work it out in the last 3 hours, so here are some basic updates/cleanup to a few things, and an updated bui;d command in README.md	2018-12-21 16:26:19 +00:00
dordsor21	e757c3e13c	Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking	2018-12-21 13:39:27 +00:00
dordsor21	5fdb60f85d	Default plot height is at sea level (62)	2018-12-21 13:39:20 +00:00
dordsor21	aaed3f622a	Fix build for gradlew clean assemble build	2018-12-21 13:38:28 +00:00
sauilitired	130274de86	Fix multiverse setup and don't allow unsafe blocks in setup	2018-12-21 03:31:08 +01:00
dordsor21	28f3be56b3	Fix schematic creation ... Seems fairly ugly, but only because the format requires the blocks be inputted in that exact order, and it prevents us from having to cache the blocks per chunk to then insert into the relevant tags.	2018-12-21 00:49:15 +00:00
dordsor21	c53cd1ec91	oops	2018-12-20 23:34:55 +00:00
dordsor21	90682e9f8b	Various: ... - Some minor cleanup - Test for null id, not for null PlotBlock - Small fixes to schematic saving (still broken)	2018-12-20 23:33:24 +00:00
sauilitired	341e386df8	Delete Collection getBlocks to Array getBlocks	2018-12-20 21:46:00 +01:00
sauilitired	f4140ae728	Add getBlockArray() method	2018-12-20 21:40:50 +01:00
dordsor21	4e10682748	A few minor fixes	2018-12-20 18:46:52 +00:00
sauilitired	096ad1febe	Make sure that blocks are actually compiled. Whoopsie 🐮	2018-12-20 19:35:02 +01:00
dordsor21	1543ac50cd	Various: ... - Empty StringPlotBlocks are air - Update signs to 1.13 - Fix getting material in BukktiLocalQueue#setMaterial	2018-12-20 17:20:13 +00:00
sauilitired	568b4c8e85	Merge remote-tracking branch 'origin/breaking' into breaking ... # Conflicts: # Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java # Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java	2018-12-20 02:25:55 +01:00
sauilitired	e939b8237e	Changelist: ... - Added aliases for custom configuration types - Removed numerical ID based methods in Block Queues - Fixed sign removal in Plot.java - (Hopefully) fixed dividing by 0 errors in BlockBucket - Removed random from some methods, as blockbucket has it's own random - Temporarily removed chunk analysis - Changed a lot in GenChunk and BukkitPlotGenerator	2018-12-20 02:23:48 +01:00
dordsor21	cbc2b70336	Merge commit 'be485075993f8dc807595c524f58c3bb58156a0c' into breaking ... # Conflicts: # README.md	2018-12-20 00:55:44 +00:00
dordsor21	11ccfe7ac4	Reformat code	2018-12-19 23:26:20 +00:00
dordsor21	fa2dbb2b89	Update to WorldEdit 7 (and WE7-compatible schematics, *hopefully keeping legacy*)	2018-12-19 23:18:57 +00:00
sauilitired	e724aa8caf	Fix PlotItem.	2018-12-19 18:24:35 +01:00
sauilitired	8f23299e7d	Use BlockBuckets everywhere.	2018-12-19 17:19:54 +01:00
dordsor21	361cc9e9f7	Remove old LegacyMappings class from Bukkit ... Add "fromAny" method	2018-12-19 15:08:49 +00:00
dordsor21	531d8cc706	Merge branch 'breaking' into breaking	2018-12-19 14:54:32 +00:00
dordsor21	4b02bb1df8	Refactor legacy mappings to use PlotBlocks	2018-12-19 14:52:15 +00:00
sauilitired	1d3270d869	BlockBuckets r cool 🐮	2018-12-19 00:01:13 +01:00
sauilitired	af9418552a	Whoops.	2018-12-18 20:58:52 +01:00
sauilitired	10b87f5728	Add mappings for pre initialized items	2018-12-18 20:56:55 +01:00
sauilitired	ccad0bced9	Progress.	2018-12-18 20:54:20 +01:00
sauilitired	fb7bcef05f	1.13 shizzle	2018-12-17 20:57:21 +01:00
NotMyFault	8ad75efa0e	Adding French translation	2018-12-12 16:12:40 +01:00
sauilitired	820710721e	Schematic list command	2018-12-06 18:01:33 +01:00
sauilitired	a4a923c23c	Extract duplicated switch statement in EntityUtil	2018-11-15 00:08:32 +01:00
sauilitired	06f64aeff0	Extract duplicated method declaration	2018-11-15 00:06:20 +01:00
sauilitired	a8b4729845	Rename DBFunc#everyone to DBFunc#EVERYONE, and create two string constants 🐱	2018-11-14 23:51:56 +01:00
sauilitired	3c64376abe	Fix guest gamemode flag.	2018-11-14 23:40:27 +01:00
dordsor21	8cd54929e7	Merge branch 'master' into breaking ... # Conflicts: # Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotRateEvent.java # Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEventUtil.java # Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java # Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java # Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java # Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Delete.java # Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Kick.java # Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Load.java # Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Music.java # Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java # Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java # Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Reload.java # Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SchematicCmd.java # Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java # Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/GameModeFlag.java # Core/src/main/java/com/intellectualcrafters/plot/commands/Clear.java # Core/src/main/java/com/intellectualcrafters/plot/commands/PluginCmd.java # Core/src/main/java/com/intellectualcrafters/plot/commands/Relight.java # Core/src/main/java/com/intellectualcrafters/plot/commands/SetHome.java # Core/src/main/java/com/intellectualcrafters/plot/config/C.java # Core/src/main/java/com/intellectualcrafters/plot/config/Configuration.java # Core/src/main/java/com/intellectualcrafters/plot/config/Settings.java # Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventUtilTest.java # Nukkit/src/main/java/com/plotsquared/nukkit/util/NukkitEventUtil.java # README.md # Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlotRateEvent.java # Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeSchematicHandler.java # Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/block/SpongeLocalQueue.java # Sponge/src/main/java/com/plotsquared/sponge/util/SpongeEventUtil.java	2018-11-14 14:44:07 +00:00
sauilitired	8df7f63931	Refactor PS (and rename to PlotSquared)	2018-11-14 14:19:57 +01:00
sauilitired	16dbbe5244	Refactoring of PS#getPlots: ... Initialize to HashSet rather than ArrayList, because of add in HashSet is O(1) vs. add in ArrayList which is O(n). Also make the wrapping set immutable.	2018-11-14 13:52:09 +01:00
NotMyFault	ae2869a29b	Translation update and fixing wrong lines	2018-11-05 16:00:44 +01:00
NotMyFault	302051a6ca	Minor cleanup	2018-10-20 14:03:21 +02:00
Jesse Boyd	b6d4872ca4	Merge pull request #2102 from dordsor21/master ... Add PlotChangeOwner Event	2018-10-13 15:11:45 +11:00
NotMyFault	4b7ca2ff37	Minor cleanup	2018-10-10 18:29:21 +02:00
NotMyFault	1734c0e357	Rename ko_KR.yml to ko-KR.yml	2018-10-10 16:52:35 +02:00
NotMyFault	e2e34f24d6	Rename zh_CN.yml to zh-CN.yml	2018-10-10 16:51:43 +02:00
NotMyFault	765db2df0c	Added languages 'back'	2018-10-10 16:49:31 +02:00
NotMyFault	e1e6d95f75	Merge pull request #2049 from f0rb1d/master ... Updated Simplified Chinese translation and formalized language codes.	2018-10-10 16:40:52 +02:00
NotMyFault	70584a338c	Update PS.java	2018-10-10 16:38:01 +02:00
NotMyFault	11e2777f60	Update PS.java	2018-10-10 16:36:14 +02:00
NotMyFault	b6303a7615	Update PS.java	2018-10-10 16:33:03 +02:00
NotMyFault	88e80f54f7	Updating locale names	2018-10-10 16:30:38 +02:00
dordsor21	9e9b21779c	Add PlotChangeOwner Event	2018-09-19 16:57:33 +01:00
NotMyFault	979b3c0408	Added bridge template and korean translation	2018-09-03 00:04:32 +02:00
NotMyFault	5b2428559a	Bridge template from the spigot page	2018-09-03 00:02:07 +02:00
NotMyFault	f001eebad4	Update Settings.java	2018-09-02 23:51:45 +02:00
Jesse Boyd	f5a981fda7	Fix plot visit sorting	2018-08-24 06:47:16 +10:00
sauilitired	587c942d88	Suppress PlotAPI warnings	2018-08-20 11:36:59 +02:00
sauilitired	e98c648244	Move PlotAPI to Core and move bukkit specific methods to BukkitUtil.	2018-08-20 11:35:41 +02:00
sauilitired	be9fb3bd3a	Remove deprecated methods without internal use.	2018-08-20 11:05:00 +02:00
sauilitired	01a927ccad	Allow PlotRateEvent to be cancelled. Fixes #2017	2018-08-19 23:12:59 +02:00
Jesse Boyd	4b8c434669	Fix compile (var must be final)	2018-08-12 21:36:04 +10:00
sauilitired	b0348cfc34	Update packages. This will not be appreciated 🐱	2018-08-10 17:53:15 +02:00
sauilitired	1646cd0f5a	Reformat code	2018-08-10 17:01:11 +02:00
Alexander Söderberg	bbcd508bc3	Remove unnecessary lines in Configuration javadoc	2018-08-10 16:04:43 +02:00
F0rb1d	a4f176fd07	Updated Simplified Chinese translation and formalized language codes.	2018-08-03 20:35:36 +08:00
Jesse Boyd	3d8d75170d	Check admin for setowner null	2018-07-31 14:28:22 +10:00
Jesse Boyd	2c11a292f4	Prevent multiple uses of plot auto	2018-07-29 21:43:07 +10:00
Jesse Boyd	cd9d22cb9b	Fix augmented generator not clearing column	2018-07-27 14:02:40 +10:00
Jesse Boyd	645c5fb529	Fix nukkit augmented generator	2018-07-27 13:25:46 +10:00
Jesse Boyd	ae1e58c0ac	Add -f override for plot move	2018-07-07 09:22:24 +10:00
Jesse Boyd	18c92bea38	Allow specifying area for move command	2018-07-05 19:33:17 +10:00
Jesse Boyd	9020d740d1	Revert "possible fix for mob damage" ... This reverts commit df6914fb1e.	2018-06-23 11:46:19 +10:00
Jesse Boyd	df6914fb1e	possible fix for mob damage	2018-06-21 07:48:45 +10:00
Jesse Boyd	da5478f141	Only check int flag ranges	2018-06-20 07:48:51 +10:00
Jesse Boyd	d454602888	Fixes #1961	2018-06-19 03:44:45 +10:00
Jesse Boyd	3039331976	Add account age expiry filter	2018-06-19 03:29:14 +10:00
Jesse Boyd	6ed6f607b5	Sort flag list alphabetically	2018-06-13 09:28:32 +10:00
Jesse Boyd	ce3e3be59e	Tweak nukkit plot chat	2018-06-09 15:37:49 +10:00
Jesse Boyd	740de4932b	Fix flag perm check	2018-06-07 12:30:39 +10:00
Jesse Boyd	442513b592	Fixes #1970	2018-06-07 08:15:28 +10:00
Jesse Boyd	40635255e3	Probably fixes #1953	2018-05-18 14:48:17 +10:00
Jesse Boyd	550df7f232	Fixes #1952	2018-05-17 17:46:54 +10:00
Jesse Boyd	4ffc4e67ab	Fixes #1822	2018-05-17 16:30:31 +10:00
Jesse Boyd	d6c472fcdf	Fixes #1484	2018-05-17 16:23:27 +10:00
Jesse Boyd	67a70d4ade	Fixes #1928	2018-05-17 15:17:45 +10:00
Jesse Boyd	9f9527d2e2	Fixes #1784	2018-05-17 14:53:34 +10:00
Jesse Boyd	ecf94b8706	minor web tweaks	2018-05-13 10:32:48 +10:00
NotMyFault	244ccb71cf	Update of german.yml ... german.yml design has been reworked to the up-to-date PlotSquared language file design. Many lines were added and adjusted.	2018-05-11 20:37:50 +02:00
NotMyFault	e13785edfe	Typo fixes ... Had to write some custom messages for a server and fixed the typos in here	2018-05-11 00:03:35 +02:00
Jesse Boyd	d49bfa612e	Merge pull request #1933 from Leomixer17/patch-1 ... Update italian.yml	2018-05-02 00:52:53 +10:00
Jesse Boyd	72f30d8aef	usernames can be 2 characters	2018-05-02 00:43:27 +10:00
Leomixer17	ef6b1cb932	Update italian.yml	2018-05-01 01:29:18 +02:00
Jesse Boyd	154bad6188	*	2018-04-28 21:53:39 +10:00
Jesse Boyd	613d79fb39	Fixes #1691	2018-04-28 21:51:26 +10:00
Jesse Boyd	5f9bd853ec	Fixes #1903	2018-04-28 09:41:09 +10:00
Jesse Boyd	ef83b5a1b7	Fixes #1931	2018-04-28 09:28:55 +10:00
Jesse Boyd	4f63cdf560	Fixes #1920	2018-04-13 20:37:28 +10:00
Foorack	90c3fac4fa	Fix PlotVersion when compiling with Maven	2018-04-07 20:52:19 +02:00
bibo38	fb706e0d60	Fixed wrong newlines in german language file	2018-03-16 18:07:29 +01:00
Jesse Boyd	368b9a0168	Fixes #1786	2018-03-15 16:34:28 +11:00
BrainStone	515405aa9e	using newer MySQL driver ... - Newer driver doesn't need manual loading - Fixes #1783	2018-03-10 21:34:11 +01:00
Jesse Boyd	8f5e2eb439	Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared	2018-03-08 08:37:36 +11:00
Jesse Boyd	5b18b918a9	Ignore unsupported statement isClosed	2018-03-08 08:37:17 +11:00
dordsor whitwell	7dcb85d5d4	Fix typo in database update error message	2018-03-07 21:02:19 +00:00
Jesse Boyd	1cd30b84d5	check for closed connections	2018-02-15 23:12:42 +11:00
Jesse Boyd	eb1c3263ec	Fix deny-exit flag	2018-02-15 18:59:40 +11:00
Jesse Boyd	8815c83ba1	Various minor ... Teleport on login fixes World unloading fixes	2018-01-27 16:26:09 +11:00
Jesse Boyd	0e183f5627	Fixes #1839	2018-01-13 12:47:02 +11:00
Jesse Boyd	b239cb4a18	Fixes #1828	2018-01-10 17:50:38 +11:00
Jesse Boyd	4f464439e5	*	2018-01-10 17:22:46 +11:00
Jesse Boyd	4716104951	Revert broken changes to visit	2018-01-10 17:15:05 +11:00
Jesse Boyd	03337fe080	Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared	2018-01-10 16:58:42 +11:00
Jesse Boyd	4ff02831f3	Fixes #1767 (performance issue)	2018-01-10 16:58:37 +11:00
Jesse Boyd	09e83bcbf8	Merge pull request #1793 from Leomixer17/patch-3 ... Update italian.yml	2018-01-10 16:50:17 +11:00
Jesse Boyd	5ddefcea22	when PlayerQuitEvent is never called	2018-01-04 19:24:00 +11:00
Leomixer17	47314ce00d	Update italian.yml	2017-12-10 15:28:35 +01:00
Leomixer17	452bf593e0	Update italian.yml	2017-12-10 14:35:43 +01:00
Leomixer17	a9bd6566b7	Update italian.yml	2017-12-10 12:53:22 +01:00
Christian Langel	59557cf889	improvements: Message for visit Command to a players without plots (#1796) ... We provide now a clear message if we are sure that the Visit command means a player but we dont found any claimed plots for this player. This is helpful if we try teleport to a numeric named player See this related tickets: #1691, #1778	2017-12-09 11:08:15 +01:00
Leomixer17	48bdfd75e5	Update italian.yml	2017-12-07 19:50:02 +01:00
Opachl	70a82d9fc6	fix: p visit issue in latest builds ... p visit issue in latest builds #1791	2017-12-06 21:40:26 +01:00
Leomixer17	61e045aa50	Update italian.yml (#1789)	2017-12-04 17:02:11 +01:00
Leomixer17	9daf13c897	Update italian.yml	2017-12-03 21:13:39 +01:00
Christian Langel	7d39d09317	fix: remove plot-alias with "/p alias" (#1779) ... * fix: remove plot-alias with "/p alias" remove plot-alias with "/p alias" #1718 * Apply requested Review Changes Restored the original Permisson to keep backwards compatibility Clean unused imports. * added some improvements after testing added some improvements after testing	2017-12-03 17:59:36 +01:00
Christian Langel	06208696db	fix: numeric Playernames thows NumberFormatException on Teleport (#1778) ... * fix: numeric Playernames thows NumberFormatException on Teleport Refactoring of the Teleport Handling Supports now: * p h xPlotPlayerGuy [PAGE] = Player [numeric] [alphanumeric] * p h MyPlantage [PAGE] = Alias [numeric] [alphanumeric] * p h PlotworldLarge [PAGE] = World [numeric] [alphanumeric] * p h 1:1 [PAGE] = plotId [numeric (1,1|1;2) ] * p h 4 = 4 th Plot of the Player if available [numeric (1,1|1;2) ] Check order: Player, Alias, World, PlotId, Page [PAGE] [PAGE] is optional * Apply suggested Code Style Changes: Collections now empty instead of null. Property renaming	2017-12-03 17:15:09 +01:00
Opachl	9413ce0880	fix: no wether update after "/p flag remove weather" ... no wether update after "/p flag remove weather" #1723	2017-11-15 11:14:14 +01:00
Jesse Boyd	a752780eeb	Minor fixes ... Update message color CME on plot action Creative middle click banner/head	2017-11-14 17:09:51 +11:00
Jesse Boyd	6e9c103b55	Fix typo	2017-11-12 13:32:09 +11:00
Jesse Boyd	fe534bccbe	Merge pull request #1753 from Leomixer17/patch-1 ... Improved italian translation	2017-11-09 10:16:37 +11:00
Jesse Boyd	37f1da0715	Various minor ... VehicleMoveEvent - Move KillRoadVehicles code there - Fix for pre-1.12 Fix auto merge being disabled	2017-11-09 10:15:16 +11:00
Leomixer17	faa24bbdf4	Update italian.yml	2017-11-04 21:36:03 +01:00
Jesse Boyd	22429fc3e0	Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared	2017-10-31 23:26:18 +11:00
Jesse Boyd	7e2a911530	Closes #1750	2017-10-31 23:26:08 +11:00
Jesse Boyd	7b04ec9ff3	Merge pull request #1746 from Gabscap/fix-location_equals ... Fix Location.equals	2017-10-29 21:08:58 +11:00
Jesse Boyd	097159d606	Fix wrong sign height	2017-10-23 18:23:37 +11:00
Gabscap	04bfe73c29	Fix Location.equals	2017-10-20 14:23:35 +02:00
Jesse Boyd	d4614007ae	Fixes #1743	2017-10-14 20:52:35 +11:00
Jesse Boyd	9480c70655	Save world before download	2017-09-30 00:28:39 +10:00
Jesse Boyd	8b6cc7a193	*	2017-09-29 23:23:40 +10:00
Jesse Boyd	0d608245f5	Some tweaks / optimizations	2017-09-25 16:57:42 +10:00
Jesse Boyd	92f94ecedc	Tweaks ... Use sign with plot schematic Tweak world unloading	2017-09-24 00:13:05 +10:00
Jesse Boyd	2360782234	*	2017-09-23 20:09:34 +10:00
Jesse Boyd	1d20ae2777	allow air	2017-09-23 19:28:40 +10:00
Jesse Boyd	6b55b8cd67	Allow configuring a separate nonmember home position	2017-09-23 19:10:57 +10:00