Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-06-30 11:05:13 +02:00
Code Issues Packages Projects Releases Wiki Activity
4,447 Commits 18 Branches 64 Tags 93 MiB
57fc51d013
Commit Graph

672 Commits

Author SHA1 Message Date
dordsor21
67683fbddb
Ensure not to parse null parameters into templates for titles 2020-12-10 17:56:22 +00:00
Hannes Greule
824f9d7ad0 Add missing returns to /plot cluster 2020-12-09 23:14:52 +01:00
Hannes Greule
3e99f90eb1 Don't spit NPEs on NonNull values 2020-12-09 22:45:47 +01:00
N0tMyFaultOG
bc1d3ddd5d
Fix spelling 2020-12-07 21:25:32 +01:00
N0tMyFaultOG
bf7b75b619
Make titles duration configurable 2020-12-07 21:23:38 +01:00
N0tMyFaultOG
469d6ab907
Fixes https://github.com/IntellectualSites/PlotSquaredSuggestions/issues/77 2020-12-07 14:46:16 +01:00
N0tMyFaultOG
a4dd5bb62f
Add tab completion to like/dislike and fix more messages 2020-12-07 12:51:14 +01:00
N0tMyFaultOG
60859de0bd
Add an option to teleport the player on plot clearing or deletion 2020-12-07 10:55:34 +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
Hannes Greule
14ec7fb816 Fix PlotRangeIterator 2020-12-05 18:03:24 +01:00
N0tMyFaultOG
410879d154
Fixes https://github.com/IntellectualSites/PlotSquaredSuggestions/issues/141 2020-12-05 15:20:19 +01:00
N0tMyFaultOG
f14121e99c
Initiate placeholder registry 2020-12-05 15:08:27 +01:00
N0tMyFaultOG
19d7444946
Fix flag description 2020-12-04 19:27:34 +01:00
N0tMyFaultOG
cfd3c159f9
Follow up to 4ff50525ed 
Skipping deprecation here, this exists for so long and and has been superseded by permissions now.
 2020-12-04 17:33:41 +01:00
N0tMyFaultOG
4ff50525ed
Fixes https://github.com/IntellectualSites/PlotSquaredSuggestions/issues/110 2020-12-04 17:30:11 +01:00
NotMyFault
ec683cdf88
Update ClassicPlotWorld.java 2020-11-29 17:48:59 +01:00
N0tMyFaultOG
39feed6fac
Improve wording of generation steps 2020-11-29 17:35:41 +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
abed07b613 Add tab completion for /plot area 2020-11-19 21:24:23 +01:00
N0tMyFaultOG
6cfdedb823 Don't collapse imports 2020-11-19 21:13:35 +01:00
N0tMyFaultOG
12861f6c07 Add tab completion for /plot setowner 2020-11-19 17:39:58 +01:00
N0tMyFaultOG
52065b8313 Add tab completion for /plot schematic 2020-11-19 17:36:14 +01:00
N0tMyFaultOG
f6ff843cfb Send message when attempting to leave an own plot 
This is a temporary workaround for the todo addressed below.
 2020-11-19 17:30:26 +01:00
N0tMyFaultOG
aedf402c17 Fix /plot leave requiring an arg when none is needed 2020-11-19 17:10:01 +01:00
N0tMyFaultOG
0745b03271 Add tab completion for /plot cluster 2020-11-19 17:00:21 +01:00
N0tMyFaultOG
bb5c0de367 Fix /plot download world not being clickable 2020-11-19 16:39:44 +01:00
N0tMyFaultOG
9478251d44 Fix /plot buy message and enhance it with player balance 2020-11-19 16:32:30 +01:00
N0tMyFaultOG
ce7ceccc1c Merge branch 'v6' into feature/v6/generify-perms 2020-11-16 10:25:48 +01:00
dordsor21
5d4cf3b705
setowner should allow null UUIDs 2020-11-10 17:24:37 +00:00
N0tMyFaultOG
092690e9f0 Update permission in regards of https://github.com/IntellectualSites/PlotSquared/pull/2932 2020-11-03 15:44:07 +00:00
N0tMyFaultOG
5b11175cf3 Add plots.visit.denied permission 2020-11-03 15:44:07 +00:00
N0tMyFaultOG
f7dd8af35e Enhance plot claim message 2020-11-03 15:43:28 +00: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
N0tMyFaultOG
bc32581cbd Improve empty global flag list message 2020-11-02 00:00:38 +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
dordsor21
7e9a9e14c7 Fix various instances where Adventure is being used incorrectly 2020-10-25 22:38:00 +00:00
Mariell Hoversholm
333493f351 adventure v4.1.0; project now compiles 2020-10-17 21:10:02 +01:00
dordsor21
a1bfc1cb26
correctly handle road flags 2020-10-11 19:24:50 +01:00
dordsor21
cfd432886d
Correctly handle road flags 2020-10-11 19:19:17 +01:00
N0tMyFaultOG
aeeae7c167 Fix links not being clickable 2020-10-11 12:47:49 +02:00
N0tMyFaultOG
08c7d4d15e Remove dead imports 2020-10-09 21:03:23 +02:00
N0tMyFaultOG
29b92659c7 Fix typos 2020-10-09 20:50:12 +02:00
N0tMyFaultOG
4622f4b51d Fix plot leave 2020-10-09 20:21:02 +02:00
dordsor21
4d51dc9b6c
Switch to translateable captions 2020-10-09 17:47:51 +01:00
dordsor21
76b992509b
use format not silly round stuff 2020-10-09 17:29:05 +01:00
dordsor21
925978db8f
change default lighting to 1 2020-10-09 17:26:52 +01:00
dordsor21
c0e90ddb33
increase interval of progress notify 2020-10-09 17:25:48 +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
0d89125a8e Replace sys out with logger factory 2020-10-08 20:52:02 +02:00
N0tMyFaultOG
6b37d678df Fix plot template tab completion 2020-10-08 20:47:43 +02:00
N0tMyFaultOG
02698b3a0e Fix plot grant tab completion 2020-10-08 20:42:17 +02:00
N0tMyFaultOG
6f0512c18c Fix plot set tab completions 2020-10-08 20:16:29 +02:00
N0tMyFaultOG
e46b38b301 Fix plot set values 2020-10-08 19:51:42 +02:00
N0tMyFaultOG
5841817fb5 Missing space 2020-10-08 19:29:09 +02:00
N0tMyFaultOG
e28fb49015 Add override permission for /plot music 2020-10-08 19:27:05 +02:00
N0tMyFaultOG
841eef6a52 Fix done message on backup and add done message to grant 2020-10-08 18:57:11 +02:00
Mariell Hoversholm
e15b5a07fb It runs! And it's small! 2020-10-08 14:02:08 +02:00
Mariell Hoversholm
c3069a425d Format licence headers 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
N0tMyFaultOG
a210f523a5 Add more information to debugpaste 2020-10-04 18:19:29 +02:00
Aurora
e6237d68d0 Also remove BungeePerms from the config 2020-10-04 13:26:56 +02:00
dordsor21
95f509d337
Stop forcing loiwercase world names 2020-10-02 15:08:14 +01:00
dordsor21
f80e8c8d11
For sake of allowing v5 -> v6 2020-09-25 20:08:28 +01:00
dordsor21
ff83931a3f
Fix plot grant 2020-09-20 19:42:13 +01:00
dordsor21
41f494fbff
Remove jetbrains annotations 2020-09-18 12:45:26 +01:00
dordsor21
e974fe5dc7
Merge branch 'v6' into features/v6/queue-features 2020-09-18 12:22:32 +01:00
dordsor21
819902c24e
Fix licenses 2020-09-14 22:00:09 +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
d843d1715d
Allow /plot home [area|world] 2020-09-11 15:03:48 +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
NotMyFault
5463f15633
Add pigstep music disc 2020-09-11 01:16:57 +02:00
Hannes Greule
f2355a76d6 Add default namespace when wrapping block categories by their ids 2020-09-06 23:36:36 +02: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
babad3ab6d Don't validate plot aliases with offline players (Fixes PS-126) 2020-09-04 14:49:02 +02:00
N0tMyFaultOG
cba2474df7 Merge v5/v6 2020-09-02 16:44:18 +02:00
N0tMyFaultOG
97e34844b4 Add option to opt-out MvDW Placeholder API 2020-09-02 12:13:23 +02:00
N0tMyFaultOG
e924a1920e Add message to rgar 2020-09-01 00:02:56 +02:00
Hannes Greule
311a2ddc75 Replace null checks with NullEconHandler 2020-08-25 12:41:03 +02:00
Hannes Greule
551d1d9f1a Add NullEconHandler to avoid verbose null checks 2020-08-25 12:41:03 +02:00
N0tMyFaultOG
a5dea9e7f6 Permission cleanup 2020-08-24 20:51:23 +02:00
N0tMyFaultOG
02bd83bd90 Merge v5 into v6 2020-08-24 14:33:53 +02:00
Hannes Greule
c42d5390a4 Allow teleporting to merged plots with multiple owners using /p home 2020-08-24 13:37:12 +02:00
Hannes Greule
31ea7297c2 Generate signs by default 2020-08-24 13:30:50 +02:00
Hannes Greule
c53cffb745 Generate signs by default 2020-08-24 13:17:15 +02:00
N0tMyFaultOG
26a99a122a Minor permission fix 2020-08-23 19:34:22 +02:00
N0tMyFaultOG
e93d7feb2c Fixes PS-114 2020-08-22 11:48:03 +02:00
N0tMyFaultOG
116b870152 Apply missing license header 2020-08-22 11:44:34 +02:00
Alexander Söderberg
45e75cc06e
Merge branch 'v6' into features/v6/services 2020-08-21 23:02:52 +02:00
NotMyFault
b2ac67692e
Merge pull request #2892 from TimonMi/v5 
[Bugfix] No chat message confirmation on /p add /p trust, etc.
 2020-08-21 18:28:05 +02:00
Hannes Greule
1064d777c2 Clean up unused code 2020-08-21 00:02:07 +02:00
Hannes Greule
62f675adbe Allow visiting all owners of merged plots 2020-08-21 00:01:53 +02:00