Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-04 09:10:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
5,276 Commits 13 Branches 68 Tags 88 MiB
cbb284b0fd
Commit Graph

1239 Commits

Author SHA1 Message Date
Hannes Greule
cbb284b0fd
Properly drop unsupported biomes from biome list (#4074) 
* Drop CUSTOM from biome list

* Drop cherry_grove if present on pre 1.20 versions
 2023-06-14 15:12:34 +02:00
Phillipp Glanz
db361cc420
Wrong biome list for 1.19.4 if datapacks are not enabled (#4016) 
* Remove cherry grove for 1.20 below

* Handle PR feedback. Replace version check with registry check

* Simplify the biomes list

* Update Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java

Co-authored-by: Hannes Greule <SirYwell@users.noreply.github.com>

* Handle pr feedback

---------

Co-authored-by: Hannes Greule <SirYwell@users.noreply.github.com>
 2023-06-09 13:22:23 +02:00
Pierre Maurice Schwang
958c66b28f
Road-Schematic-Generation now shows correct skull skins and banner patterns (#4026) 
* fix: Preserve NBT Data for Banners and Skulls on Chunk Generation

* Update Bukkit/src/main/java/com/plotsquared/bukkit/schematic/StateWrapper.java

* Make it compile

---------

Co-authored-by: Alexander Brandes <mc.cache@web.de>
 2023-05-13 22:32:33 +02:00
Jordan
1a712ad3c1
fix: account for false permissions when checking range (#4014) 2023-04-21 23:24:14 +01:00
dordsor21
745b06a008
fix: fix generation by re-adding important method 2023-03-16 17:42:48 +00: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
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
42e146b8c7
Delete unused HyperverseWorldManager file 2023-03-05 20:53:00 +01:00
Alexander Brandes
a5fdcda673
Merge branch 'v6' into v7 2023-03-05 10:18:55 +01:00
ByteExceptionM
fc3137cd96
Fix farmland moisturize (#3978) 
* fix: Fix farmland gets moisturizes

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

* chore: Revert code reformat

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

---------

Signed-off-by: ByteExceptionM <git@byteexception.eu>
 2023-03-05 10:15:05 +01:00
Alexander Brandes
a5c53a96d1
Record-inize methods (#3976) 2023-03-05 10:07:36 +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
Traks
d7c2ab1d16
Make farmland keep its moisture (#3952) 
Handle MoistureChangeEvent for farm land
 2023-01-31 11:22:13 +01:00
Alexander Brandes
586474c8e6
Merge branch 'v6' into v7 2023-01-23 13:40:52 +01:00
Alexander Brandes
ab357deb48
Put more legacy web interface deprecations in place 2023-01-23 13:40:35 +01:00
Alexander Brandes
bb0f200429
Merge branch 'v6' into v7 2023-01-23 13:18:28 +01:00
Alexander Brandes
5787588500
Move BukkitPlotGenerator#generateChunkData() deprecation from v7 to v6 2023-01-23 13:18:20 +01:00
Alexander Brandes
bed62edc02
Resolved conflicts 2023-01-23 13:03:26 +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
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
dordsor21
746028afbc
*Actually clean up 2023-01-17 13:25:46 +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
f6f00dfcda
fix: Remove chunk#isLoaded call in BukkitChunkCoordinator (#3934) 2023-01-16 17:14:20 +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
1d201b04ba
chore: Update a few deprecations (#3913) 2023-01-13 17:48:13 +01:00
Alexander Brandes
e887a59158
Officially deprecated BukkitPlayer#BukkitPlayer() (#3922) 
* Officially deprecated BukkitPlayer#BukkitPlayer()

* Address review feedback
 2023-01-12 10:03:11 +01:00
Alexander Brandes
a12490c3eb
Fixes #3919 2023-01-09 23:50:13 +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
Hraponssi
120bf37196
Fix dispensers loading Legacy Material Support (#3894) 
Fixes https://github.com/IntellectualSites/PlotSquared/issues/3883
 2022-12-23 09:08:38 +00:00
Jordan
f3bc504a6f
refactor: adjust specific Nullable annotations used (#3869) 2022-12-02 12:39:38 +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
2147012beb
chore: deprecate paper 1.13 listener as P2 effectively doesn't support 1.13 (#3872) 2022-11-14 22:58:05 +01:00
Jordan
52bb561689
fix: attempt to recover from IllegalStateException when restoring block tags (#3838) 
- Fixes #3801
 2022-11-14 16:47:24 +01:00
Jordan
55c8a590e7
Fix item thrower/owner can be null (#3866) 
fix: item thrower/owner can be nuill
 - Fixes #3862
 2022-11-12 17:10:21 +01:00
Jordan
9f3850000c
fix: adjust nullability checks for shulkers in the kill road mobs task (#3842) 
- Fixes #3789
 2022-10-15 15:26:14 +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
BlockyTheDev
d5445cfbef
Don't kill owned road entities (leashed / named) (#3829) 2022-10-10 17:41:25 +01:00
Hannes Greule
49b19e0eaf
Check proper locations on PortalCreateEvent (#3834) 
check proper locations on PortalCreateEvent
 2022-10-08 15:13:11 +02:00
StealWonders
5786e8cc7a
refactor: replace guava's Iterables with Java's stream API (#3823) 2022-10-03 21:51:05 +02:00
Hannes Greule
8deeef4f7d
Add allay to animals (#3788) 
add allay to animals
 2022-09-21 16:18:34 +02:00
resi23
9b0b071c0c
Add GLOW_BERRIES to VineGrowFlag (#3803) 2022-09-21 16:18:18 +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