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
Alexander Söderberg
f53a8d3b06
Fix permissionprofile initialisation order
2020-07-24 14:02:49 +02:00
dordsor21
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
dordsor21
d906a85095
Fix some issues I caused with Guice
2020-07-24 12:18:36 +01:00
Alexander Söderberg
dc1f669a1f
Remove permission caching
2020-07-24 13:01:38 +02:00
Alexander Söderberg
5608c5a901
Merge branch 'v6' into features/v6/permissions
...
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java
# Core/src/main/java/com/plotsquared/core/command/Auto.java
# Core/src/main/java/com/plotsquared/core/player/ConsolePlayer.java
# Core/src/main/java/com/plotsquared/core/util/Permissions.java
2020-07-24 12:20:45 +02:00
Alexander Söderberg
d2f40612f4
Switch from Class<T> to TypeLiteral, and implement managed meta access for temporary meta
2020-07-24 12:15:25 +02:00
dordsor21
d8e5daf12b
Fix missing Main->Chunk Util change
2020-07-23 18:04:01 +01:00
dordsor21
45cc88091e
Merge branch 'v6' into feature/v6/pipeline-queue
...
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
2020-07-23 17:33:05 +01:00
dordsor21
27498f68fb
Many Much
...
- Add readregions to queues for when we're setting our own consumer (usually meaning the queue writes its own blocks, so it doesn't know which chunks to actually load)
- Finish removing chunk/regionTasks
- Allow the queue to not remove tickets from chunks (useful for swapping chunks so they don't unload needlessly)
- Remove a lot of unused methods
- Implement entities to queues
- Remove chunk unloading (the server should really handle it)
2020-07-23 17:30:23 +01:00
Alexander Söderberg
d8e80daa93
Fix annoying guice injection issue
2020-07-23 15:40:43 +02:00
Alexander Söderberg
2154e237ff
Remove construction of fake player entities for offline players.
2020-07-23 15:03:57 +02:00
Alexander Söderberg
5fda3e9765
Get rid of PermHandler
2020-07-23 15:03:57 +02:00
Alexander Söderberg
b302bb9379
Make VaultPermissionHandler extent BukkitPermissionHandler
2020-07-23 15:03:57 +02:00
Alexander Söderberg
bfbb81030f
Start working on the new permission system
2020-07-23 15:03:57 +02:00
Alexander Söderberg
63ce3292aa
Fix PlayerManager injection
2020-07-23 15:03:27 +02:00
Alexander Söderberg
6ae1d28f80
Fix WorldManager injection
2020-07-23 14:56:06 +02:00
Alexander Söderberg
c5e1b87c61
Fix small issues
2020-07-22 21:06:23 +02:00
N0tMyFaultOG
32e095ce15
More progress
...
I need a break, if something is missing, feel free to exchange that. K thx 🙏
2020-07-22 19:42:22 +02:00
Alexander Söderberg
6040e1bb5e
remove mainutil
2020-07-21 13:14:55 +02:00
Alexander Söderberg
20e9d13f60
Merge branch 'v6' into feature/v6/json
...
# Conflicts:
# Core/src/main/java/com/plotsquared/core/util/MainUtil.java
# Core/src/main/java/com/plotsquared/core/util/OperationUtil.java
2020-07-21 13:13:10 +02:00
Alexander Söderberg
73e3572c72
Fix the redstone flag on roads
2020-07-21 13:11:28 +02:00
Alexander Söderberg
186a810bf6
Bring back PAPI placeholders and raw colour formatting
2020-07-21 13:05:40 +02:00
dordsor21
21693e344c
Switch from MainUtil
2020-07-19 14:37:42 +01:00
dordsor21
d2443f6de8
Merge branch 'v6' into feature/v6/pipeline-queue
...
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java
# Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitRegionManager.java
# Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java
# Core/src/main/java/com/plotsquared/core/generator/SquarePlotManager.java
# Core/src/main/java/com/plotsquared/core/plot/Plot.java
# Core/src/main/java/com/plotsquared/core/plot/PlotArea.java
# Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotManager.java
# Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java
2020-07-19 14:29:08 +01:00
dordsor21
ed27422e69
Move IJ/xyz cache out of MainUItil to its own class
2020-07-19 14:21:52 +01:00
dordsor21
d24c89405a
Switch to using a Clipboard for regen in preparation for WE changes
2020-07-19 14:17:38 +01:00
Alexander Söderberg
ed3eedd238
Merge branch 'v6' into feature/v6/json
...
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
# Core/src/main/java/com/plotsquared/core/PlotSquared.java
# Core/src/main/java/com/plotsquared/core/command/Add.java
# Core/src/main/java/com/plotsquared/core/command/Auto.java
# Core/src/main/java/com/plotsquared/core/command/Buy.java
# Core/src/main/java/com/plotsquared/core/command/Template.java
# Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java
# Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java
# Core/src/main/java/com/plotsquared/core/listener/PlotListener.java
# Core/src/main/java/com/plotsquared/core/location/Location.java
# Core/src/main/java/com/plotsquared/core/plot/Plot.java
# Core/src/main/java/com/plotsquared/core/plot/PlotArea.java
# Core/src/main/java/com/plotsquared/core/plot/PlotCluster.java
# Core/src/main/java/com/plotsquared/core/plot/PlotId.java
# Core/src/main/java/com/plotsquared/core/plot/expiration/ExpireManager.java
# Core/src/main/java/com/plotsquared/core/plot/flag/implementations/KeepFlag.java
# Core/src/main/java/com/plotsquared/core/util/MainUtil.java
# Core/src/main/java/com/plotsquared/core/util/PlayerManager.java
# Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java
# Core/src/main/java/com/plotsquared/core/util/query/PlotQuery.java
# Core/src/main/java/com/plotsquared/core/util/query/SearchPlotProvider.java
2020-07-19 14:32:31 +02:00
Alexander Söderberg
193054f1fc
Move shit out of MainUtil into more appropriate classes
2020-07-19 14:23:55 +02:00
dordsor21
656700b5be
Start reimplementing chunk generation.
...
This would either need to be one WorldEdit operation or (preferable) WorldEdit allows Extents (including EditSessions) into the regenerate adapter method
2020-07-19 13:12:27 +01:00
dordsor21
3e84f3b3a4
Merge branch 'v6' into feature/v6/pipeline-queue
...
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
# Core/src/main/java/com/plotsquared/core/plot/Plot.java
# Core/src/main/java/com/plotsquared/core/util/WorldUtil.java
2020-07-18 15:27:52 +01:00
Alexander Söderberg
5360df6012
Add PlotRangeIterator for the many places where it'll be used. All one of them, in fact. This was not a waste of time. I am very happy I did this. This was worthwhile. Yup.
2020-07-18 16:19:12 +02:00
dordsor21
03983e8886
Allow forcing of queues down pipelines to ensure whenDone runnables are called correctly
...
Also remove autoQueue since it's never used and would be a bad idea
2020-07-18 13:55:54 +01:00
dordsor21
57af50ed49
Continue implementation of new queue system
...
- Move ChunkCoordinatorBuild to Core
- Add core ChunkCoordinator
- Add Factories for ChunkCoordinator and its Builder
- Reimplement refreshChunk but in WorldUtil
- Allow custom Consumers to be used by the Queue when sent to the ChunkCoordinator
- Start switching ChunkTasks to use the new ChunkCoordinator system
- Replace GlobalBlockQueue's "empty task" system with normal sync TaskManager
- Remove lombok from the queue system
- Add back forceSync and chunkObject from LocalBlockQueue
2020-07-18 12:07:56 +01:00
Alexander Söderberg
e80ade65c7
Clean up PlotId
2020-07-18 11:05:16 +02:00
Alexander Söderberg
4d24112ec7
Fix merge issues
2020-07-17 23:06:40 +02:00
Alexander Söderberg
1a269a1227
Merge branch 'v6' into feature/v6/json
...
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
# Core/src/main/java/com/plotsquared/core/util/WorldUtil.java
2020-07-17 23:05:45 +02:00
Alexander Söderberg
d077fafd29
Some random bukkitutil/worldutil improvements
2020-07-17 23:00:09 +02:00
dordsor21
66b94ab9f1
Start switching to WorldEdit Worlds
2020-07-17 17:21:32 +01:00
dordsor21
74c6fc954e
Merge branch 'v6' into feature/v6/pipeline-queue
...
# Conflicts:
# Core/src/main/java/com/plotsquared/core/command/Trim.java
# Core/src/main/java/com/plotsquared/core/queue/BasicLocalBlockQueue.java
# Core/src/main/java/com/plotsquared/core/queue/GlobalBlockQueue.java
2020-07-17 17:16:49 +01:00
Alexander Söderberg
3a1b56494a
Merge branch 'v6' into feature/v6/json
...
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
# Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
# Core/src/main/java/com/plotsquared/core/command/Claim.java
# Core/src/main/java/com/plotsquared/core/command/Condense.java
# Core/src/main/java/com/plotsquared/core/plot/comment/CommentManager.java
# Core/src/main/java/com/plotsquared/core/util/task/AutoClaimFinishTask.java
# Core/src/main/java/com/plotsquared/core/util/task/ObjectTaskRunnable.java
# Core/src/main/java/com/plotsquared/core/util/task/TaskManager.java
2020-07-17 17:58:14 +02:00
Alexander Söderberg
932052772c
Fix edge cases for time conversion
2020-07-17 17:53:30 +02:00
Alexander Söderberg
43d058d3db
Address comments
2020-07-17 17:53:30 +02:00
Alexander Söderberg
020b030667
More fixes
2020-07-17 17:53:30 +02:00
Alexander Söderberg
5a3eacde0b
Replace method synchronization logic
2020-07-17 17:53:30 +02:00
Alexander Söderberg
7f412f5472
Begin work on the task system
2020-07-17 17:53:30 +02:00
Alexander Söderberg
33b6ef66d6
Delombok + import organisation
2020-07-17 17:24:45 +02:00
dordsor21
9fefe57c90
Switch to using QueueCoordinators everywhere
2020-07-17 15:41:06 +01:00
dordsor21
ed77522c08
Add wna block setting, use WorldEdit worlds rather than Strings.
2020-07-17 14:38:50 +01:00
dordsor21
09aca839a8
Add back changes to ChunkCoordinator
2020-07-17 14:00:01 +01:00
dordsor21
def9a1bcf8
begin new block setting/chunk pipeline
...
This will ultimately replace both the GlobalBlockQueue and the ChunkTask stuff
2020-07-17 13:22:33 +01:00
dordsor21
57435fdf34
verbosely ensure items cannot be duplicated when keeping inventory on death
...
Seemingly there's duplication issues on some servers (and apparently even when only PlotSquared is installed). Likely a Spigot issue, but there's nothing to be done for Spigot on 1.13/14/15
2020-07-16 23:24:11 +01:00
N0tMyFaultOG
01ff9a34c2
Merge branch 'features/v5/placeholders' into v5
2020-07-16 18:48:45 +02:00
Hannes Greule
97a356c4a0
Very attentive reviewers, can recommend
2020-07-16 18:13:02 +02:00
Hannes Greule
10ab28c1ec
Add missing license headers
2020-07-16 18:08:00 +02:00
Hannes Greule
2d9cf8b759
Get placeholders working
2020-07-16 18:04:17 +02:00
N0tMyFaultOG
4996d8bcd1
Remove left over debugs
2020-07-15 14:05:15 +02:00
NotMyFault
e5963a8590
Merge pull request #2877 from IntellectualSites/features/v5/split-bukkit-listeners
...
Clean up bukkit listeners by splitting them up
2020-07-15 13:35:38 +02:00
N0tMyFaultOG
e8c155763b
Register placeholders
2020-07-15 12:44:07 +02:00
Alexander Söderberg
34655b8d41
Add (untested) MVdWPlaceholderAPI support
2020-07-14 20:41:08 +02:00
Alexander Söderberg
c0a0d36e5d
Remove remaining jetbrains imports
2020-07-14 19:40:47 +02:00
Alexander Söderberg
b68d7150f1
Manually fix some merge conflicts
2020-07-14 19:34:44 +02:00
Alexander Söderberg
198bcfdf4d
Merge branch 'v6' into feature/v6/json
...
# Conflicts:
# Bukkit/build.gradle
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
# Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java
# Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
# Core/build.gradle
# 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/Add.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/Command.java
# Core/src/main/java/com/plotsquared/core/command/ListCmd.java
# Core/src/main/java/com/plotsquared/core/configuration/Caption.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/message/PlotMessage.java
# Core/src/main/java/com/plotsquared/core/setup/CommonSetupSteps.java
# Core/src/main/java/com/plotsquared/core/util/MainUtil.java
# Core/src/main/java/com/plotsquared/core/util/WorldUtil.java
2020-07-14 19:25:14 +02:00
Alexander Söderberg
8eb903ad72
Merge branch 'v5' into v6
...
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
2020-07-14 19:18:08 +02:00
Alexander Söderberg
0294397021
Manually resolve a bunch of merge issues
2020-07-14 19:10:52 +02:00
Alexander Söderberg
97fed21811
Merge branch 'v6' into feature/v6/platform
...
# Conflicts:
# Bukkit/build.gradle
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
# Bukkit/src/main/java/com/plotsquared/bukkit/listener/ChunkListener.java
# Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitRegionManager.java
# Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
# Bukkit/src/main/java/com/plotsquared/bukkit/uuid/SquirrelIdUUIDService.java
# Core/build.gradle
# Core/src/main/java/com/plotsquared/core/PlotSquared.java
# Core/src/main/java/com/plotsquared/core/command/Claim.java
# Core/src/main/java/com/plotsquared/core/command/Debug.java
# Core/src/main/java/com/plotsquared/core/command/DebugExec.java
# Core/src/main/java/com/plotsquared/core/command/Purge.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/database/SQLManager.java
# Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java
# Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java
# Core/src/main/java/com/plotsquared/core/generator/SquarePlotManager.java
# Core/src/main/java/com/plotsquared/core/generator/SquarePlotWorld.java
# Core/src/main/java/com/plotsquared/core/listener/ProcessedWEExtent.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/PlotArea.java
# Core/src/main/java/com/plotsquared/core/plot/PlotInventory.java
# Core/src/main/java/com/plotsquared/core/plot/expiration/ExpireManager.java
# Core/src/main/java/com/plotsquared/core/plot/expiration/PlotAnalysis.java
# Core/src/main/java/com/plotsquared/core/plot/flag/FlagContainer.java
# Core/src/main/java/com/plotsquared/core/plot/flag/types/BlockTypeWrapper.java
# Core/src/main/java/com/plotsquared/core/plot/message/PlotMessage.java
# Core/src/main/java/com/plotsquared/core/util/LegacyConverter.java
# Core/src/main/java/com/plotsquared/core/util/MainUtil.java
# Core/src/main/java/com/plotsquared/core/util/RegionManager.java
# Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java
# Core/src/main/java/com/plotsquared/core/uuid/UUIDPipeline.java
2020-07-14 19:05:05 +02:00
Alexander Söderberg
510ea56431
Finalize DI stuff
2020-07-14 18:49:40 +02:00
Alexander Söderberg
55eefd09da
Merge branch 'v6' into feature/v6/json
2020-07-14 16:52:40 +02:00
Alexander Söderberg
1dc4da8beb
Fix issues from previous merge
2020-07-14 13:21:59 +02:00
Alexander Söderberg
1908588fcb
Change expansion author and version
2020-07-14 13:17:21 +02:00
Alexander Söderberg
af7db08036
Add new placeholder system
2020-07-14 13:14:02 +02:00
Alexander Söderberg
33f2ff7e6d
Merge branch 'v6' into feature/v6/slf4j
2020-07-13 23:11:40 +02:00
Alexander Söderberg
6664d49928
Prefix all log messages
2020-07-13 23:04:27 +02:00
Alexander Söderberg
a1f262b5b2
Fix gradle setup and replace all debug calls
2020-07-13 22:51:57 +02:00
N0tMyFaultOG
c6962ef4d2
Shift a few more messages to debug
2020-07-13 19:56:34 +02:00
Alexander Söderberg
0fa5a16cd0
replace remaining debug calls
2020-07-12 21:49:05 +02:00
Alexander Söderberg
e88da3cea9
Add chunk coordinator
2020-07-12 20:58:48 +02:00
dordsor21
14b6f84816
fix typos that were c/p over
2020-07-12 18:50:04 +01:00
N0tMyFaultOG
ac8841447c
6cf2c0ad97 (r40542418)
2020-07-12 17:11:25 +02:00
Alexander Söderberg
6cf2c0ad97
Disable the paper uuid service for offline mode servers and add toggles for all third party uuid services
2020-07-12 17:04:30 +02:00
dordsor21
c045ef698c
Add license headers and fix method change in PlotSquared.java
2020-07-12 11:42:45 +01:00
Alexander Söderberg
5cdb3f4fd5
Add missing injection points
2020-07-12 12:25:44 +02:00
dordsor21
3a11ffc77a
Clean up bukkit listeners by splitting them up
2020-07-11 19:03:55 +01:00
Alexander Söderberg
916675fb08
Guice progress
2020-07-11 17:19:19 +02:00
Alexander Söderberg
6f6cb4b630
More DI progress
2020-07-11 05:29:41 +02:00
Alexander Söderberg
c0f69f321d
Guice progress
2020-07-10 22:12:37 +02:00
Alexander Söderberg
55bf41d2da
Remove dumdum static access
2020-07-10 19:25:05 +02:00
Alexander Söderberg
21ad9a36c8
Merge branch 'v6' into feature/v6/platform
...
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java
# Core/src/main/java/com/plotsquared/core/PlotSquared.java
# Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java
# Core/src/main/java/com/plotsquared/core/location/Location.java
2020-07-10 18:37:18 +02:00
dordsor21
afb72aa102
Don't include eggs with spawn*_eggs*
2020-07-10 17:31:46 +01:00
Alexander Söderberg
d00dc658df
Inject EventDispatcher and PlotListener
2020-07-10 18:17:44 +02:00
Alexander Söderberg
2dab7c8dda
Inject PlotAreaManager
2020-07-10 17:32:07 +02:00
Alexander Söderberg
c37cc40ad9
Move annotation in BukkitWorld
2020-07-10 12:27:26 +02:00
Alexander Söderberg
5341015cb1
Finalize immutable locations and add a platform world implementation
2020-07-10 12:21:29 +02:00
dordsor21
5e44bb60c6
Merge branch 'v5' of github.com:IntellectualSites/PlotSquared into v5
2020-07-09 22:14:38 +01:00
dordsor21
96740fd282
Couple of fixes to road flag logic
2020-07-09 21:52:51 +01:00
Alexander Söderberg
b36c6427d1
Split failed UUID batches into individual requests in order to identify the invalid UUIDs
2020-07-09 20:37:14 +02:00
Traks
cfd389883b
Improve piston interaction with area border
2020-07-09 20:14:06 +02:00
Traks
4576cfd961
Improve piston interaction with plot border
...
Fixes retracting pistons being able to modify plot borders. Prevents
piston heads from sticking outside plots.
2020-07-09 20:14:06 +02:00
Alexander Söderberg
699eb71e2a
Fix kill-road-mobs. Fixes PS-73
2020-07-09 19:46:17 +02:00
Alexander Söderberg
6b07f38cff
Send teleportation cancellation message immediately on movement, rather than after the timer has finished. This fixes PS-33.
2020-07-09 16:45:25 +02:00
Alexander Söderberg
904f5485ab
Merge remote-tracking branch 'origin/v5' into v5
2020-07-09 16:38:53 +02:00
Alexander Söderberg
e05d817482
Fix plot owner placeholder. Fixes PS-62.
2020-07-09 16:38:46 +02:00
Alexander Söderberg
db37077af7
Make signs able to use captions
2020-07-09 12:58:28 +02:00
