Commit Graph

4587 Commits

Author SHA1 Message Date
NotMyFault
24945efc7d
Merge branch 'v5' into v6 2021-06-06 21:41:24 +02:00
NotMyFault
a01ad5aa04
Update wiki location 2021-06-06 21:40:34 +02:00
NotMyFault
fa14c40283
Update wiki links 2021-06-06 21:38:49 +02:00
NotMyFault
d8f19cec66
Adjust improper origin -> target message of plot moving 2021-06-04 19:17:20 +02:00
SirYwell
955341ff9f Move enqueue to the actual end of the code 2021-06-04 18:41:57 +02:00
SirYwell
cb342de934 Check merge status from correct plot 2021-06-04 13:39:03 +02:00
SirYwell
ea0342f100 Enqueue on unlink 2021-06-04 13:39:03 +02:00
NotMyFault
cd57741a51
Fix typo introduced in f4552e358d 2021-06-03 12:53:47 +02:00
NotMyFault
f4552e358d
Fixes #3027
- Ditch slf4j in favor of log4j. slf4j is (unfortunately) very much unmaintained at this time and future versions of MC (1.17+) will use log4j version 2.14.1 onwards over some ancient sfl4j version.
- Using log4j reduces our jar size as well, because we don't need to bridge it as the game provides it natively.
2021-06-03 12:40:27 +02:00
NotMyFault
1dc225362d
Bump gh action tasks prevent failing of gradle wrapper validation 2021-06-02 23:29:43 +02:00
Mariell Hoversholm
a6b3e97cda
feat: re-add aggregated javadocs task (#3077)
* feat: re-add aggregated javadocs task

This was removed by IntellectualSites/PlotSquared#2922.
Closes IntellectualSites/PlotSquared#3037.

Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>

* feat: aggregate javadocs on root build task

Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>

* Address changes requested

Co-authored-by: NotMyFault <mc.cache@web.de>
2021-06-02 23:26:27 +02:00
Patrick "IPat" Hein
8a244d12fc
Fix if-condition limited to roads for animal attack cancelling on plots (#3079)
* Negate mob-place flag debug message

* fixed a little typo :)

* Added check for dragon egg teleportation event
https://github.com/IntellectualSites/PlotSquared/issues/3074

* Basic dragon egg interact bugfix (Left-click interaction)

* Lifted admin if-condition out of roads (out-of-plot) only block (for animals)

Co-authored-by: NotMyFault <mc.cache@web.de>
2021-06-02 19:55:35 +02:00
NotMyFault
5a5d1f5e62
Fixes #3063 2021-06-01 21:54:00 +02:00
NotMyFault
21214814b7
Fixes #3032 2021-05-31 21:59:15 +02:00
NotMyFault
3ac93dcfca
Enhance /plot target & expiry confirm message 2021-05-28 20:21:41 +02:00
NotMyFault
c509882a18
Enhance alias message with placeholders 2021-05-28 11:37:13 +02:00
Orlaando
c146d6207d
Make /plot pardon an alias of Plot Remove (#3071)
* Make /plot pardon an alias of /plot undeny

* Make Remove state more clearly what it does

* Lazily target v6
2021-05-28 11:01:42 +02:00
Patrick "IPat" Hein
2045a4988d
Prevent dragon eggs from leaving or entering plot bounds (#3075)
* Negate mob-place flag debug message

* fixed a little typo :)

* Added check for dragon egg teleportation event
https://github.com/IntellectualSites/PlotSquared/issues/3074

* Basic dragon egg interact bugfix (Left-click interaction)

Co-authored-by: NotMyFault <mc.cache@web.de>
2021-05-28 10:57:48 +02:00
NotMyFault
dc7e6010cb
Fixes #3073
- Also add new caption if attempting to clear an empty alias
2021-05-27 17:06:04 +02:00
NotMyFault
b1fc17e045
Remove scripting from javadocs 2021-05-25 20:51:26 +02:00
NotMyFault
daf0e6e1ba
Use same creation message for templates like for setup 2021-05-25 11:02:37 +02:00
NotMyFault
6f263735f0
Move notification-as-actionbar into the Chat config block
- Move titles alongside all its new options into its own config block
- Move `titles-as-actionbar` into the new titles block
- Enhance notification about removed config entries
2021-05-24 21:52:27 +02:00
NotMyFault
1d2aa74e51
Add actionbar message for notification flags
- Move title_as_actionbar boolean into enabled_components
2021-05-24 13:49:00 +02:00
Glare
a69b1d895c
Implemented the ability to change titles to actionbar on plot entry (#3060)
* Implemented the ability to change titles to actionbar on plot entry

* Fixed typo in action

* Updated explanation in Javadoc

* Implemented suggestions

* Remove excess import

* Implemented PR suggestions

Co-authored-by: NotMyFault <mc.cache@web.de>
2021-05-23 17:28:03 +02:00
NotMyFault
399d77c60f
Component-ify plot setup wizard
Touches #3068
2021-05-22 19:49:22 +02:00
NotMyFault
b768ee6d41
Don't send teleport message before the teleportation is initiated 2021-05-22 18:15:34 +02:00
NotMyFault
58faffed6d
Remove chat.interactive option
Whether the chat is interactive or not can be declared in the strings.json by using MMs <click:_action_:_value_> type.
2021-05-22 13:22:44 +02:00
NotMyFault
87706d471b
Add option for legacy sign material
Follow up to cde27899dd
2021-05-22 12:34:04 +02:00
Glare
eb7eb15ee7
Implemented tab completion for /plot help (#3053)
Co-authored-by: NotMyFault <mc.cache@web.de>
2021-05-22 02:23:54 +02:00
NotMyFault
a17085bb18
Remove dead imports 2021-05-21 20:56:44 +02:00
NotMyFault
cde27899dd
Fixes #3064 2021-05-21 19:14:13 +02:00
NotMyFault
93ff778de0
Add administrative override for /plot components 2021-05-21 17:54:26 +02:00
NotMyFault
17f91c8eb9
Make /plot rate GUI items customizable
Bye bye legacy items :)
2021-05-21 16:48:34 +02:00
NotMyFault
7775cd0073
Do not rely on a static file path
Doing so will cause issues with the `--plugins` flag.
E.g. `java -jar server.jar --plugins /path/to/plugins/`
2021-05-21 00:35:19 +02:00
NotMyFault
cc48f273c0
Fixes #3057
Actually execute a kick from server if ordered
2021-05-20 21:59:05 +02:00
NotMyFault
c8406681d7
Notify the kicked person over the actor 2021-05-20 21:22:00 +02:00
NotMyFault
a05dd19986
Fixes #3058
- Anonymize meta data keys
2021-05-20 21:04:07 +02:00
NotMyFault
aae350c1b3
Enhance flag tutorial message 2021-05-20 19:57:06 +02:00
NotMyFault
c48559410f
Provide instruction about the .editorconfig 2021-05-20 00:26:35 +02:00
NotMyFault
9c59bfde52
Rephrase message if user has no access to sub-command help pages 2021-05-19 23:48:32 +02:00
Patrick "IPat" Hein
eb9d7e97d9
Bug through last Economy PR - Withdrawn money for non-affordable plots (#3036)
* Replaced economy supported (Vault) check within cost condition with a pre-eliminating if-guard

* Negate mob-place flag debug message

* Actually prevent purchase of plots if they can't afford it (whoops)

Co-authored-by: NotMyFault <mc.cache@web.de>
2021-05-19 17:44:45 +02:00
NotMyFault
24eebe6711
Update gradle to 7.0.2 2021-05-19 11:51:55 +02:00
SirYwell
a2b8e4493f Fix infinite loop on multi auto (fixes #3022) 2021-05-18 22:30:40 +02:00
Patrick "IPat" Hein
7c4a85325c
Added event handler for cauldron water level modification to prevent untrusted players interacting with a plot (#3035)
* Added check for burning players using non-trusted plots cauldrons to extinguish themselves, causing the cauldron level to decrease

* Cancelling burning of players without downscaling water instead of ignoring their burn status

* Using Java 14 JEP 305 enhanced instanceOf

Co-authored-by: NotMyFault <mc.cache@web.de>

* Players without permissions may not wash banners or armor now either. Rain modification is now permitted.

* Extinguishing is now explicitly handled so that event handling for other plugins has the actual information of the new cauldron water level

* Un-nestified the if-condition :)

* Properly cancelled the event (since it is semantically cancelled)

* (Actually) properly cancelled the event (since it is semantically cancelled)

Co-authored-by: NotMyFault <mc.cache@web.de>
2021-05-18 19:23:22 +00:00
SirYwell
94ba90d694 Always initialize PermissionHandler (fixes #3019) 2021-05-18 21:17:47 +02:00
NotMyFault
e97bc25fb8
Log plot chat to console
- Fix plot music removal template
- Fix debug args
2021-05-17 10:35:09 +02:00
NotMyFault
73936bb10d
Fix licenser issues 2021-05-17 09:31:33 +02:00
NotMyFault
23e65ac5d3
Merge branch 'feature/v6/update-licenser' into v6 2021-05-17 09:29:08 +02:00
NotMyFault
9dc0396411
Fix plot list coloring 2021-05-16 22:47:02 +02:00
NotMyFault
cc6db9ae9e
Merge branch 'v5' into v6 2021-05-15 20:47:01 +02:00