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,027 Commits 13 Branches 68 Tags 88 MiB
75fd9b2631
Commit Graph

1962 Commits

Author SHA1 Message Date
Alex
3ed369de19
style: Add missing bracket for deny example (#3351) 2021-11-29 20:56:48 +01:00
Pascal Bürklin
8f3fa419c4
Fixes #3344, Wrong iterator algorithm in PlotRangeIterator (#3345) 2021-11-23 19:52:23 +00:00
dordsor21
d1dbf777a4
Don't check/set if a chunk should be saved if it's a world-plot 2021-11-11 17:57:59 +00:00
Jordan
823e78377b
feat: Better deciding of heights to use for generation and schematics (#3300) 
* Better deciding of heights to use for generation and schematics
 - If bedrock is disabled, we should still be filling the space with something
 - Use minBuildHeight instead of hardcoding "1" for schematics (it is still 1 by default) to ensure all-encompassing schematics
 - Schematic generation/handling for roads etc. should be accounting for all of wall, road, and plot heights for deciding point of origin
 - Fixes #3269
 - Starts to address #3175

* Also do for HybridPlotManager clear
 2021-11-11 17:33:38 +00:00
dordsor21
87a2e81ec3
Don't write biome data to schematics if it's not present 2021-11-10 19:51:14 +00:00
Alex
88775334b7
Schematic paths are configurable (#3303) 2021-11-09 10:32:07 +00:00
Jordan
c1163cdb2e
feat: Split configuration for teleport on claim/auto (#3308) 
- Fixes #2953
 2021-11-07 22:29:49 +01:00
dordsor21
a5cf7bf2c2
Fix BlockLoc to the requirements for use as a home location 
- Add home locations to #fromString
 - Switch to y=Integer#minValue more
 - May help with #3321
 2021-11-04 20:47:56 +00:00
dordsor21
3d4d413de8
Minor adjustment to plot home location logic 
- Allow "centre" spelling
 - ClassicPlotWorld contains the PLOT_HEIGHT config setting, not HPW
 2021-11-02 15:41:16 +00:00
Hannes Greule
b97e843849
perf: Get rid of Guice overhead when accessing the plot area manager (#3315) 
Fixes #3311
Co-authored-by: Jordan <dordsor21@gmail.com>
 2021-11-02 13:38:48 +00:00
Alex
48c7a3e94e
refactor: Use player friendly done message on restricted building (#3309) 2021-11-02 13:32:04 +00:00
mindw0rm
7263290bbe
fix: Untrusted visit flag not working with untrusted visit permission 
Fixes #3317 
Co-authored-by: Alex <mc.cache@web.de>
 2021-11-02 13:28:39 +00:00
Jordan
6f3eabba0e
feat: Don't display the default plot title if on a server-plot, unless configured otherwise. (#3305) 
- If plot-title flag is set, title will still be displayed.
 2021-11-01 11:23:53 +00:00
Jordan
804228fa6c
Allow pitch and yaw to be used in default home location (#3304) 2021-10-29 10:48:35 +01:00
Jordan
be85708e5a
feat: Add border bypass permission (#3302) 
* Add border bypass permission
 - Fixes #3297

* Add permission to plots.admin permpack

* Implement messages on leaving/entering border area

* Rename to border.denied and make border msg red

* change too le/ge as tthey are likely to be equal to border when hit.
 - Since we check for being across the border beforehand, it will hopefully not be spammed too much?
 - If it's spammed then either we use meta to set if a player's left the border, or we just remove the come-back-in altogether because it's a little looong
 2021-10-28 10:13:36 +02:00
NotMyFault
b022a97196
fix: Flag list parsing for console players (#3277) 
Instead of recreating the logic, we can simply reuse what we created above and string-ify that for parsing.
 2021-10-18 20:20:52 +02:00
dordsor21
cb596ee6ea
Fix StackOverFlow 2021-10-18 17:27:51 +01:00
Xaver106
4e391136c0
Add and Trust permission now count correctly (#3290) 2021-10-15 11:28:23 +01:00
NotMyFault
6528c60f4d
fix: Fix greeting & farewell captions not being used (#3272) 
* fix: Fix greeting & farewell captions not being used

Fixes #3250

* feat: Allow alias in greeting & farewell flag
 2021-10-07 08:10:00 +00:00
NotMyFault
7ee46be2ac
feat: Allow plot alias in title (#3273) 
Fixes #3171
 2021-10-07 08:07:13 +00:00
NotMyFault
21727ebfc7
build: Overhaul build & deployment workflow (#3267) 
* Fixes #3250

* build: Overhaul build & deployment workflow

- Move to release drafter
- Replace publishing with gradle nexus
- Conventional commits are handy
- Determine build status in gh actions before deploying
 2021-10-04 15:28:47 +02:00
Pierre Maurice Schwang
e322ee85fd
feat: Respect non-visible players in tab completion (Closes #3263) (#3264) 
* Respect non-visible players in tab completion (Closes #3263)

* Deprecate old Tab-Complete methods instead of hard-replacing them

* wtf git

* Mark for removal, useless new-lines

* Pass ConsolePlayer.getConsole() instead of Nullable param
 2021-10-03 14:32:02 +02:00
Pierre Maurice Schwang
541255fe7e
ListFlag#merge should not allow duplicates (Fixes #3157) (#3265) 2021-10-03 14:31:57 +02:00
Kevin Ludwig
4f12dcf966
Return base plot when using alias (#3253) 2021-09-25 15:58:31 +02:00
dordsor21
c37b13dcb3
Fix bad move to adventure 2021-09-18 21:54:22 +01:00
dordsor21
b2b8598b5b
Fix #3246 2021-09-15 13:19:25 +01:00
NotMyFault
61e5d9f1b6
Move /p components title to translations file matching other parts of components 
- Also component-ify title, this must not be limited to a String.
 2021-09-15 11:13:03 +02:00
dordsor21
4568b17c54
Fix issues with chunk saving in single world plots 2021-09-10 14:05:12 +01:00
dordsor21
d77a8c8fa4
Some improvements to events (#3238) 
#3222 #3072
 2021-09-09 21:37:44 +02:00
NotMyFault
27a8fcd739
Plot location may be final 2021-09-09 12:36:09 +02:00
SirYwell
c25a0c65a2 Don't check same plot over and over again 2021-09-08 18:37:45 +02:00
NotMyFault
b224a8d1b8
Include world in plot chat & spy template 2021-09-07 16:36:08 +02:00
NotMyFault
87d134215f
Fix placeholder if world already exists. 2021-09-07 16:20:45 +02:00
dordsor21
93e280dba4
Remove unneeded commented out code 2021-09-07 15:08:00 +01:00
dordsor21
732f79bbfc
Fix #3231 2021-09-07 14:47:37 +01:00
dordsor21
8e5e33eec2
Fix #3127 2021-09-07 14:02:48 +01:00
NotMyFault
387c6e79ba
Return after invalid plot size 2021-08-25 11:10:02 +02:00
NotMyFault
e3e00d34ef
Improve error message claiming plots with ids 2021-08-25 01:36:19 +02:00
NotMyFault
40e651188e
Improve javadoc linking 2021-08-24 15:34:21 +02:00
SirYwell
6ec136a03d Make sure lock is free'd even on error (fixes #3116) 2021-08-23 10:05:38 +02:00
dordsor21
a8fc6662e0
Allow visit to work when players are not the owner of the base plot 2021-08-22 16:26:49 +01:00
dordsor21
fb8e749411
Still allow serialisation of PlotTitle flag 2021-08-22 15:58:15 +01:00
dordsor21
4b26a7e300
Allow PlotTitle to have a "null" mode (default plot title flag should be the configured values) 2021-08-22 15:55:09 +01:00
dordsor21
34f0236e9f
Add option to "update" blocks that are altered in P2 queues. (#3200) 2021-08-19 20:30:38 +02:00
Traks
8f0ae7e51d
Clean up chunk coordinators and queue coordinators (#3208) 2021-08-19 12:31:47 +01:00
NotMyFault
2988ad6b11
Address style violations 2021-08-18 11:58:18 +02:00
NotMyFault
bfe2dda5b1
Closes #3212 2021-08-17 16:38:24 +02:00
dordsor21
33a79595af
Add TitleFlag (#3202) 2021-08-16 09:02:58 +00:00
dordsor21
da4ae9f4f5
Slightly change how flag permissions are handled (#3201) 2021-08-14 13:13:01 +00:00
NotMyFault
b841a7c03b
Fix javadoc linking of deprecated methods 2021-08-11 17:58:24 +02:00
dordsor21
4ee5e3d134
Invert toggle messages where the toggle disables rather than enables 2021-08-08 16:51:21 +01:00
dordsor21
0e05935ad4
Fix #3166 2021-08-08 14:06:59 +01:00
dordsor21
78a775530a
Merge branch 'v6' of github.com:IntellectualSites/PlotSquared into v6 2021-08-08 12:36:23 +01:00
dordsor21
dd36036334
Allow players to /plot home from non-plot-areas if per-world-teleport is enabled 2021-08-08 12:36:08 +01:00
Hannes Greule
3b2a04e4db
Fix/v6/click event actions (#3178) 
Co-authored-by: NotMyFault <mc.cache@web.de>
Co-authored-by: dordsor21 <dordsor21@gmail.com>
 2021-08-08 11:28:43 +00:00
SirYwell
5ab8d50b86 Don't keep PlotFlagUpdateHandlers forever 
This allows Plots, FlagContainers and its PlotFlagUpdateHandlers being cleaned up by the GC correctly
 2021-08-08 12:18:25 +01:00
NotMyFault
25a69f4ca0
Escalate null entries in the db to the warn level 2021-08-04 23:09:38 +02:00
Patrick "IPat" Hein
c8c946cc10
Fix /p kick msg (#3186) 
* 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)

* Fix https://github.com/IntellectualSites/PlotSquared/issues/3185
/p kick missing permission feedback format fix

* remove unnecessary import

Co-authored-by: NotMyFault <mc.cache@web.de>
 2021-08-04 20:59:19 +02:00
NotMyFault
a86c06bb81
Update a few dependencies 2021-08-01 20:10:06 +02:00
NotMyFault
6e7bd0a536
Left over from 89e17bb468 2021-07-31 10:43:11 +02:00
NotMyFault
8fc9e0b13f
Be a bit more helpful with deleted plotworlds and invalid db entries 2021-07-28 22:23:55 +02:00
NotMyFault
9d396fa91f
Fixes #3184 2021-07-27 15:04:22 +02:00
NotMyFault
a8c3ac6cee
Fixes #3181 2021-07-26 22:19:17 +02:00
NotMyFault
9a9365a04d
Fixes #3180 2021-07-26 21:23:59 +02:00
NotMyFault
c9b012ea5b
Leave a note when using deprecated commands 2021-07-24 18:01:26 +02:00
Traks
1e41734826 Send usage for '/p v' for too many arguments 2021-07-23 15:34:25 +01:00
Traks
a83a79c17e Error message for '/p v' when page out of range 2021-07-23 15:34:25 +01:00
Traks
8a77d5a450 Fix index out of bounds for '/p h' 2021-07-23 15:33:35 +01:00
dordsor21
51ff043af9
Prevent users defining their own click events in descriptions/farewells/greetings by default 2021-07-22 21:45:51 +01:00
NotMyFault
a0557112a1
Handle db command args sanely 2021-07-21 15:55:26 +02:00
NotMyFault
6d71e0f8be
Fixes 3168 2021-07-20 22:21:32 +02:00
dordsor21
31522b6502
Check plot ownership/event before handling Direction.ALL 2021-07-17 17:51:48 +01:00
Traks
fe65a0c548
Fix off-by-one error in schematic pasting (#3160) 2021-07-14 17:58:04 +02:00
NotMyFault
a797d748ea
Handle /p f add message properly 
- Leave a note if the database connection has been established properly
 2021-07-12 22:55:28 +02:00
NotMyFault
2d1e3b8c03
Fixes #3148 2021-07-12 18:12:54 +02:00
NotMyFault
635e18e7ed
Add copper-oxide flag 2021-07-10 15:50:38 +02:00
Patrick "IPat" Hein
991703914c
Batching task count reset (#3144) 
* 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)

* See 4514d39bbd

Co-authored-by: NotMyFault <mc.cache@web.de>
 2021-07-07 10:10:51 +02:00
NotMyFault
bbee330f4f
Don't append color codes to component lore 
- Color codes are defined thru the file. Adding these here will clash with any other codes you already use
- Remove prefix from component GUI
 2021-07-05 11:08:07 +02:00
NotMyFault
60c701d20b
Don't display plot rating placeholder in scientific notation 
Fixes #3091
 2021-06-28 18:49:03 +02:00
NotMyFault
eb11d9e3aa
Handle add & trust permission ranges properly 2021-06-28 16:40:01 +02:00
SirYwell
7898313b0b Check super types and interfaces on PlotPlayer#from 
fixes https://github.com/IntellectualSites/FastAsyncWorldEdit/issues/1140
 2021-06-28 09:53:00 +02:00
NotMyFault
8e23b10f7c
Fix update notification ingame message 2021-06-27 18:11:57 +02:00
NotMyFault
c46647d491
Handle plots.deny.<amount> properly 2021-06-27 16:40:45 +02:00
NotMyFault
013e8fcda5
Leave a note where to get additional translations 2021-06-27 15:23:11 +02:00
dordsor21
7c4d96e176
Fix #3117 2021-06-27 13:06:10 +01:00
SirYwell
8f48b83c79 Replace the proper string in expressions 2021-06-24 19:14:59 +02:00
NotMyFault
9acf9f4f19
Improve documentation of deprecated methods 2021-06-22 18:11:48 +02:00
SirYwell
0e84cf085b Fix compatibility issues with Citizens (fixes #3105) 2021-06-22 10:18:48 +02:00
SirYwell
ca9e371067 Teleport all players from plot on clear and delete (fixes #3102) 2021-06-21 18:20:47 +02:00
SirYwell
56920fe833 Load configs before accessing them (fixes #3099) 2021-06-21 16:38:40 +02:00
NotMyFault
f2e6fd9692
Bump PlotAPI version 2021-06-21 12:05:56 +02:00
NotMyFault
654f7ed3ae
Fix arkitektonika backend url 2021-06-20 20:13:37 +02:00
NotMyFault
f1ef07bee0
Merge branch 'v6' of https://github.com/IntellectualSites/PlotSquared into v6 2021-06-20 18:28:29 +02:00
NotMyFault
3e28d39285
We don't need "no-nashorn" config option in v6 2021-06-20 18:28:13 +02:00
NotMyFault
8eb8c24209
Merge branch 'v5' into v6 2021-06-20 18:22:21 +02:00
NotMyFault
4dbbf8f599
1.17 (#3088) 
* Minor work for 1.17

* Address TODOs

Introduce `entity-change-block` flag covering blocks affected by `onPeskyMobsChangeTheWorldLikeWTFEvent`. Previously this was covered by the mob-place flag, however, changing the tilt state of big drip leafs and a series of other blocks call `EntityChangeBlockEvent` so this shouldn't be covered by mob flags only.

* Address other TODOs

* Compile against paper 1.17

This will only work if you built paper locally and deployed it to your local maven repo.

* Updated linked javadoc links

* Handle sculk sensor events in a more controllable way

* Update issue forms for 1.17
 2021-06-20 18:17:18 +02:00
NotMyFault
440afcca5d
Fixes #3066 2021-06-18 16:37:25 +02:00
dordsor21
b01291c4ff
Add note about PlayerPlotAutoEvent return null plot 2021-06-12 11:36:33 +01:00
dordsor21
a9d896eb45
Add note about PlayerPlotAutoEvent return null plot 2021-06-12 11:35:55 +01:00
dordsor21
3cd9b76805
Implement "off" to PlotWeather flag and make it default 
- Players with "player weather" will no longer have their weather reset on plots that do not set the PlotWeather flag
 2021-06-10 11:43:12 +01:00
dordsor21
e2700d3b28
Implement "off" to PlotWeather flag and make it default 
- Players with "player weather" will no longer have their weather reset on plots that do not set the PlotWeather flag
 2021-06-10 11:41:55 +01:00
NotMyFault
942d799c9c
Make "NaN" in placeholders translatable 2021-06-09 21:51:51 +02:00
dordsor21
f0cbc4f23e Add whenDone task to setCuboids and ensure whenDone tasks are added to the queue before FAWE might do something 2021-06-09 13:09:50 +01:00
dordsor21
50d4353045 begin integration with fawe 2021-06-09 13:09:50 +01:00
dordsor21
19e97a7738
Correctly handle coordinates in swapping 
Fixes #3030
 2021-06-08 20:31:53 +01:00
SirYwell
2ac5fe45e3 Make CaptionLoader namespace-aware 2021-06-08 15:36:03 +02:00
NotMyFault
7f3d3ecb00
Fixes #3018 2021-06-08 14:25:08 +02:00
NotMyFault
331a6ea1b3
Remove "ORE" from setup steps 
Touches #3068
Generating a world with just ore is used nowhere and needs to be reimplemented properly at some time.
 2021-06-08 13:06:42 +02:00
SirYwell
8f2f673438 👀 2021-06-08 12:24:57 +02:00
SirYwell
66e12e2a0c Make world settings reloadable 2021-06-08 12:10:21 +02:00
SirYwell
2b3ecc178a Fix some inbox issues 2021-06-08 11:56:03 +02:00
NotMyFault
9b043b7444
Make /plot rate categories translatable 2021-06-08 10:49:26 +02:00
NotMyFault
ce287cf218
Add toggle allowing to opt out nashorn 2021-06-08 00:16:55 +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
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
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
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
SirYwell
a2b8e4493f Fix infinite loop on multi auto (fixes #3022) 2021-05-18 22:30:40 +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