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 |
|
Alexander Söderberg
|
af44fe74ff
|
Add namespaces for translations
|
2020-07-24 17:19:25 +02:00 |
|
Alexander Söderberg
|
d7a49e3316
|
This is not my fault
|
2020-07-24 14:08:40 +02:00 |
|
Alexander Söderberg
|
f53a8d3b06
|
Fix permissionprofile initialisation order
|
2020-07-24 14:02:49 +02:00 |
|
Alexander Söderberg
|
707559e023
|
Merge remote-tracking branch 'origin/v6' into v6
|
2020-07-24 13:33:00 +02:00 |
|
Alexander Söderberg
|
97a2ccbfe0
|
make sure the PlayerMetaDataKeys keys are loaded
|
2020-07-24 13:32:46 +02:00 |
|
dordsor21
|
95f2a7a908
|
fix version
|
2020-07-24 12:22:13 +01:00 |
|
Alexander Söderberg
|
dc1f669a1f
|
Remove permission caching
|
2020-07-24 13:01:38 +02:00 |
|
Alexander Söderberg
|
0ea862b572
|
Merge pull request #2886 from IntellectualSites/features/v6/permissions
Permission system fixup
|
2020-07-24 12:49:37 +02:00 |
|
Alexander Söderberg
|
fe7a57b2b7
|
Remove mainutil cache workaround
|
2020-07-24 12:48:45 +02:00 |
|
Alexander Söderberg
|
c9c62a1083
|
Remove dumb permission mess.
|
2020-07-24 12:44:04 +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
|
722361aedb
|
Implement suggestions from PR comments
|
2020-07-24 12:15:25 +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 |
|
Alexander Söderberg
|
6a63e5bb51
|
Expose the player's lock repository
|
2020-07-24 12:15:25 +02:00 |
|
Alexander Söderberg
|
ad40ab7e1e
|
Grant plots to the correct player
|
2020-07-24 12:15:25 +02:00 |
|
Alexander Söderberg
|
05ce67fbfe
|
Trick the compiler
|
2020-07-24 12:15:25 +02:00 |
|
Alexander Söderberg
|
555860cf83
|
Add managed persistent meta data access
|
2020-07-24 12:15:25 +02:00 |
|
Alexander Söderberg
|
2575787bd0
|
Add LockRepository
|
2020-07-24 12:15:25 +02:00 |
|
dordsor21
|
a1da452c41
|
Fix build properly
|
2020-07-23 18:09:37 +01:00 |
|
dordsor21
|
4d4f755607
|
6.0.0-SUPER-SNAPSHOT
|
2020-07-23 18:06:14 +01:00 |
|
dordsor21
|
d8e5daf12b
|
Fix missing Main->Chunk Util change
|
2020-07-23 18:04:01 +01:00 |
|
Alexander Söderberg
|
d8e80daa93
|
Fix annoying guice injection issue
|
2020-07-23 15:40:43 +02:00 |
|
Alexander Söderberg
|
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 |
|
N0tMyFaultOG
|
a7de76d150
|
Fix dependencies
|
2020-07-23 15:03:57 +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
|
b9a8846ee9
|
Fix WorldManager injection
|
2020-07-23 14:56:53 +02:00 |
|
Alexander Söderberg
|
6ae1d28f80
|
Fix WorldManager injection
|
2020-07-23 14:56:06 +02:00 |
|
Alexander Söderberg
|
17d358f8fe
|
Fix plot ID issues
|
2020-07-23 14:14:15 +02:00 |
|
Alexander Söderberg
|
cfd71457d2
|
Clean up BlockUtil
|
2020-07-23 14:14:15 +02:00 |
|
Alexander Söderberg
|
87285e08dc
|
Fix plot ID issues
|
2020-07-23 14:11:34 +02:00 |
|
N0tMyFaultOG
|
b3a63123fd
|
Fix dependencies
|
2020-07-23 14:03:56 +02:00 |
|
Alexander Söderberg
|
7fc8238fb0
|
Remove construction of fake player entities for offline players.
|
2020-07-23 12:47:00 +02:00 |
|
Alexander Söderberg
|
32a0765484
|
Force more compilation errors
|
2020-07-22 21:09:38 +02:00 |
|
Alexander Söderberg
|
c5e1b87c61
|
Fix small issues
|
2020-07-22 21:06:23 +02:00 |
|
N0tMyFaultOG
|
603d1ee9bb
|
Even more
Ok seriously, I stop here
|
2020-07-22 20:38:46 +02:00 |
|
Alexander Söderberg
|
86a0816b26
|
Merge remote-tracking branch 'origin/feature/v6/json' into feature/v6/json
|
2020-07-22 19:55:03 +02:00 |
|
Alexander Söderberg
|
287cb0f5ad
|
Fix minor issues
|
2020-07-22 19:54:35 +02:00 |
|
N0tMyFaultOG
|
3009db3aa7
|
Update FlagCommand.java
|
2020-07-22 19:47:58 +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
|
9d6744ec15
|
Get rid of PermHandler
|
2020-07-22 12:35:48 +02:00 |
|
Alexander Söderberg
|
532f2caa37
|
Make VaultPermissionHandler extent BukkitPermissionHandler
|
2020-07-22 12:06:56 +02:00 |
|
Alexander Söderberg
|
da2fa24e74
|
Merge remote-tracking branch 'origin/v6' into v6
|
2020-07-22 12:05:50 +02:00 |
|
N0tMyFaultOG
|
8d04728ebc
|
More work
|
2020-07-22 00:08:51 +02:00 |
|
N0tMyFaultOG
|
2aa5c276c9
|
Some more work done towards json
|
2020-07-21 21:39:52 +02:00 |
|
Alexander Söderberg
|
6dba31b257
|
Start working on the new permission system
|
2020-07-21 14:28:54 +02:00 |
|