af2613202d
refactor: Satisfy Semgrep
2021-12-22 02:06:07 +01:00
a93402e27b
fix: Standardize projectile permissions ( #3374 )
...
* fix: Standardize projectile permissions
- Let all projectiles (not just splash potions) have a permissions check on throwing
- Fixes snowballs, eggs, etc. being able to be thrown when not added to the plot, etc.
- Fixes #2986 (splash potions only able being to be thrown when also added to the plot)
- Remove the specialized code for egg hatching as now eggs are cancelled entirely
- Remove the non-standard plots.projectile.unowned and plots.projectile.other permissions in favor of the standard admin ones
* docs: Add back deprecated projectile permissions
* docs: Update Core/src/main/java/com/plotsquared/core/permissions/Permission.java
Co-authored-by: Alex <mc.cache@web.de>
Co-authored-by: Alex <mc.cache@web.de>
2021-12-17 22:06:56 +01:00
92f41f43c5
fix: Ignore the use flag for liquid placement/removal ( #3375 )
...
Fixes #3069
2021-12-17 21:52:15 +01:00
47ae79e123
Revert "refactor: Address MiniMessage deprecations ( #3354 )" ( #3371 )
...
This reverts commit f086826942
2021-12-14 23:04:36 +01:00
f086826942
refactor: Address MiniMessage deprecations ( #3354 )
...
* refactor: Address MiniMessage deprecations
* refactor: More MiniMessage deprecations
* Move away from our `Templates#of`
* Address comments
* style: Address migration style issues
* docs: Add javadoc link for MiniMessage
2021-12-13 09:48:34 +01:00
cba0f3ac1f
build: Switch PRTree GAV to our deployment ( #3360 )
...
* build: Switch PRTree repository
* build: Use our GAV
2021-12-09 18:30:35 +01:00
2a40f52dea
docs: Update issue template to 1.18
2021-12-05 23:29:28 +01:00
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
30d06b7801
build: Reduce consumer dependencies
2021-11-05 11:57:58 +01:00
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
48c7a3e94e
refactor: Use player friendly done message on restricted building ( #3309 )
2021-11-02 13:32:04 +00:00
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
d70f99b489
fix: Respect tab-complete aliases ( Fixes #3266 ) ( #3268 )
...
* Fixes #3250
* ListFlag#merge should not allow duplicates (Fixes #3157 ) (#3265 )
* 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
* Respect tab-complete aliases (Fixes #3266 )
* Useless import
Co-authored-by: NotMyFault <mc.cache@web.de>
Co-authored-by: dordsor21 <dordsor21@gmail.com>
2021-10-04 17:10:36 +02:00
bb5d6c91da
Update Fawe version
2021-09-20 16:21:18 +02:00
b2b8598b5b
Fix #3246
2021-09-15 13:19:25 +01:00
9f54472dd6
Relocate annotations properly
2021-09-12 13:56:08 +02:00
04821f777e
Mappings be obfuscated
2021-09-11 12:19:46 +01:00
4568b17c54
Fix issues with chunk saving in single world plots
2021-09-10 14:05:12 +01:00
d77a8c8fa4
Some improvements to events ( #3238 )
...
#3222 #3072
2021-09-09 21:37:44 +02:00
b224a8d1b8
Include world in plot chat & spy template
2021-09-07 16:36:08 +02:00
732f79bbfc
Fix #3231
2021-09-07 14:47:37 +01:00
da3fb1abec
Closes #3236
2021-09-07 13:52:47 +02:00
4caaead7ee
Renovate
...
Closes #3217
Closes #3226
Closes #3227
Closes #3229
Closes #3230
2021-09-06 13:47:40 +02:00
f036980dc5
Disband `wilderness` permission pack
2021-09-03 20:01:37 +02:00
0e4f54e9c0
Bump (FA)WE versions
2021-08-29 10:56:57 +01:00
7a3d5bd737
Don't trigger async catcher when adding chunk ticket
...
- Apparently PaperLib#getChunkAtAsync#whenComplete doesn't necessarily run the task on the main thread
2021-08-25 15:24:07 +01:00
2ab1973668
Handle administrative overrides sanely
2021-08-25 11:49:54 +02:00
8a53b41b52
Improve ChunkListener class
...
- Add quicker method for getting chunks (not requiring a slow stream done by CB) but comment it out for now because we shouldn't need to do our own GC for loaded chunks; they're "handled much better by minecraft as of 1.14" (not really) meaning the required methods for testing if a chunk is allowed to be unloaded is not present. We instead must now rely on the ChunkUnloadEvent for setting if a chunk should be saved.
- Optimise the shouldSave method by not requiring access to injected classes frequently. Location#getPlot methods are not optimised for frequent usage in the same task.
2021-08-22 15:54:05 +01:00
34f0236e9f
Add option to "update" blocks that are altered in P2 queues. ( #3200 )
2021-08-19 20:30:38 +02:00
8f0ae7e51d
Clean up chunk coordinators and queue coordinators ( #3208 )
2021-08-19 12:31:47 +01:00
2988ad6b11
Address style violations
2021-08-18 11:58:18 +02:00
252d6a2866
Fix nms chunk reference
2021-08-17 22:43:58 +01:00
bfe2dda5b1
Closes #3212
2021-08-17 16:38:24 +02:00
33a79595af
Add TitleFlag ( #3202 )
2021-08-16 09:02:58 +00:00
eb2848e5d7
Fix bad method names etc for chunk/world listener
2021-08-15 13:58:56 +01:00
da4ae9f4f5
Slightly change how flag permissions are handled ( #3201 )
2021-08-14 13:13:01 +00:00
a405611b3a
Fix emptying buckets in plot border ( #3192 )
...
* Fix emptying buckets in plot border
* Note on 1.13 compatibility for bucket-empty event
Co-authored-by: NotMyFault <mc.cache@web.de>
2021-08-03 21:03:53 +00:00
fd4cec39c4
Fix sponge absorbing water across plot borders ( #3191 )
...
* Fix sponge absorbing water across plot borders
* Shorten for-loops by using removeIf
* Use 'Location' instead of 'var'
Co-authored-by: NotMyFault <mc.cache@web.de>
2021-08-03 19:07:02 +00:00
e7fa057abe
Detach shoulder entities from natural mob spawning
2021-08-03 10:20:59 +02:00
89e17bb468
Properly handle economy initialization ( fixes #3189 )
2021-07-30 20:29:12 +02:00
6ad51bba65
Hot-fix for IntellectualSites#3179 ( #3188 )
...
Authored by @SirYwell ty!
2021-07-28 12:42:20 +02:00
3b27b6c850
FAWE-Bukkit shouldn't be in core
2021-07-23 16:24:30 +01:00
fbde60fcf9
Handle edge cases of EntityChangeBlockEvent ( #3163 )
...
* Handle edge cases of EntityChangeBlockEvent
* Remove excessive plot area existence check
Co-authored-by: NotMyFault <mc.cache@web.de>
2021-07-21 19:57:42 +00:00
2e64ac6d25
Revert projectile hit on splash ( #3162 )
...
* Revert projectile hit on splash
* Notes about potions splashing after hit cancelled
2021-07-15 18:43:05 +02:00
cc60d50dd2
Actually cancel projectile hit events ( #3154 )
...
Co-authored-by: NotMyFault <mc.cache@web.de>
2021-07-13 08:57:12 +00:00
635e18e7ed
Add `copper-oxide` flag
2021-07-10 15:50:38 +02:00
b9cb6842e2
Add an online check for teleport listener
...
- Some plugins seem to like teleport players before they're online (e.g. NoCheatPlus)
- Addresses #3142
2021-07-10 10:40:44 +01:00
fdb6367351
Remove unneeded maven repos
2021-07-05 15:25:22 +02:00
3b5b51b40c
Update link if outdated Fawe version is spotted
2021-07-02 14:22:33 +02:00
8e23b10f7c
Fix update notification ingame message
2021-06-27 18:11:57 +02:00
a5452012b5
separate 1.17-only events
2021-06-26 20:08:25 +01:00
67bbd64fa1
Update to FAWE 1.17
2021-06-26 16:19:07 +01:00
6a57a5c369
Fixes #3100
2021-06-24 16:40:10 +02:00
9fa0a8b27b
Update ServerLib & remove Java version check
...
We now require Java 16 onwards
2021-06-22 23:49:31 +02:00
9acf9f4f19
Improve documentation of deprecated methods
2021-06-22 18:11:48 +02:00
0e84cf085b
Fix compatibility issues with Citizens ( fixes #3105 )
2021-06-22 10:18:48 +02:00
45c566859e
Don't fail loading on versions prior to 1.17
2021-06-21 10:30:48 +02:00
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
a3ebabacb8
Fix #3095
2021-06-18 15:45:45 +01:00
b196c9ce8e
Fix place flag message
2021-06-16 01:15:09 +02:00
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
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
9bd14b142b
Move FAWE detection before guice injection/configuration
2021-06-09 13:09:50 +01:00
4ba1217b84
Fix licences
2021-06-09 13:09:50 +01:00
50d4353045
begin integration with fawe
2021-06-09 13:09:50 +01:00
9b043b7444
Make `/plot rate` categories translatable
2021-06-08 10:49:26 +02:00
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
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
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
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
1d2aa74e51
Add actionbar message for notification flags
...
- Move title_as_actionbar boolean into enabled_components
2021-05-24 13:49:00 +02:00
87706d471b
Add option for legacy sign material
...
Follow up to cde27899dd
2021-05-22 12:34:04 +02:00
a17085bb18
Remove dead imports
2021-05-21 20:56:44 +02:00
cde27899dd
Fixes #3064
2021-05-21 19:14:13 +02:00
93ff778de0
Add administrative override for `/plot components`
2021-05-21 17:54:26 +02:00
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
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
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
94ba90d694
Always initialize PermissionHandler ( fixes #3019 )
2021-05-18 21:17:47 +02:00
e97bc25fb8
Log plot chat to console
...
- Fix plot music removal template
- Fix debug args
2021-05-17 10:35:09 +02:00
3748d8e246
Minor cleanup in favor of Java 16
...
- Addressing a few command deprecations during the major release superseded by toggles
- Don't swallow SQL warnings in loggers behind debug, as it's often set to false
- Deleted JavaVersionCheck, it's part of ServerLib.
2021-05-15 20:39:16 +02:00
0341111f8f
Add `lectern-read-book` flag
...
Fixes https://github.com/IntellectualSites/PlotSquared/issues/2980
2021-05-14 18:22:02 +02:00
a7c4b40fcc
Add `no-portals` and `deny-portal-travel` flag
2021-05-14 15:51:20 +02:00
9344e1ca79
Make `/plot setup` header translatable
...
- Document a couple of permission nodes
2021-05-13 13:32:34 +02:00
19cea0e129
Un-stringify plot id calls
...
- PlotId#toString() already stringifies IDs, no need to call String.valueOf()
- Add tab completion to `/plot debugroadregen`
- Add `plots.flag.notify-leave.bypass` permission separating from notify-enter
- Add message notifying the player if the attempt to enter a plot they are denied from
2021-05-11 18:50:37 +02:00
f690e14a14
Exchange EssentialsX maven repo
2021-05-07 11:08:07 +02:00
0106a4222d
Address a few deprecations
2021-05-01 18:33:02 +02:00
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
361b936aa0
Update ServerLib
2021-04-27 11:58:49 +02:00
de597391dc
Fix keep-inventory flag & adjust disallowed-blocks translation
2021-04-21 11:03:14 +02:00
59599261ff
Fixes https://issues.intellectualsites.com/issue/PS-237
2021-04-12 16:08:31 +02:00
e1fb8c1ae5
Take building min height also into consideration
2021-04-11 10:12:37 +02:00
050cf3edb3
Update a few dependencies
2021-04-04 13:30:09 +02:00
dd9edb68b2
Fixes https://github.com/IntellectualSites/PlotSquaredSuggestions/issues/23
2021-04-02 23:48:16 +02:00
5780ad370a
Strip Java 15 note
2021-03-01 10:58:27 +01:00
38b60205e8
Use javax for Nullable + guice, hope I didn't miss anything
2021-02-24 20:35:38 +01:00
027456fd77
Add crop-grow flag
2021-02-24 18:41:36 +01:00
da45813a06
Add new metrics pies
2021-02-22 15:18:20 +01:00
a75db92007
Update ServerLib
2021-01-30 13:16:36 +01:00
aaf2fa8807
Update bStats to 2.1.0
2021-01-24 10:39:03 +01:00
86e8457574
Move to ServerLib
2021-01-22 23:34:47 +01:00
8292ed9e31
More annotation work
2021-01-10 00:01:48 +01:00
57fc51d013
Initial annotation usage cleanup + EditorConfig
2021-01-09 22:28:41 +01:00
8b332adbe7
Address comments
2021-01-09 21:34:42 +01:00
3cea734b9b
Fix singleworlds
2021-01-09 21:34:42 +01:00
7ac3f7ca03
Fix sync tasks not being sync
2021-01-09 20:39:25 +01:00
98e8476a88
Bring v5 entity spawn changes to v6
2021-01-06 21:56:26 +00:00
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
f47561b580
Invert leaf-decay message
2021-01-01 21:51:28 +01:00
4f60da292a
Add leaf-decay flag
...
Stop leaves from decaying.
2021-01-01 21:47:09 +01:00
70fb86a1c3
Remove redundant legacy version check
...
"api-version" backs us up here.
2021-01-01 14:09:59 +01:00
e8642df674
Update licenses to 2021
...
Happy new year 🎆
2021-01-01 00:19:45 +01:00
fafdae9ba9
Only check ice-form for ice ( #2940 )
...
Co-authored-by: NotMyFault <mc.cache@web.de>
2020-12-28 14:11:30 +00:00
1d0721034d
fix debugpaste with multiverse
2020-12-28 12:30:53 +00:00
3cfbe9585a
Merge branch 'v6' of github.com:IntellectualSites/PlotSquared into v6
2020-12-28 12:27:12 +00:00
71305e636c
cache bukkitworld
2020-12-28 12:10:27 +00:00
019da4d2f4
Expose legacy serializer for placeholders
2020-12-28 11:21:35 +01:00
07491d8028
Rename database chart id
2020-12-22 20:53:13 +01:00
8c3a0a8275
Fix compiling
2020-12-21 20:33:49 +01:00
397692d113
Update Paster
2020-12-21 15:58:34 +01:00
bb52301200
Merge remote-tracking branch 'origin/renovate/configure' into v6
2020-12-20 22:38:35 +01:00
e4a8459798
Switch to IncendoPaster "library"
2020-12-19 16:20:44 +00:00
14fa738fbe
switch to InvendoPaster "library"
2020-12-19 16:00:13 +00:00
5147d67318
Add charts for complex plot components
2020-12-16 13:20:23 +01:00
992a683ba2
another annoying cache thing
2020-12-14 15:22:10 +00:00
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
de3ba9a25c
re-send block change for blocks with gravity if they're physicsed
...
fixes PS-159
2020-12-14 14:53:53 +00:00
6eb2958afc
Fix merge issue
2020-12-11 11:42:19 +00:00
18f13b7d15
Merge branch 'v5' into v6
2020-12-10 21:28:28 +00:00
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
3ca8a94419
Update java 8 notice
2020-12-08 00:18:40 +01:00
714837dd00
Add charts for complex components
2020-12-07 23:05:25 +01:00
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
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
f0e9a8c5fe
Implement progress subscribers
2020-09-11 12:59:40 +01:00
a98b23af02
progress subscriber
2020-09-11 11:20:38 +01:00
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
5c48e4ad19
Add missing license header
2020-09-05 18:39:56 +02:00
f6d1e2b3b8
Check TileState manually on 1.13.2, fixes PS-122
2020-09-05 18:39:56 +02:00
0f9554c717
Merge branch 'v5' into v6
2020-09-02 17:19:12 +02:00
d19dde2f85
Add more debugs
2020-09-02 17:18:41 +02:00
7a529e156d
Add deb for onBlockIgnite event
2020-09-02 17:03:56 +02:00
cba2474df7
Merge v5/v6
2020-09-02 16:44:18 +02:00
97e34844b4
Add option to opt-out MvDW Placeholder API
2020-09-02 12:13:23 +02:00
551d1d9f1a
Add NullEconHandler to avoid verbose null checks
2020-08-25 12:41:03 +02:00
a5dea9e7f6
Permission cleanup
2020-08-24 20:51:23 +02:00
02bd83bd90
Merge v5 into v6
2020-08-24 14:33:53 +02:00
3a8fa9f5b6
Update WorldEdit version
...
That doesn't appear to break stuff 👀
2020-08-22 13:18:00 +02:00
45e75cc06e
Merge branch 'v6' into features/v6/services
2020-08-21 23:02:52 +02:00
5c08db2f44
Merge branch 'feature/v5/1.16.2-support' into v5
2020-08-21 19:02:23 +02:00
28fc29c3ab
Merge pull request #2890 from MeFisto94/fix-1-16-worldserver-regression
...
Fixes an OfflinePlayerUtil breakaged caused by NMS Changes
2020-08-21 18:29:03 +02:00
352136f0c6
Cleanup logging system
2020-08-18 15:50:28 +02:00
3c8d7a808b
Prefix changes and others
2020-08-17 23:21:18 +02:00
05a15ac689
Fix a few typos and spaces
2020-08-17 19:39:43 +02:00
47d9895077
Fix ms to ticks conversion on Paper
2020-08-17 16:37:27 +02:00
aacf15757f
Use less confusing variable name
2020-08-17 15:32:17 +02:00
914b44069b
Convert item display name
2020-08-17 15:22:41 +02:00
4789327378
Encapsulate fields
2020-08-17 15:17:40 +02:00
c55f2945ac
Fix sign text
2020-08-17 15:08:21 +02:00
f636db49f7
Remove SetupObject
2020-08-17 01:10:46 +02:00
72507aba4b
Change player locale on event
2020-08-17 00:29:53 +02:00
61d1dcc231
Ignore Events if they are not caused by real players (i.e. citizens)
2020-08-16 14:09:32 +02:00
6c9b73b100
Apply patch by @SirYwell to construct the ResourceKey without consulting the DimensionManager
2020-08-16 14:02:03 +02:00
a4c9ed90b7
Fix startup issues and make messages send properly
2020-08-16 13:49:16 +02:00
28d6d4db92
Fix shading mess and make the plugin start
2020-08-16 12:44:10 +02:00
12def37194
clean up some javadoc stuff
2020-08-16 11:34:08 +01:00
4a220f9bfb
Update license header
2020-08-15 14:59:29 +02:00
87f0b1fc97
Add service system and rewrite Auto to use the service system
2020-08-14 17:24:34 +02:00
8f1b2a9d2a
fix pve against animals on other plots and roads
2020-08-14 14:21:45 +01:00
556ff0baf4
Fix line break
2020-08-14 12:27:38 +02:00
8cc536b20f
Fix spelling
2020-08-14 11:57:37 +02:00
5e20c871a5
Fix metrics setting
2020-08-14 11:36:17 +02:00
7f104c249a
Permission cleanup
...
- Removed plotme perms
- Fixed incorrect permission for "/plot flag remove"
- Fixed incorrect administrative unlink node
- Removed compat alias from "/plot set alias" command
I've documented all removed permission packages and fixed permissions in detail on the v6 page. So it's easy to go-by when updating.
2020-08-13 23:32:13 +02:00
2b17f730d4
Merge v5 into v6
2020-08-12 18:20:37 +02:00
d6dfa9a0b9
https
2020-08-11 20:12:31 +02:00
7c756304b5
1.16.2 support
...
- Bump EssentialsX version to the latest release
2020-08-11 16:20:33 +02:00
6e16ef1246
remove PllayerEvents
2020-08-08 13:21:46 +01:00
7bad242944
Merge branch 'v6' into feature/v6/json. It builds!
...
# Conflicts:
# Bukkit/build.gradle
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
# Bukkit/src/main/java/com/plotsquared/bukkit/generator/DelegatePlotGenerator.java
# Bukkit/src/main/java/com/plotsquared/bukkit/inject/BukkitModule.java
# Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java
# Bukkit/src/main/java/com/plotsquared/bukkit/queue/ChunkCoordinator.java
# Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java
# Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
# Core/src/main/java/com/plotsquared/core/PlotSquared.java
# Core/src/main/java/com/plotsquared/core/command/Area.java
# Core/src/main/java/com/plotsquared/core/command/Clear.java
# Core/src/main/java/com/plotsquared/core/command/Debug.java
# Core/src/main/java/com/plotsquared/core/command/DebugRoadRegen.java
# Core/src/main/java/com/plotsquared/core/command/Relight.java
# Core/src/main/java/com/plotsquared/core/command/Set.java
# Core/src/main/java/com/plotsquared/core/command/Template.java
# Core/src/main/java/com/plotsquared/core/command/Trim.java
# Core/src/main/java/com/plotsquared/core/components/ComponentPresetManager.java
# Core/src/main/java/com/plotsquared/core/generator/ClassicPlotManager.java
# Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java
# Core/src/main/java/com/plotsquared/core/plot/Plot.java
# Core/src/main/java/com/plotsquared/core/plot/flag/GlobalFlagContainer.java
# Core/src/main/java/com/plotsquared/core/queue/AreaBoundDelegateQueueCoordinator.java
# Core/src/main/java/com/plotsquared/core/queue/ChunkQueueCoordinator.java
# Core/src/main/java/com/plotsquared/core/queue/LocalBlockQueue.java
# Core/src/main/java/com/plotsquared/core/util/ChunkUtil.java
# Core/src/main/java/com/plotsquared/core/util/EntityUtil.java
# Core/src/main/java/com/plotsquared/core/util/RegionManager.java
# Core/src/main/java/com/plotsquared/core/util/WorldUtil.java
# Core/src/main/java/com/plotsquared/core/uuid/UUIDPipeline.java
# build.gradle
2020-08-08 13:20:30 +01:00
74a5c48214
Finish up core and bukkit json
2020-08-08 12:16:48 +01:00
11af906c79
Fix a little oopsie
2020-08-07 18:55:22 +02:00
c31c4b4286
More work
2020-08-07 18:52:45 +02:00
7f29b5d1e8
ComponentPreset inventory to json
2020-08-07 13:22:10 +01:00
21a97863ac
Refactor Captions to Permission, reimplement message list in debug command
2020-08-07 11:53:32 +01:00
48d3c2105d
Fixes an OfflinePlayerUtil breakage caused by NMS Changes
2020-08-06 15:23:36 +02:00
d3fe1d3b2b
Fix plot info, sign usage in Plot.class
2020-08-04 15:07:07 +01:00
e2f9b4245b
Fixes https://issues.intellectualsites.com/issue/PS-81
...
- Add break statements to switches to prevent bleed from normal spawning to breeding
- Separate misc spawning from mob spawning
2020-07-28 13:56:37 +01:00
97b1a60ae8
Move comments to ChunkCoordinator, remove Range annotations
2020-07-28 08:44:16 +01:00
ab121c7eee
Fixes https://github.com/IntellectualSites/PlotSquaredSuggestions/issues/133
2020-07-26 21:12:32 +02:00
b8b3e1e72a
Merge branch 'v6' into feature/v6/pipeline-queue
...
# Conflicts:
# Bukkit/build.gradle
# Core/src/main/java/com/plotsquared/core/generator/ClassicPlotManager.java
2020-07-24 18:18:42 +01:00
615a5212bf
update bukkit pom
2020-07-24 17:57:16 +01:00
221d299052
Fix a few remaining merge issues (+1 squashed commits)
...
Squashed commits:
[8c6b55dd4] Fix a few remaining merge issues
2020-07-24 17:57:16 +01:00
3180d2ddf2
Merge branch 'v5' into v6
...
# Conflicts:
# Bukkit/build.gradle
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
# Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java
# Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/Placeholders.java
# Core/src/main/java/com/plotsquared/core/PlotPlatform.java
# Core/src/main/java/com/plotsquared/core/PlotSquared.java
# Core/src/main/java/com/plotsquared/core/generator/ClassicPlotManager.java
# Core/src/main/java/com/plotsquared/core/util/EventDispatcher.java
# Core/src/main/java/com/plotsquared/core/uuid/UUIDPipeline.java
# build.gradle
2020-07-24 17:15:58 +01:00
7aaa075ba8
Javadoc, some cleanup
2020-07-24 17:00:08 +01:00
e90170a384
Merge remote-tracking branch 'origin/v6' into feature/v6/json
...
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
# Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java
# Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitOfflinePlayer.java
# Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java
# Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitLocalQueue.java
# Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEconHandler.java
# Core/pom.xml
# Core/src/main/java/com/plotsquared/core/PlotAPI.java
# Core/src/main/java/com/plotsquared/core/PlotPlatform.java
# Core/src/main/java/com/plotsquared/core/PlotSquared.java
# Core/src/main/java/com/plotsquared/core/command/Area.java
# Core/src/main/java/com/plotsquared/core/command/Auto.java
# Core/src/main/java/com/plotsquared/core/command/Claim.java
# Core/src/main/java/com/plotsquared/core/command/CmdConfirm.java
# Core/src/main/java/com/plotsquared/core/command/Command.java
# Core/src/main/java/com/plotsquared/core/command/CommandCaller.java
# Core/src/main/java/com/plotsquared/core/command/DebugExec.java
# Core/src/main/java/com/plotsquared/core/command/Grant.java
# Core/src/main/java/com/plotsquared/core/command/Inbox.java
# Core/src/main/java/com/plotsquared/core/command/Load.java
# Core/src/main/java/com/plotsquared/core/command/Save.java
# Core/src/main/java/com/plotsquared/core/command/Setup.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/Plot.java
# Core/src/main/java/com/plotsquared/core/plot/comment/CommentManager.java
# Core/src/main/java/com/plotsquared/core/util/BlockUtil.java
# Core/src/main/java/com/plotsquared/core/util/Permissions.java
2020-07-24 17:28:52 +02:00
1d0760c630
Formatting, mark nonnull, nullable etc
2020-07-24 16:24:53 +01:00
72c0021306
A couple of reworks
...
- Redo how regeneration works a little to also take a cuboid region for regeneration off-chunk plots
- Fix a couple of cases where we were writing to the queue instead of the world in the ChunkConsumer (dum)
- this seems to be working.
2020-07-24 15:17:42 +01:00
18918eb3a3
Fix a couple more Guice issues. Refactor read chunks to be a list of chunks rather than CuboidRegion
2020-07-24 14:36:50 +01:00
cf13f13fbf
Merge branch 'v6' into feature/v6/pipeline-queue
2020-07-24 13:03:42 +01:00
f53a8d3b06
Fix permissionprofile initialisation order
2020-07-24 14:02:49 +02:00
e53c53bb4a
Merge branch 'v6' into feature/v6/pipeline-queue
...
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
# Bukkit/src/main/java/com/plotsquared/bukkit/inject/BukkitModule.java
# Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
# Core/src/main/java/com/plotsquared/core/queue/BasicLocalBlockQueue.java
2020-07-24 12:21:40 +01:00
d906a85095
Fix some issues I caused with Guice
2020-07-24 12:18:36 +01:00
NotMyFault
zombachu
dordsor21
Hannes Greule
Pierre Maurice Schwang
Traks
SirYwell
Aurélien
Mariell Hoversholm
Patrick "IPat" Hein
Alexander Söderberg
Alexander Söderberg
Mariell Hoversholm
Aurora
Alexander Söderberg
MeFisto94