dordsor21
|
615a5212bf
|
update bukkit pom
|
2020-07-24 17:57:16 +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 |
|
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
|
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 |
|
Alexander Söderberg
|
6dba31b257
|
Start working on the new permission system
|
2020-07-21 14:28:54 +02:00 |
|
Alexander Söderberg
|
73e3572c72
|
Fix the redstone flag on roads
|
2020-07-21 13:11:28 +02:00 |
|
dordsor21
|
ed27422e69
|
Move IJ/xyz cache out of MainUItil to its own class
|
2020-07-19 14:21:52 +01:00 |
|
Alexander Söderberg
|
2d518dfe2b
|
Clean up BlockUtil
|
2020-07-19 14:49:26 +02:00 |
|
Alexander Söderberg
|
f357fa74f3
|
Remove unused files
|
2020-07-19 14:37:53 +02:00 |
|
Alexander Söderberg
|
23783b8b0b
|
add deprecations
|
2020-07-19 14:24:42 +02:00 |
|
Alexander Söderberg
|
193054f1fc
|
Move shit out of MainUtil into more appropriate classes
|
2020-07-19 14:23:55 +02:00 |
|
N0tMyFaultOG
|
87a8ff742f
|
5.13.1
|
2020-07-19 14:16:13 +02: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 |
|