Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-18 11:16:16 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,678 Commits 14 Branches 68 Tags 88 MiB
fd4cec39c4
Commit Graph

1202 Commits

Author SHA1 Message Date
NotMyFault
1750dd3b97
Opt in future proof gradle features 🚀 (#2950) 
* Opt in future proof gradle features

* Resolve merge conflicts
 2021-04-30 09:50:22 +02:00
NotMyFault
361b936aa0
Update ServerLib 2021-04-27 11:58:49 +02:00
NotMyFault
de597391dc
Fix keep-inventory flag & adjust disallowed-blocks translation 2021-04-21 11:03:14 +02:00
NotMyFault
59599261ff
Fixes https://issues.intellectualsites.com/issue/PS-237 2021-04-12 16:08:31 +02:00
NotMyFault
e1fb8c1ae5
Take building min height also into consideration 2021-04-11 10:12:37 +02:00
NotMyFault
050cf3edb3
Update a few dependencies 2021-04-04 13:30:09 +02:00
NotMyFault
dd9edb68b2
Fixes https://github.com/IntellectualSites/PlotSquaredSuggestions/issues/23 2021-04-02 23:48:16 +02:00
NotMyFault
5780ad370a
Strip Java 15 note 2021-03-01 10:58:27 +01:00
Hannes Greule
38b60205e8 Use javax for Nullable + guice, hope I didn't miss anything 2021-02-24 20:35:38 +01:00
NotMyFault
027456fd77
Add crop-grow flag 2021-02-24 18:41:36 +01:00
NotMyFault
da45813a06 Add new metrics pies 2021-02-22 15:18:20 +01:00
NotMyFault
a75db92007
Update ServerLib 2021-01-30 13:16:36 +01:00
NotMyFault
aaf2fa8807
Update bStats to 2.1.0 2021-01-24 10:39:03 +01:00
NotMyFault
86e8457574
Move to ServerLib 2021-01-22 23:34:47 +01:00
Alexander Söderberg
8292ed9e31
More annotation work 2021-01-10 00:01:48 +01:00
Alexander Söderberg
57fc51d013 Initial annotation usage cleanup + EditorConfig 2021-01-09 22:28:41 +01:00
dordsor21
8b332adbe7 Address comments 2021-01-09 21:34:42 +01:00
dordsor21
3cea734b9b Fix singleworlds 2021-01-09 21:34:42 +01:00
dordsor21
7ac3f7ca03 Fix sync tasks not being sync 2021-01-09 20:39:25 +01:00
dordsor21
98e8476a88
Bring v5 entity spawn changes to v6 2021-01-06 21:56:26 +00:00
Hannes Greule
ad99ca1723
Use WE Expressions instead of js evaluation (#2941) 
* Implement thread-safe expression evaluation

* Update `{args}` to `plot` automatically

* Stringify more money/balance/price occurrences with EconHandler#format
 2021-01-02 16:32:07 +00:00
N0tMyFaultOG
f47561b580
Invert leaf-decay message 2021-01-01 21:51:28 +01:00
N0tMyFaultOG
4f60da292a
Add leaf-decay flag 
Stop leaves from decaying.
 2021-01-01 21:47:09 +01:00
N0tMyFaultOG
70fb86a1c3
Remove redundant legacy version check 
"api-version" backs us up here.
 2021-01-01 14:09:59 +01:00
N0tMyFaultOG
e8642df674
Update licenses to 2021 
Happy new year 🎆
 2021-01-01 00:19:45 +01:00
Hannes Greule
fafdae9ba9
Only check ice-form for ice (#2940) 
Co-authored-by: NotMyFault <mc.cache@web.de>
 2020-12-28 14:11:30 +00:00
dordsor21
1d0721034d
fix debugpaste with multiverse 2020-12-28 12:30:53 +00:00
dordsor21
3cfbe9585a
Merge branch 'v6' of github.com:IntellectualSites/PlotSquared into v6 2020-12-28 12:27:12 +00:00
dordsor21
71305e636c
cache bukkitworld 2020-12-28 12:10:27 +00:00
Hannes Greule
019da4d2f4 Expose legacy serializer for placeholders 2020-12-28 11:21:35 +01:00
N0tMyFaultOG
07491d8028
Rename database chart id 2020-12-22 20:53:13 +01:00
N0tMyFaultOG
8c3a0a8275
Fix compiling 2020-12-21 20:33:49 +01:00
N0tMyFaultOG
397692d113
Update Paster 2020-12-21 15:58:34 +01:00
N0tMyFaultOG
bb52301200
Merge remote-tracking branch 'origin/renovate/configure' into v6 2020-12-20 22:38:35 +01:00
dordsor21
e4a8459798
Switch to IncendoPaster "library" 2020-12-19 16:20:44 +00:00
dordsor21
14fa738fbe
switch to InvendoPaster "library" 2020-12-19 16:00:13 +00:00
N0tMyFaultOG
5147d67318
Add charts for complex plot components 2020-12-16 13:20:23 +01:00
dordsor21
992a683ba2
another annoying cache thing 2020-12-14 15:22:10 +00:00
dordsor21
e8e116312a
Merge branch 'v5' into v6 
# Conflicts:
#	Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntityEventListener.java
#	Core/src/main/java/com/plotsquared/core/command/Deny.java
#	Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java
 2020-12-14 15:15:27 +00:00
dordsor21
de3ba9a25c
re-send block change for blocks with gravity if they're physicsed 
fixes PS-159
 2020-12-14 14:53:53 +00:00
dordsor21
6eb2958afc
Fix merge issue 2020-12-11 11:42:19 +00:00
dordsor21
18f13b7d15
Merge branch 'v5' into v6 2020-12-10 21:28:28 +00:00
dordsor21
b4f3e85001
allow "owned" road mobs to be killed as well 
(those that are leashed, being ridden, etc)
 2020-12-10 21:14:32 +00:00
N0tMyFaultOG
3ca8a94419
Update java 8 notice 2020-12-08 00:18:40 +01:00
N0tMyFaultOG
714837dd00
Add charts for complex components 2020-12-07 23:05:25 +01:00
Hannes Greule
ff70d5db14
Feature/v6/arkitektonika (#2916) 
* Start working on Arkitektonika support

* Progress on Arkitektonika

* Add license headers

* Some QoL and javadocs

* Fix maximum calculation

* Fix minor formatting

* Reimplement legacy webinterface support

* Add documentation and fix deletion link

* Resolve conflicts/gradle stuff

* Fix links

* Make message readable

* Do not allow download of merged plots
 2020-12-05 19:50:41 +01:00
Alexander Söderberg
c8ad936d26
Clean up PlotPlatform a bit and make the placeholder registry injectible 2020-12-05 18:41:41 +01:00
N0tMyFaultOG
60b5f5fe48
Add note about Nashorn 2020-12-05 18:38:10 +01:00
N0tMyFaultOG
d9aaed0035
Update dependencies 2020-12-04 18:07:59 +01:00
N0tMyFaultOG
4ff50525ed
Fixes https://github.com/IntellectualSites/PlotSquaredSuggestions/issues/110 2020-12-04 17:30:11 +01:00
N0tMyFaultOG
34e02e9f3a
Make JavaVersionCheck private 2020-12-04 16:00:18 +01:00
N0tMyFaultOG
62690c2a53
Postpone java version during startup 2020-12-04 12:25:53 +01:00
N0tMyFaultOG
5d30e0854f
Add java version checker 2020-12-04 12:15:56 +01:00
dordsor21
ee7f683b76
Bump paperlib, fix single worlds. 2020-11-26 16:54:38 +00:00
Traks
585111ca38
Cancel boat placement on interactable blocks, fixes PS-175 (#2934) 
* Cancel boat placement on interactable blocks, fixes PS-175

* Keep boat protection for old game versions

Co-authored-by: NotMyFault <mc.cache@web.de>
 2020-11-24 16:32:35 +01:00
N0tMyFaultOG
be9d9264ae Make use of Permission class in tab completion 
Plus document a few more permission nodes
 2020-11-19 22:29:44 +01:00
N0tMyFaultOG
eec369ea4f Improve tab completion, adjust permissions and more v6 changes 2020-11-19 21:53:27 +01:00
N0tMyFaultOG
ce7ceccc1c Merge branch 'v6' into feature/v6/generify-perms 2020-11-16 10:25:48 +01:00
N0tMyFaultOG
5b11175cf3 Add plots.visit.denied permission 2020-11-03 15:44:07 +00:00
N0tMyFaultOG
7a9b3442d2 1.16.4 2020-11-03 16:43:18 +01:00
N0tMyFaultOG
b66e2359d1 Update to 1.16.4 
- Bump WorldEdit to 7.2.0 release
 2020-11-03 15:58:17 +01:00
N0tMyFaultOG
81c72ee5d9 Finish up permissions 2020-11-02 21:03:46 +01:00
N0tMyFaultOG
fed7f89f96 Fix compiling 2020-11-02 11:58:07 +01:00
N0tMyFaultOG
aefa629509 Generify permissions thru Permission class 
- Fixed a few improper permissions
- Fixed a couple of typos
 2020-11-02 00:55:58 +01:00
dordsor21
ee9b2e8bf8
Just merge the whole thing. Merge branch 'v6' into features/v6/queue-features 
# Conflicts:
#	Core/src/main/resources/lang/messages_en.json
 2020-11-01 18:58:24 +00:00
N0tMyFaultOG
7e7ecd6a0f Update paperlib 2020-11-01 17:17:12 +01:00
Mariell Hoversholm
333493f351 adventure v4.1.0; project now compiles 2020-10-17 21:10:02 +01:00
dordsor21
565f9e3e29
5.13.8 2020-10-11 19:27:01 +01:00
dordsor21
a7a29eaf97
Correctly cancel notify tasks and add notifications to commands 2020-10-09 17:24:59 +01:00
dordsor21
a451d2d6f2
Fix the injection 2020-10-09 16:34:59 +01:00
dordsor21
914429ab4f
Merge branch 'v6' into features/v6/queue-features 
# Conflicts:
#	Core/src/main/java/com/plotsquared/core/generator/SquarePlotManager.java
#	Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotManager.java
#	Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java
 2020-10-09 15:23:09 +01:00
N0tMyFaultOG
bba499649b No need to point if PAPI is not in use 2020-10-08 20:56:33 +02:00
N0tMyFaultOG
f9cd54c445 Shift logger.info -> error when running in an outdated environment 2020-10-08 20:54:06 +02:00
N0tMyFaultOG
0d89125a8e Replace sys out with logger factory 2020-10-08 20:52:02 +02:00
N0tMyFaultOG
e28fb49015 Add override permission for /plot music 2020-10-08 19:27:05 +02:00
Mariell Hoversholm
2eee1ef203 Fix log4j 2020-10-08 14:33:48 +02:00
Mariell Hoversholm
cd605f4996 Relocate log4j, move slf4j declaration 2020-10-08 14:02:08 +02:00
Mariell Hoversholm
e15b5a07fb It runs! And it's small! 2020-10-08 14:02:08 +02:00
Mariell Hoversholm
c198305b5e Add missing relocations 2020-10-08 14:02:08 +02:00
Mariell Hoversholm
c3069a425d Format licence headers 2020-10-08 14:02:08 +02:00
Mariell Hoversholm
9b1dc7d42e She compiles! 2020-10-08 14:02:08 +02:00
N0tMyFaultOG
ec23fcdd75 Rewrite build scripts 
Co-Authored By: Mariell Hoversholm <proximyst@proximyst.com>
 2020-10-08 14:02:08 +02:00
dordsor21
544d57c720
Merge branch 'v5' into v6 
# Conflicts:
#	Bukkit/build.gradle
#	Bukkit/pom.xml
#	Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/uuid/BungeePermsUUIDService.java
#	Core/src/main/java/com/plotsquared/core/PlotPlatform.java
#	Core/src/main/java/com/plotsquared/core/command/DebugPaste.java
#	Core/src/main/java/com/plotsquared/core/command/Grant.java
#	build.gradle
 2020-10-07 12:20:32 +01:00
dordsor21
b55d836871
5.13.7 2020-10-07 11:59:44 +01:00
N0tMyFaultOG
a210f523a5 Add more information to debugpaste 2020-10-04 18:19:29 +02:00
Aurora
56e6922279 Remove BungeePerms UUID fetcher 2020-10-04 13:26:56 +02:00
Alexander Söderberg
6e2f738d86 Stop relying on maxim's repo as it's very unreliable. 2020-10-04 12:24:37 +01:00
Hannes Greule
81d0bf6f04 Prevent blocks from getting waterlogged 
In some cases, the PlayerInteractEvent doesn't cancel right clicks on blocks that can be waterlogged
 2020-10-03 21:54:14 +02:00
dordsor21
2f5ce67154
add back setShouldAbortSpawn 2020-09-29 15:55:08 +01:00
dordsor21
89318be5f4
Apply e2f9b4245b to paper listener too 2020-09-29 15:53:23 +01:00
dordsor21
8c4bb4140a
5.13.6 2020-09-20 19:51:54 +01:00
dordsor21
e974fe5dc7
Merge branch 'v6' into features/v6/queue-features 2020-09-18 12:22:32 +01:00
dordsor21
85a23442cc
bump minimessage version to fix build 2020-09-18 12:22:01 +01:00
dordsor21
554efbb057
Merge branch 'v5' into v6 
# Conflicts:
#	.github/CODEOWNERS
#	Bukkit/pom.xml
#	Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java
#	Core/src/main/java/com/plotsquared/core/command/Alias.java
#	Core/src/main/java/com/plotsquared/core/command/HomeCommand.java
#	Core/src/main/java/com/plotsquared/core/command/Music.java
#	Core/src/main/java/com/plotsquared/core/listener/PlotListener.java
#	Core/src/main/java/com/plotsquared/core/player/ConsolePlayer.java
#	Core/src/main/java/com/plotsquared/core/player/PlotPlayer.java
#	Core/src/main/java/com/plotsquared/core/plot/flag/types/BlockTypeWrapper.java
#	build.gradle
 2020-09-11 15:44:04 +01:00
dordsor21
8547533210
update pom 2020-09-11 15:04:09 +01:00
dordsor21
1552a8e74b
Add option to change lighting behaviour in queues 2020-09-11 14:18:50 +01:00
dordsor21
f0e9a8c5fe
Implement progress subscribers 2020-09-11 12:59:40 +01:00
dordsor21
a98b23af02
progress subscriber 2020-09-11 11:20:38 +01:00
Alexander Söderberg
0aeca40137
Take player visibility into account when sending notify-enter and notify-leave messages. Fixes PS-103. 2020-09-05 18:48:58 +02:00
Hannes Greule
5c48e4ad19 Add missing license header 2020-09-05 18:39:56 +02:00