Commit Graph

4037 Commits

Author SHA1 Message Date
704e92c3d0 Use placeholder 2020-07-28 09:38:27 +01:00
97b1a60ae8 Move comments to ChunkCoordinator, remove Range annotations 2020-07-28 08:44:16 +01:00
3288721259 Better constructor error handling in QueueProvider.
Add back default constructor requiring world to QueueCoordinator to indicate extents require this constructor
2020-07-28 08:34:14 +01:00
b3ddabda29 Fix DelegateQueueCoordinator 2020-07-24 18:20:26 +01: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
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
416e181992 Merge branch 'v6' into feature/v6/pipeline-queue 2020-07-24 13:10:11 +01:00
d7a49e3316 This is not my fault 2020-07-24 14:08:40 +02: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
8c5c1922c9 Merge branch 'v6' into feature/v6/pipeline-queue 2020-07-24 12:34:41 +01:00
707559e023 Merge remote-tracking branch 'origin/v6' into v6 2020-07-24 13:33:00 +02:00
97a2ccbfe0 make sure the PlayerMetaDataKeys keys are loaded 2020-07-24 13:32:46 +02:00
95f2a7a908 fix version 2020-07-24 12:22:13 +01: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
dc1f669a1f Remove permission caching 2020-07-24 13:01:38 +02:00
0ea862b572 Merge pull request #2886 from IntellectualSites/features/v6/permissions
Permission system fixup
2020-07-24 12:49:37 +02:00
fe7a57b2b7 Remove mainutil cache workaround 2020-07-24 12:48:45 +02:00
c9c62a1083 Remove dumb permission mess. 2020-07-24 12:44:04 +02:00
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
722361aedb Implement suggestions from PR comments 2020-07-24 12:15:25 +02:00
d2f40612f4 Switch from Class<T> to TypeLiteral, and implement managed meta access for temporary meta 2020-07-24 12:15:25 +02:00
6a63e5bb51 Expose the player's lock repository 2020-07-24 12:15:25 +02:00
ad40ab7e1e Grant plots to the correct player 2020-07-24 12:15:25 +02:00
05ce67fbfe Trick the compiler 2020-07-24 12:15:25 +02:00
555860cf83 Add managed persistent meta data access 2020-07-24 12:15:25 +02:00
2575787bd0 Add LockRepository 2020-07-24 12:15:25 +02:00
2cfb646065 Javadoc no fun 2020-07-23 18:11:52 +01:00
a1da452c41 Fix build properly 2020-07-23 18:09:37 +01:00
420e38bead idek? 2020-07-23 18:07:23 +01:00
41c4018a27 Merge branch 'v6' into feature/v6/pipeline-queue 2020-07-23 18:06:45 +01:00
4d4f755607 6.0.0-SUPER-SNAPSHOT 2020-07-23 18:06:14 +01:00
d8e5daf12b Fix missing Main->Chunk Util change 2020-07-23 18:04:01 +01:00
c3322021d0 mavenLocal, poms 2020-07-23 18:02:29 +01:00
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
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
d8e80daa93 Fix annoying guice injection issue 2020-07-23 15:40:43 +02:00
384a6730a4 Merge remote-tracking branch 'origin/features/v6/permissions' into features/v6/permissions
# Conflicts:
#	Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
2020-07-23 15:06:00 +02:00
a7de76d150 Fix dependencies 2020-07-23 15:03:57 +02:00
2154e237ff Remove construction of fake player entities for offline players. 2020-07-23 15:03:57 +02:00
5fda3e9765 Get rid of PermHandler 2020-07-23 15:03:57 +02:00
b302bb9379 Make VaultPermissionHandler extent BukkitPermissionHandler 2020-07-23 15:03:57 +02:00
bfbb81030f Start working on the new permission system 2020-07-23 15:03:57 +02:00