Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-15 10:45:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
5,431 Commits 14 Branches 68 Tags 88 MiB
a1d94af242
Commit Graph

2221 Commits

Author SHA1 Message Date
Jordan
0d63c2bdb6
feat: allow bypass of econ costs (#4126) 2023-08-02 13:48:07 +02:00
Jordan
9b0b39ac2e
feat: add a permission requirement to /plot merge all (#4127) 2023-07-31 14:04:08 +02:00
Jordan
638f0bd078
fix: do not use overall max schem height for checking road schem height (#4124) 2023-07-30 12:17:35 +02:00
Jordan
c27b838dad
fix: add missing method in UncheckedWorldLocation (#4112) 
Co-authored-by: Alexander Brandes <mc.cache@web.de>
 2023-07-24 18:00:56 +00:00
Jordan
e0cb2949df
fix: switch to consistent heights for schematic generation (#4113) 2023-07-24 16:56:53 +01:00
Alexander Brandes
f6cbb3792f
[ci skip] Update documentation location 2023-07-22 11:40:01 +02:00
Alexander Brandes
293d7acf2d
Release 7.0.0-rc.3 2023-07-22 10:56:35 +02:00
Aurélien
d876d3722a
Fix default flags registration for third parties (#4114) 
Co-authored-by: Leomixer17 <leonardo.dgs@yahoo.com>
 2023-07-17 22:30:02 +02:00
Jordan
59eefd6865
fix: even better handling of schematic heights (#4102) 2023-07-10 23:13:36 +02:00
RedstoneFuture
08b325e37d
feat: improvement of kick messages (#4099) 
* Adding new player_not_in_plot message

* Adding new cannot_kick_player message

* Small typo

* Rejection: renaming of the player placeholder
 2023-07-04 18:44:45 +02:00
Jordan
c394108ba6
feat: add a sculk sensor flag (#4095) 2023-07-04 16:56:28 +01:00
dordsor21
f45064c4c4
fix: P2 areas are in worlds.yml 2023-06-23 14:11:12 +01:00
Alexander Brandes
af32399dd2
Correct calculating the plot price, if 'merge' differs from 'claim' 2023-06-23 10:40:40 +02:00
Alexander Brandes
e2ba93dab9
Update unsupported MiniMessage syntax 2023-06-22 19:55:36 +02:00
Alexander Brandes
9885d3e506
Fill in 'since' annotations 2023-06-15 17:24:21 +02:00
Hannes Greule
a54276d3b2
Strip legacy color codes if message cannot be parsed by MiniMessage (#4077) 2023-06-15 10:23:09 +02:00
Alexander Brandes
444ccda807
Add support for 1.20 (#4061) 
1.20 fixes
 2023-06-09 13:22:55 +02:00
Jordan
b8055201df
fix: do not reset the connectedCache every time Plot#getRegions is called (#4046) 
* fix: do not reset the connectedCache every time Plot#getRegions is called
 - Fixes IntellectualSites/FastAsyncWorldEdit#2188

* Remove unused import
 2023-05-25 19:05:20 +02:00
Jordan
81daefae4a
fix: do not overwrite bedrock with wall (#4048) 
- Fixes #4047
 2023-05-25 19:04:53 +02:00
Jordan
02437a8c72
feat: add cost for the merge when using plot auto-merge (#3841) 
* feat: add cost for the merge when using plot auto-merge
 - Closes #3814

* fix: Don't charge for auto merge if there is no auto merge

---------

Co-authored-by: Alexander Brandes <mc.cache@web.de>
 2023-05-21 17:57:46 +02:00
MrJoshuaT
c656190e14
Fix plot done success flag being false when complexity is higher than… (#4040) 
Fix plot done success flag being false when complexity is higher than the threshold

Co-authored-by: MrJoshuaT <josh@jmt.me>
 2023-05-13 22:23:11 +02:00
Pierre Maurice Schwang
ca0f38255d
Fix /plot area create <name> without passing a specific terrain type (#4025) 
fix: Ensure PlotAreaBuilder#plotAreaType returns non-null value
 2023-04-29 15:27:49 +02:00
Jordan
2d1f483469
fix: clear above and below plot gen heights if build heights are larger (#3991) 
- Fixes #3985
 2023-04-13 17:34:49 +01:00
dordsor21
d78360d6eb
fix: correct variable check in schematic dimensions 
- Fixes #3999
 2023-03-26 13:31:01 +01:00
Alexander Brandes
8e02336c44
Reapply stash 2023-03-15 10:30:38 +01:00
Alexander Brandes
3adfbde45a
Don't format JSON files 2023-03-06 11:49:18 +01:00
Alexander Brandes
e6db8e2750
Perform code formatting according to editorconfig (#3981) 
* Perform code reformatting

* Fix javadoc errors
 2023-03-06 11:38:30 +01:00
Alexander Brandes
9cd0ee9b49
Cleanup deprecated methods (#3980) 2023-03-06 11:21:14 +01:00
Alexander Brandes
d455d1fcd7
Merge branch 'v6' into v7 2023-03-06 10:48:51 +01:00
Alexander Brandes
447e4c7d58
Release 6.11.1 2023-03-06 10:40:17 +01:00
Alexander Brandes
89031447f2
Migrate left over occurrences to enhanced switches (#3979) 
* Migrate left-overs to enhanced switches

* More
 2023-03-06 10:25:02 +01:00
Alexander Brandes
4210a3a555
Deprecate unused methods for removal (#3977) 2023-03-06 10:13:03 +01:00
Alexander Brandes
a5c53a96d1
Record-inize methods (#3976) 2023-03-05 10:07:36 +01:00
Alexander Brandes
785362c576
Merge branch 'v6' into v7 2023-03-02 12:34:18 +01:00
Alexander Brandes
f5118e6802
Don't fire 'PlotUnlinkEvent' twice on plot clear (#3947) 2023-02-23 09:26:30 +01:00
Alexander Brandes
1e7ba7d173
Merge branch 'v6' into v7 2023-02-12 19:06:11 +01:00
Alexander Brandes
773fd6f59f
Release 6.11.0 2023-02-10 17:12:15 +01:00
Alexander Brandes
aa784e98f8
Merge branch 'v6' into v7 2023-02-10 16:44:57 +01:00
ByteExceptionM
5cce86d924
feat: Add event firing on remove road entity (#3955) 
* 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
Alexander Brandes
586474c8e6
Merge branch 'v6' into v7 2023-01-23 13:40:52 +01:00
Alexander Brandes
70b6636f50
Revert "Cleanup deprecated methods" 
This reverts commit 26692d6633.
 2023-01-23 13:40:47 +01:00
Alexander Brandes
ab357deb48
Put more legacy web interface deprecations in place 2023-01-23 13:40:35 +01:00
Alexander Brandes
bd62d1a1c7
Merge branch 'v6' into v7 2023-01-23 13:28:12 +01:00
Alexander Brandes
6130c3dfa5
Clarify 2D biome deprecation 2023-01-23 13:28:05 +01:00
Alexander Brandes
26692d6633
Cleanup deprecated methods 2023-01-23 13:27:08 +01:00
Alexander Brandes
ee0f389c78
Merge branch 'v6' into v7 2023-01-23 13:01:48 +01:00
Alexander Brandes
be8903128d
Release 6.10.9 2023-01-23 12:28:33 +01:00
Alexander Brandes
08800ec16d
Cleanup deperecated WorldEdit met 
Co-authored-by: Matthew Kaulfers <42121989+mkaulfers@users.noreply.github.com>
 2023-01-22 11:26:07 +01:00
Alexander Brandes
83e274ff9f
Revert "PS-3908: Cleanup deprecated methods to improve code maturity. (#3944)" 
This reverts commit 0dd8b1053c.
 2023-01-22 11:21:01 +01:00
Matthew Kaulfers
0dd8b1053c
PS-3908: Cleanup deprecated methods to improve code maturity. (#3944) 
https://github.com/IntellectualSites/PlotSquared/issues/3908
 2023-01-22 00:02:15 +01:00
Alexander Brandes
0558fcf5d5
Provide full verbosity for invalid components 2023-01-21 22:27:20 +01:00
Jordan
5af8be4293
chore: Remove things marked as for removal (#3941) 
* 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
Alexander Brandes
cbacdd67eb
Merge branch 'v6' into v7 2023-01-21 16:39:14 +01:00
Jordan
c45bbe3ec5
fix: ensure plots are fully unlinked before the clear itself is run (#3933) 
* 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
dordsor21
b79537ebbc
Clean up merge 2023-01-17 12:59:16 +00:00
dordsor21
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
Jordan
07e598e48f
fix: account for exclusivity of max build height where requires (#3935) 2023-01-16 21:15:35 +00:00
Alexander Brandes
abbac057ed
Default to unix line endings (#3932) 
* Default to unix line endings

* Respect preconfigured settings
 2023-01-15 17:54:52 +01:00
Jordan
39d2f1a72c
chore: remove uses of deprecated Permissions class and add javadoc notes (#3930) 
- Closes #3907
 2023-01-15 14:08:59 +01:00
Alexander Brandes
1448d8d4af
Fixes #3906 by fine-graining the help menu generation localization support 2023-01-14 00:42:46 +01:00
Hannes Greule
00722bc463
Reduce /plot home overhead (#3921) 
* 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
Alexander Brandes
0707aa47c9
Merge branch 'v6' into v7 2023-01-11 22:12:31 +01:00
Alexander Brandes
4aa7bc51bc
Include missing javadoc option 2023-01-11 22:11:11 +01:00
Alexander Brandes
0f0030916f
Add source documentation to javadocs and add dependency tab (#3917) 
Get the most out of javadocs
 2023-01-11 18:25:51 +01:00
Alexander Brandes
a12490c3eb
Fixes #3919 2023-01-09 23:50:13 +01:00
Alexander Brandes
37d6dcc7ea
Update javadoc links 2023-01-09 10:21:55 +01:00
Alexander Brandes
7135bdd6aa
Fix compile errors 2023-01-08 10:36:41 +01:00
Alexander Brandes
3198c3b081
Merge branch 'v6' into v7 2023-01-08 10:20:15 +01:00
Hannes Greule
339ca8e30f
Fix wrong plot id calculation for negative coordinates (#3898) 2023-01-04 12:35:12 +01:00
Jordan
f3bc504a6f
refactor: adjust specific Nullable annotations used (#3869) 2022-12-02 12:39:38 +00:00
Jordan
90ebd5d5ed
feat: add a permission to override-allow a merge if the other plot's owner is offline (#3844) 2022-11-25 10:48:33 +00:00
Alexander Brandes
c973ee8649
Revert "feat: check merge limits when completing auto-merge (#3868)" - Fixes a bug in 6.10.4 (#3876) 
Revert "feat: check merge limits when completing auto-merge (#3868)"

This reverts commit 25ce7a83f1.
 2022-11-20 10:58:04 +01:00
Jordan
c1543f034c
feat: improve handling of null issues in plot analysis (#3867) 2022-11-17 17:23:44 +00:00
Alexander Brandes
ee8902154a
Release 6.10.4 2022-11-16 11:26:03 +01:00
Jordan
b5bc1988e5
feature: implement road flags as widely as seems reasonable (#3870) 
* feature: implement road flags as widely as seems reasonable
 - Closes #3047
 - Any further road flag implementations would be very specific from what I can gather, and thus the gist of #3047 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
Jordan
25ce7a83f1
feat: check merge limits when completing auto-merge (#3868) 
- Closes #3748
 2022-11-13 11:57:41 +01:00
Jordan
db2d590e8e
fix: account for mismatched road-schematic heights (#3854) 2022-10-23 21:22:21 +02:00
Alexander Brandes
de4e91ff62
Release 6.10.2 2022-10-18 23:12:27 +02:00
Pierre Maurice Schwang
fe5e3d5f6d
Annotate ExpireManager with @Inject (#3852) 
fix: annotate ExpireManager with @Inject
 2022-10-18 10:17:34 +02:00
michizhou
b8b3098022
feat: Move ExpireManager to Guice by removing legacy IMP references (#3845) 
* 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
BlockyTheDev
76c6be9ba7
Fix 'No resource for locale 'lang' found ' error (#3830) 
* Fix #3820

* Reword message and add link to completed translations

* Fix #3820

* 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
Jordan
308a5aa781
Ensure all setBlock methods in BlockArrayCacheScopedQueueCoordinator apply the correct offset (#3843) 
- Fixes #3783
 2022-10-13 19:17:27 +02:00
Hannes Greule
e244527538
Make more complex patterns work correctly (#3847) 
allow more complex patterns to work correctly
 2022-10-13 19:16:19 +02:00
Jordan
11dd013333
fix: Adjust schematic height logic when pasting and actually set air as well (#3840) 2022-10-13 16:46:29 +01:00
Pierre Maurice Schwang
b740d5854c
Support MiniMessage in plot-title flag (#3835) 2022-10-10 17:41:35 +01:00
BlockyTheDev
d5445cfbef
Don't kill owned road entities (leashed / named) (#3829) 2022-10-10 17:41:25 +01:00
Hannes Greule
caef3a923b
Deprecate PlotId#copy (#3821) 2022-10-08 14:11:16 +01:00
BlockyTheDev
d4c3ceaf2b
Move license into jar during compile process (#3826) 2022-10-08 14:10:57 +01:00
StealWonders
e53d2ac449
Update the plot sign when a plot has been purchased (#3822) 2022-10-03 21:51:17 +02:00
Pierre Maurice Schwang
1b717c9b10
Only show visible players in /plot near (#3819) 
feat: check visibility of player in `/plot near`
 2022-10-03 21:50:41 +02:00
Hannes Greule
35abae99ca
Improve feedback for invalid patterns (#3818) 
improve feedback for invalid patterns
 2022-10-02 22:22:08 +02:00
Schuwi
d1a85982fb
Fix "set block timer" error after "/plot download" with legacy-webinterface setting (#3812) 
Add missing `Plot.removeRunning` call to Download
 2022-10-01 11:37:24 +02:00
resi23
3446b913cd
plots.auto.mega fix for #3815 (#3816) 
Co-authored-by: Resi <unconfigured@null.spigotmc.org>
 2022-09-28 10:53:44 +02:00
Alexander Brandes
60d266b2d7
Release 6.10.0 2022-09-21 16:28:17 +02:00
DerEingerostete
476f3d328d
feature: add flag for beacon effects of other plots (#3627) 
* feature: add flag for beacon effects of other plots

Took 7 minutes

* fix: don't add the beacon effect flag if the platform is not paper

Took 2 minutes

* fix: creating consistency in documentation

Took 7 minutes

* feature: add global paper setting for the beacon-effect

* fix: description of the plot flag and rewrite of the listener

* fix: renamed flag and added road support

* fix: renamed flag and changed flag functionality

* fix: added spigot fallback listener and fixed NPE

* refactor: Address checkstyle violations

* addition: remove beacon effects when player leaves a plot

* fix: updated javadoc and fixed usage of the PlotListener#addEffect method

* chore: Run license updater

Co-authored-by: BuildTools <unconfigured@null.spigotmc.org>
Co-authored-by: Alexander Brandes <mc.cache@web.de>
 2022-09-05 20:06:37 +02:00
Hannes Greule
e0eff15694
fix: use correct uuid type in /grant (#3759) 
use correct type
 2022-08-07 21:19:01 +02:00
Hannes Greule
7669e79da1
refactor: simplify timeout logic in uuid pipeline (#3760) 
simplify timeout logic
 2022-08-06 16:32:11 +02:00
Alexander Brandes
4e5a2b9f96
fix: Add user friendly message for creationdate placeholder (#3745) 2022-07-29 23:00:37 +02:00
Alexander Brandes
dcf98c2298
build: Release 6.9.3 2022-07-25 21:10:39 +02:00
Hannes Greule
ae59c7442f
fix: improve handling of missing message files (#3718) 
* improve handling of missing message files

* fix javadoc

Co-authored-by: Alexander Brandes <mc.cache@web.de>
 2022-07-25 21:02:54 +02:00