|
|
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 |
|
|
|
d7a49e3316
|
This is not my fault
|
2020-07-24 14:08:40 +02:00 |
|
|
|
f53a8d3b06
|
Fix permissionprofile initialisation order
|
2020-07-24 14:02:49 +02:00 |
|
|
|
97a2ccbfe0
|
make sure the PlayerMetaDataKeys keys are loaded
|
2020-07-24 13:32:46 +02:00 |
|
|
|
dc1f669a1f
|
Remove permission caching
|
2020-07-24 13:01:38 +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 |
|
|
|
a1da452c41
|
Fix build properly
|
2020-07-23 18:09:37 +01: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 |
|
|
|
bfbb81030f
|
Start working on the new permission system
|
2020-07-23 15:03:57 +02:00 |
|
|
|
87285e08dc
|
Fix plot ID issues
|
2020-07-23 14:11:34 +02:00 |
|
|
|
da2fa24e74
|
Merge remote-tracking branch 'origin/v6' into v6
|
2020-07-22 12:05:50 +02:00 |
|
|
|
ed27422e69
|
Move IJ/xyz cache out of MainUItil to its own class
|
2020-07-19 14:21:52 +01:00 |
|
|
|
2d518dfe2b
|
Clean up BlockUtil
|
2020-07-19 14:49:26 +02:00 |
|
|
|
f357fa74f3
|
Remove unused files
|
2020-07-19 14:37:53 +02:00 |
|
|
|
23783b8b0b
|
add deprecations
|
2020-07-19 14:24:42 +02:00 |
|
|
|
193054f1fc
|
Move shit out of MainUtil into more appropriate classes
|
2020-07-19 14:23:55 +02:00 |
|
|
|
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 |
|
|
|
39fdaa367c
|
Make PlotQuery iterable
|
2020-07-18 16:18:23 +02:00 |
|
|
|
e80ade65c7
|
Clean up PlotId
|
2020-07-18 11:05:16 +02:00 |
|
|
|
d077fafd29
|
Some random bukkitutil/worldutil improvements
|
2020-07-17 23:00:09 +02:00 |
|
|
|
932052772c
|
Fix edge cases for time conversion
|
2020-07-17 17:53:30 +02:00 |
|
|
|
43d058d3db
|
Address comments
|
2020-07-17 17:53:30 +02:00 |
|
|
|
020b030667
|
More fixes
|
2020-07-17 17:53:30 +02:00 |
|
|
|
5a3eacde0b
|
Replace method synchronization logic
|
2020-07-17 17:53:30 +02:00 |
|
|
|
7f412f5472
|
Begin work on the task system
|
2020-07-17 17:53:30 +02:00 |
|
|
|
01ff9a34c2
|
Merge branch 'features/v5/placeholders' into v5
|
2020-07-16 18:48:45 +02:00 |
|
|
|
2d9cf8b759
|
Get placeholders working
|
2020-07-16 18:04:17 +02:00 |
|
|
|
32b28a4ca5
|
Turn all UUID messages into debug messages
|
2020-07-15 22:42:58 +02:00 |
|
|
|
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 |
|
|
|
5d2d4ac12b
|
fix language issue
|
2020-07-14 20:47:15 +02:00 |
|
|
|
64f5580edd
|
Fix code styling issue
|
2020-07-14 20:46:52 +02:00 |
|
|
|
2e4c43c251
|
Add config option to disable placing top wall blocks
|
2020-07-14 19:10:53 +01:00 |
|
|
|
8eb903ad72
|
Merge branch 'v5' into v6
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
|
2020-07-14 19:18:08 +02:00 |
|
|
|
0294397021
|
Manually resolve a bunch of merge issues
|
2020-07-14 19:10:52 +02:00 |
|
|
|
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 |
|
|
|
510ea56431
|
Finalize DI stuff
|
2020-07-14 18:49:40 +02:00 |
|
|
|
f9e5fd714d
|
Merge remote-tracking branch 'origin/feature/v6/platform' into feature/v6/platform
|
2020-07-14 17:07:03 +02:00 |
|
|
|
1dc4da8beb
|
Fix issues from previous merge
|
2020-07-14 13:21:59 +02:00 |
|
|
|
af7db08036
|
Add new placeholder system
|
2020-07-14 13:14:02 +02:00 |
|
