Commit Graph

1356 Commits

Author SHA1 Message Date
c8ad936d26 Clean up PlotPlatform a bit and make the placeholder registry injectible 2020-12-05 18:41:41 +01:00
60b5f5fe48 Add note about Nashorn 2020-12-05 18:38:10 +01:00
d9aaed0035 Update dependencies 2020-12-04 18:07:59 +01:00
4ff50525ed Fixes https://github.com/IntellectualSites/PlotSquaredSuggestions/issues/110 2020-12-04 17:30:11 +01:00
34e02e9f3a Make JavaVersionCheck private 2020-12-04 16:00:18 +01:00
62690c2a53 Postpone java version during startup 2020-12-04 12:25:53 +01:00
5d30e0854f Add java version checker 2020-12-04 12:15:56 +01:00
ee7f683b76 Bump paperlib, fix single worlds. 2020-11-26 16:54:38 +00:00
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
be9d9264ae Make use of Permission class in tab completion
Plus document a few more permission nodes
2020-11-19 22:29:44 +01:00
eec369ea4f Improve tab completion, adjust permissions and more v6 changes 2020-11-19 21:53:27 +01:00
ce7ceccc1c Merge branch 'v6' into feature/v6/generify-perms 2020-11-16 10:25:48 +01:00
5b11175cf3 Add plots.visit.denied permission 2020-11-03 15:44:07 +00:00
7a9b3442d2 1.16.4 2020-11-03 16:43:18 +01:00
b66e2359d1 Update to 1.16.4
- Bump WorldEdit to 7.2.0 release
2020-11-03 15:58:17 +01:00
81c72ee5d9 Finish up permissions 2020-11-02 21:03:46 +01:00
fed7f89f96 Fix compiling 2020-11-02 11:58:07 +01:00
aefa629509 Generify permissions thru Permission class
- Fixed a few improper permissions
- Fixed a couple of typos
2020-11-02 00:55:58 +01:00
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
7e7ecd6a0f Update paperlib 2020-11-01 17:17:12 +01:00
333493f351 adventure v4.1.0; project now compiles 2020-10-17 21:10:02 +01:00
565f9e3e29 5.13.8 2020-10-11 19:27:01 +01:00
a7a29eaf97 Correctly cancel notify tasks and add notifications to commands 2020-10-09 17:24:59 +01:00
a451d2d6f2 Fix the injection 2020-10-09 16:34:59 +01:00
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
bba499649b No need to point if PAPI is not in use 2020-10-08 20:56:33 +02:00
f9cd54c445 Shift logger.info -> error when running in an outdated environment 2020-10-08 20:54:06 +02:00
0d89125a8e Replace sys out with logger factory 2020-10-08 20:52:02 +02:00
e28fb49015 Add override permission for /plot music 2020-10-08 19:27:05 +02:00
2eee1ef203 Fix log4j 2020-10-08 14:33:48 +02:00
cd605f4996 Relocate log4j, move slf4j declaration 2020-10-08 14:02:08 +02:00
e15b5a07fb It runs! And it's small! 2020-10-08 14:02:08 +02:00
c198305b5e Add missing relocations 2020-10-08 14:02:08 +02:00
c3069a425d Format licence headers 2020-10-08 14:02:08 +02:00
9b1dc7d42e She compiles! 2020-10-08 14:02:08 +02:00
ec23fcdd75 Rewrite build scripts
Co-Authored By: Mariell Hoversholm <proximyst@proximyst.com>
2020-10-08 14:02:08 +02:00
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
b55d836871 5.13.7 2020-10-07 11:59:44 +01:00
a210f523a5 Add more information to debugpaste 2020-10-04 18:19:29 +02:00
56e6922279 Remove BungeePerms UUID fetcher 2020-10-04 13:26:56 +02:00
6e2f738d86 Stop relying on maxim's repo as it's very unreliable. 2020-10-04 12:24:37 +01:00
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
2f5ce67154 add back setShouldAbortSpawn 2020-09-29 15:55:08 +01:00
89318be5f4 Apply e2f9b4245b to paper listener too 2020-09-29 15:53:23 +01:00
8c4bb4140a 5.13.6 2020-09-20 19:51:54 +01:00
e974fe5dc7 Merge branch 'v6' into features/v6/queue-features 2020-09-18 12:22:32 +01:00
85a23442cc bump minimessage version to fix build 2020-09-18 12:22:01 +01:00
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
8547533210 update pom 2020-09-11 15:04:09 +01:00
1552a8e74b Add option to change lighting behaviour in queues 2020-09-11 14:18:50 +01:00