EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-10-31 01:23:44 +01:00
Code Issues Projects Releases Wiki Activity
5,285 Commits 282 Branches 82 Tags
af32399dd2201edd4d5e5a111f469152ffc609dd
Commit Graph

2057 Commits

Author SHA1 Message Date
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
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
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