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
f53a8d3b06
Fix permissionprofile initialisation order
2020-07-24 14:02:49 +02:00
dc1f669a1f
Remove permission caching
2020-07-24 13:01:38 +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
d2f40612f4
Switch from Class<T> to TypeLiteral, and implement managed meta access for temporary meta
2020-07-24 12:15:25 +02:00
d8e5daf12b
Fix missing Main->Chunk Util change
2020-07-23 18:04:01 +01:00
d8e80daa93
Fix annoying guice injection issue
2020-07-23 15:40:43 +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
6ae1d28f80
Fix WorldManager injection
2020-07-23 14:56:06 +02:00
73e3572c72
Fix the redstone flag on roads
2020-07-21 13:11:28 +02:00
ed27422e69
Move IJ/xyz cache out of MainUItil to its own class
2020-07-19 14:21:52 +01: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
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
57435fdf34
verbosely ensure items cannot be duplicated when keeping inventory on death
...
Seemingly there's duplication issues on some servers (and apparently even when only PlotSquared is installed). Likely a Spigot issue, but there's nothing to be done for Spigot on 1.13/14/15
2020-07-16 23:24:11 +01:00
01ff9a34c2
Merge branch 'features/v5/placeholders' into v5
2020-07-16 18:48:45 +02:00
97a356c4a0
Very attentive reviewers, can recommend
2020-07-16 18:13:02 +02:00
10ab28c1ec
Add missing license headers
2020-07-16 18:08:00 +02:00
2d9cf8b759
Get placeholders working
2020-07-16 18:04:17 +02:00
4996d8bcd1
Remove left over debugs
2020-07-15 14:05:15 +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
e8c155763b
Register placeholders
2020-07-15 12:44:07 +02:00
34655b8d41
Add (untested) MVdWPlaceholderAPI support
2020-07-14 20:41:08 +02: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
1dc4da8beb
Fix issues from previous merge
2020-07-14 13:21:59 +02:00
1908588fcb
Change expansion author and version
2020-07-14 13:17:21 +02:00
af7db08036
Add new placeholder system
2020-07-14 13:14:02 +02:00
33f2ff7e6d
Merge branch 'v6' into feature/v6/slf4j
2020-07-13 23:11:40 +02:00
6664d49928
Prefix all log messages
2020-07-13 23:04:27 +02:00
a1f262b5b2
Fix gradle setup and replace all debug calls
2020-07-13 22:51:57 +02:00
c6962ef4d2
Shift a few more messages to debug
2020-07-13 19:56:34 +02:00
0fa5a16cd0
replace remaining debug calls
2020-07-12 21:49:05 +02:00
e88da3cea9
Add chunk coordinator
2020-07-12 20:58:48 +02:00
14b6f84816
fix typos that were c/p over
2020-07-12 18:50:04 +01:00
ac8841447c
6cf2c0ad97 (r40542418)
2020-07-12 17:11:25 +02:00
6cf2c0ad97
Disable the paper uuid service for offline mode servers and add toggles for all third party uuid services
2020-07-12 17:04:30 +02:00
c045ef698c
Add license headers and fix method change in PlotSquared.java
2020-07-12 11:42:45 +01:00
