Hannes Greule
019da4d2f4
Expose legacy serializer for placeholders
2020-12-28 11:21:35 +01:00
N0tMyFaultOG
07491d8028
Rename database chart id
2020-12-22 20:53:13 +01:00
N0tMyFaultOG
8c3a0a8275
Fix compiling
2020-12-21 20:33:49 +01:00
N0tMyFaultOG
bb52301200
Merge remote-tracking branch 'origin/renovate/configure' into v6
2020-12-20 22:38:35 +01:00
N0tMyFaultOG
5147d67318
Add charts for complex plot components
2020-12-16 13:20:23 +01:00
dordsor21
992a683ba2
another annoying cache thing
2020-12-14 15:22:10 +00:00
dordsor21
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
dordsor21
de3ba9a25c
re-send block change for blocks with gravity if they're physicsed
...
fixes PS-159
2020-12-14 14:53:53 +00:00
dordsor21
6eb2958afc
Fix merge issue
2020-12-11 11:42:19 +00:00
dordsor21
18f13b7d15
Merge branch 'v5' into v6
2020-12-10 21:28:28 +00:00
dordsor21
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
N0tMyFaultOG
3ca8a94419
Update java 8 notice
2020-12-08 00:18:40 +01:00
N0tMyFaultOG
714837dd00
Add charts for complex components
2020-12-07 23:05:25 +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
N0tMyFaultOG
60b5f5fe48
Add note about Nashorn
2020-12-05 18:38:10 +01:00
N0tMyFaultOG
34e02e9f3a
Make JavaVersionCheck private
2020-12-04 16:00:18 +01:00
N0tMyFaultOG
62690c2a53
Postpone java version during startup
2020-12-04 12:25:53 +01:00
N0tMyFaultOG
5d30e0854f
Add java version checker
2020-12-04 12:15:56 +01:00
dordsor21
ee7f683b76
Bump paperlib, fix single worlds.
2020-11-26 16:54:38 +00:00
Traks
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
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
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
Mariell Hoversholm
333493f351
adventure v4.1.0; project now compiles
2020-10-17 21:10:02 +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
bba499649b
No need to point if PAPI is not in use
2020-10-08 20:56:33 +02:00
N0tMyFaultOG
f9cd54c445
Shift logger.info -> error when running in an outdated environment
2020-10-08 20:54:06 +02:00
N0tMyFaultOG
0d89125a8e
Replace sys out with logger factory
2020-10-08 20:52:02 +02:00
Mariell Hoversholm
c3069a425d
Format licence headers
2020-10-08 14:02:08 +02:00
Mariell Hoversholm
9b1dc7d42e
She compiles!
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
56e6922279
Remove BungeePerms UUID fetcher
2020-10-04 13:26:56 +02:00
Hannes Greule
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
dordsor21
2f5ce67154
add back setShouldAbortSpawn
2020-09-29 15:55:08 +01:00
dordsor21
89318be5f4
Apply e2f9b4245b to paper listener too
2020-09-29 15:53:23 +01:00
dordsor21
e974fe5dc7
Merge branch 'v6' into features/v6/queue-features
2020-09-18 12:22:32 +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
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
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
5c48e4ad19
Add missing license header
2020-09-05 18:39:56 +02:00
Hannes Greule
f6d1e2b3b8
Check TileState manually on 1.13.2, fixes PS-122
2020-09-05 18:39:56 +02:00
N0tMyFaultOG
0f9554c717
Merge branch 'v5' into v6
2020-09-02 17:19:12 +02:00
N0tMyFaultOG
d19dde2f85
Add more debugs
2020-09-02 17:18:41 +02:00
N0tMyFaultOG
7a529e156d
Add deb for onBlockIgnite event
2020-09-02 17:03:56 +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
Hannes Greule
551d1d9f1a
Add NullEconHandler to avoid verbose null checks
2020-08-25 12:41:03 +02:00
N0tMyFaultOG
02bd83bd90
Merge v5 into v6
2020-08-24 14:33:53 +02:00
N0tMyFaultOG
5c08db2f44
Merge branch 'feature/v5/1.16.2-support' into v5
2020-08-21 19:02:23 +02:00
NotMyFault
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
N0tMyFaultOG
352136f0c6
Cleanup logging system
2020-08-18 15:50:28 +02:00
N0tMyFaultOG
3c8d7a808b
Prefix changes and others
2020-08-17 23:21:18 +02:00
N0tMyFaultOG
05a15ac689
Fix a few typos and spaces
2020-08-17 19:39:43 +02:00
Hannes Greule
47d9895077
Fix ms to ticks conversion on Paper
2020-08-17 16:37:27 +02:00
Hannes Greule
aacf15757f
Use less confusing variable name
2020-08-17 15:32:17 +02:00
Hannes Greule
914b44069b
Convert item display name
2020-08-17 15:22:41 +02:00
Hannes Greule
4789327378
Encapsulate fields
2020-08-17 15:17:40 +02:00
Hannes Greule
c55f2945ac
Fix sign text
2020-08-17 15:08:21 +02:00
Hannes Greule
f636db49f7
Remove SetupObject
2020-08-17 01:10:46 +02:00
Hannes Greule
72507aba4b
Change player locale on event
2020-08-17 00:29:53 +02:00
MeFisto94
61d1dcc231
Ignore Events if they are not caused by real players (i.e. citizens)
2020-08-16 14:09:32 +02:00
MeFisto94
6c9b73b100
Apply patch by @SirYwell to construct the ResourceKey without consulting the DimensionManager
2020-08-16 14:02:03 +02:00
Alexander Söderberg
a4c9ed90b7
Fix startup issues and make messages send properly
2020-08-16 13:49:16 +02:00
Alexander Söderberg
28d6d4db92
Fix shading mess and make the plugin start
2020-08-16 12:44:10 +02:00
dordsor21
12def37194
clean up some javadoc stuff
2020-08-16 11:34:08 +01:00
N0tMyFaultOG
4a220f9bfb
Update license header
2020-08-15 14:59:29 +02:00
dordsor21
8f1b2a9d2a
fix pve against animals on other plots and roads
2020-08-14 14:21:45 +01:00
NotMyFault
556ff0baf4
Fix line break
2020-08-14 12:27:38 +02:00
NotMyFault
8cc536b20f
Fix spelling
2020-08-14 11:57:37 +02:00
N0tMyFaultOG
5e20c871a5
Fix metrics setting
2020-08-14 11:36:17 +02:00
N0tMyFaultOG
2b17f730d4
Merge v5 into v6
2020-08-12 18:20:37 +02:00
N0tMyFaultOG
7c756304b5
1.16.2 support
...
- Bump EssentialsX version to the latest release
2020-08-11 16:20:33 +02:00
dordsor21
6e16ef1246
remove PllayerEvents
2020-08-08 13:21:46 +01:00
dordsor21
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
dordsor21
74a5c48214
Finish up core and bukkit json
2020-08-08 12:16:48 +01:00
N0tMyFaultOG
11af906c79
Fix a little oopsie
2020-08-07 18:55:22 +02:00
N0tMyFaultOG
c31c4b4286
More work
2020-08-07 18:52:45 +02:00
dordsor21
7f29b5d1e8
ComponentPreset inventory to json
2020-08-07 13:22:10 +01:00
dordsor21
21a97863ac
Refactor Captions to Permission, reimplement message list in debug command
2020-08-07 11:53:32 +01:00
MeFisto94
48d3c2105d
Fixes an OfflinePlayerUtil breakage caused by NMS Changes
2020-08-06 15:23:36 +02:00
dordsor21
d3fe1d3b2b
Fix plot info, sign usage in Plot.class
2020-08-04 15:07:07 +01:00
dordsor21
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
dordsor21
97b1a60ae8
Move comments to ChunkCoordinator, remove Range annotations
2020-07-28 08:44:16 +01:00
N0tMyFaultOG
ab121c7eee
Fixes https://github.com/IntellectualSites/PlotSquaredSuggestions/issues/133
2020-07-26 21:12:32 +02:00
dordsor21
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
dordsor21
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
dordsor21
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
dordsor21
7aaa075ba8
Javadoc, some cleanup
2020-07-24 17:00:08 +01:00
Alexander Söderberg
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
dordsor21
1d0760c630
Formatting, mark nonnull, nullable etc
2020-07-24 16:24:53 +01:00
dordsor21
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
dordsor21
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
dordsor21
cf13f13fbf
Merge branch 'v6' into feature/v6/pipeline-queue
2020-07-24 13:03:42 +01:00
