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
63ce3292aa
Fix PlayerManager injection
2020-07-23 15:03:27 +02:00
b9a8846ee9
Fix WorldManager injection
2020-07-23 14:56:53 +02:00
6ae1d28f80
Fix WorldManager injection
2020-07-23 14:56:06 +02:00
17d358f8fe
Fix plot ID issues
2020-07-23 14:14:15 +02:00
cfd71457d2
Clean up BlockUtil
2020-07-23 14:14:15 +02:00
87285e08dc
Fix plot ID issues
2020-07-23 14:11:34 +02:00
b3a63123fd
Fix dependencies
2020-07-23 14:03:56 +02:00
7fc8238fb0
Remove construction of fake player entities for offline players.
2020-07-23 12:47:00 +02:00
32a0765484
Force more compilation errors
2020-07-22 21:09:38 +02:00
c5e1b87c61
Fix small issues
2020-07-22 21:06:23 +02:00
603d1ee9bb
Even more
...
Ok seriously, I stop here
2020-07-22 20:38:46 +02:00
86a0816b26
Merge remote-tracking branch 'origin/feature/v6/json' into feature/v6/json
2020-07-22 19:55:03 +02:00
287cb0f5ad
Fix minor issues
2020-07-22 19:54:35 +02:00
3009db3aa7
Update FlagCommand.java
2020-07-22 19:47:58 +02:00
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
9d6744ec15
Get rid of PermHandler
2020-07-22 12:35:48 +02:00
532f2caa37
Make VaultPermissionHandler extent BukkitPermissionHandler
2020-07-22 12:06:56 +02:00
da2fa24e74
Merge remote-tracking branch 'origin/v6' into v6
2020-07-22 12:05:50 +02:00
8d04728ebc
More work
2020-07-22 00:08:51 +02:00
2aa5c276c9
Some more work done towards json
2020-07-21 21:39:52 +02:00
6dba31b257
Start working on the new permission system
2020-07-21 14:28:54 +02:00
6040e1bb5e
remove mainutil
2020-07-21 13:14:55 +02:00
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
73e3572c72
Fix the redstone flag on roads
2020-07-21 13:11:28 +02:00
5f76cc4f7b
Give ConsolePlayer the same treatment
2020-07-21 13:07:33 +02:00
