Commit Graph

2138 Commits

Author SHA1 Message Date
785362c576 Merge branch 'v6' into v7 2023-03-02 12:34:18 +01:00
f5118e6802 Don't fire 'PlotUnlinkEvent' twice on plot clear () 2023-02-23 09:26:30 +01:00
1e7ba7d173 Merge branch 'v6' into v7 2023-02-12 19:06:11 +01:00
773fd6f59f Release 6.11.0 2023-02-10 17:12:15 +01:00
aa784e98f8 Merge branch 'v6' into v7 2023-02-10 16:44:57 +01:00
5cce86d924 feat: Add event firing on remove road entity ()
* feat: Add event firing on remove road entity

Signed-off-by: ByteExceptionM <git@byteexception.eu>

* chore: Add some more entity vars

Signed-off-by: ByteExceptionM <git@byteexception.eu>

* chore: Rename method

Signed-off-by: ByteExceptionM <git@byteexception.eu>

* chore: Code cleanup

Signed-off-by: ByteExceptionM <git@byteexception.eu>

* chore: Code reformat

Signed-off-by: ByteExceptionM <git@byteexception.eu>

* chore: Change iterator removal

Signed-off-by: ByteExceptionM <git@byteexception.eu>

* Comply with checkstyle

---------

Signed-off-by: ByteExceptionM <git@byteexception.eu>
Co-authored-by: Alexander Brandes <mc.cache@web.de>
2023-02-09 20:51:59 +01:00
586474c8e6 Merge branch 'v6' into v7 2023-01-23 13:40:52 +01:00
70b6636f50 Revert "Cleanup deprecated methods"
This reverts commit 26692d6633.
2023-01-23 13:40:47 +01:00
ab357deb48 Put more legacy web interface deprecations in place 2023-01-23 13:40:35 +01:00
bd62d1a1c7 Merge branch 'v6' into v7 2023-01-23 13:28:12 +01:00
6130c3dfa5 Clarify 2D biome deprecation 2023-01-23 13:28:05 +01:00
26692d6633 Cleanup deprecated methods 2023-01-23 13:27:08 +01:00
ee0f389c78 Merge branch 'v6' into v7 2023-01-23 13:01:48 +01:00
be8903128d Release 6.10.9 2023-01-23 12:28:33 +01:00
08800ec16d Cleanup deperecated WorldEdit met
Co-authored-by: Matthew Kaulfers <42121989+mkaulfers@users.noreply.github.com>
2023-01-22 11:26:07 +01:00
83e274ff9f Revert "PS-3908: Cleanup deprecated methods to improve code maturity. ()"
This reverts commit 0dd8b1053c.
2023-01-22 11:21:01 +01:00
0dd8b1053c PS-3908: Cleanup deprecated methods to improve code maturity. ()
https://github.com/IntellectualSites/PlotSquared/issues/3908
2023-01-22 00:02:15 +01:00
0558fcf5d5 Provide full verbosity for invalid components 2023-01-21 22:27:20 +01:00
5af8be4293 chore: Remove things marked as for removal ()
* chore: Remove things marked as for removal

* Address feedback

Co-authored-by: Alexander Brandes <mc.cache@web.de>
2023-01-21 16:44:28 +01:00
cbacdd67eb Merge branch 'v6' into v7 2023-01-21 16:39:14 +01:00
c45bbe3ec5 fix: ensure plots are fully unlinked before the clear itself is run ()
* fix: ensure plots are fully unlinked before the clear itself is run

* Update Core/src/main/java/com/plotsquared/core/plot/PlotModificationManager.java

Co-authored-by: Alexander Brandes <mc.cache@web.de>
2023-01-19 09:01:06 +01:00
b79537ebbc Clean up merge 2023-01-17 12:59:16 +00:00
6efd581500 Merge branch 'v6' into v7
# Conflicts:
#	.github/workflows/codeql.yml
#	Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/listener/ProjectileEventListener.java
#	Core/src/main/java/com/plotsquared/core/command/Add.java
#	Core/src/main/java/com/plotsquared/core/command/Caps.java
#	Core/src/main/java/com/plotsquared/core/command/Cluster.java
#	Core/src/main/java/com/plotsquared/core/command/Continue.java
#	Core/src/main/java/com/plotsquared/core/command/Copy.java
#	Core/src/main/java/com/plotsquared/core/command/Save.java
#	Core/src/main/java/com/plotsquared/core/command/Visit.java
#	Core/src/main/java/com/plotsquared/core/plot/Plot.java
#	build.gradle.kts
2023-01-17 11:51:39 +00:00
07e598e48f fix: account for exclusivity of max build height where requires () 2023-01-16 21:15:35 +00:00
abbac057ed Default to unix line endings ()
* Default to unix line endings

* Respect preconfigured settings
2023-01-15 17:54:52 +01:00
39d2f1a72c chore: remove uses of deprecated Permissions class and add javadoc notes ()
- Closes 
2023-01-15 14:08:59 +01:00
1448d8d4af Fixes by fine-graining the help menu generation localization support 2023-01-14 00:42:46 +01:00
00722bc463 Reduce /plot home overhead ()
* Add JFR events

* Replace global connected plots cache with local cache

* Simplify isOwner check

* Avoid extensive hashing of plots

* Clear caches in more cases

* Revert "Add JFR events"

This reverts commit 78c107f1
2023-01-14 00:27:09 +01:00
0707aa47c9 Merge branch 'v6' into v7 2023-01-11 22:12:31 +01:00
4aa7bc51bc Include missing javadoc option 2023-01-11 22:11:11 +01:00
0f0030916f Add source documentation to javadocs and add dependency tab ()
Get the most out of javadocs
2023-01-11 18:25:51 +01:00
a12490c3eb Fixes 2023-01-09 23:50:13 +01:00
37d6dcc7ea Update javadoc links 2023-01-09 10:21:55 +01:00
7135bdd6aa Fix compile errors 2023-01-08 10:36:41 +01:00
3198c3b081 Merge branch 'v6' into v7 2023-01-08 10:20:15 +01:00
339ca8e30f Fix wrong plot id calculation for negative coordinates () 2023-01-04 12:35:12 +01:00
f3bc504a6f refactor: adjust specific Nullable annotations used () 2022-12-02 12:39:38 +00:00
90ebd5d5ed feat: add a permission to override-allow a merge if the other plot's owner is offline () 2022-11-25 10:48:33 +00:00
c973ee8649 Revert "feat: check merge limits when completing auto-merge ()" - Fixes a bug in 6.10.4 ()
Revert "feat: check merge limits when completing auto-merge ()"

This reverts commit 25ce7a83f1.
2022-11-20 10:58:04 +01:00
c1543f034c feat: improve handling of null issues in plot analysis () 2022-11-17 17:23:44 +00:00
ee8902154a Release 6.10.4 2022-11-16 11:26:03 +01:00
b5bc1988e5 feature: implement road flags as widely as seems reasonable ()
* feature: implement road flags as widely as seems reasonable
 - Closes 
 - Any further road flag implementations would be very specific from what I can gather, and thus the gist of  is now implemented

* Add javadoc since tag

Co-authored-by: Alexander Brandes <mc.cache@web.de>

* Create util class for method

Co-authored-by: Alexander Brandes <mc.cache@web.de>
2022-11-15 19:07:38 +01:00
25ce7a83f1 feat: check merge limits when completing auto-merge ()
- Closes 
2022-11-13 11:57:41 +01:00
db2d590e8e fix: account for mismatched road-schematic heights () 2022-10-23 21:22:21 +02:00
de4e91ff62 Release 6.10.2 2022-10-18 23:12:27 +02:00
fe5e3d5f6d Annotate ExpireManager with @Inject ()
fix: annotate ExpireManager with @Inject
2022-10-18 10:17:34 +02:00
b8b3098022 feat: Move ExpireManager to Guice by removing legacy IMP references ()
* feat: Move ExpireManager to Guice by removing legacy IMP references

* Mark ExpireManager IMP as deprecated and add comments

* Add import for PlotPlatform for function reference

* Add ExpireManager instance call and optimize performance
2022-10-17 09:31:48 +02:00
76c6be9ba7 Fix 'No resource for locale 'lang' found ' error ()
* Fix 

* Reword message and add link to completed translations

* Fix 

* Reword message and add link to completed translations

* Add line breaks for better code readability

* Add line breaks for better code readability

Co-authored-by: Alexander Brandes <mc.cache@web.de>
2022-10-13 19:19:20 +02:00
308a5aa781 Ensure all setBlock methods in BlockArrayCacheScopedQueueCoordinator apply the correct offset ()
- Fixes 
2022-10-13 19:17:27 +02:00
e244527538 Make more complex patterns work correctly ()
allow more complex patterns to work correctly
2022-10-13 19:16:19 +02:00