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
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
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
193054f1fc
Move shit out of MainUtil into more appropriate classes
2020-07-19 14:23:55 +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
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
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
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
0fa5a16cd0
replace remaining debug calls
2020-07-12 21:49:05 +02:00
3a11ffc77a
Clean up bukkit listeners by splitting them up
2020-07-11 19:03:55 +01:00
6f6cb4b630
More DI progress
2020-07-11 05:29:41 +02:00
c0f69f321d
Guice progress
2020-07-10 22:12:37 +02:00
55bf41d2da
Remove dumdum static access
2020-07-10 19:25:05 +02:00
d00dc658df
Inject EventDispatcher and PlotListener
2020-07-10 18:17:44 +02:00
2dab7c8dda
Inject PlotAreaManager
2020-07-10 17:32:07 +02:00
c37cc40ad9
Move annotation in BukkitWorld
2020-07-10 12:27:26 +02:00
5341015cb1
Finalize immutable locations and add a platform world implementation
2020-07-10 12:21:29 +02:00
d76c9dad52
Remove access to PlotSquared#IMP and rename IPlotMain to PlotPlatform, then rename PlotSquared#imp() to PlotSquared#platform()
2020-07-07 12:56:43 +02:00
298e65a394
Replace remaining references to PlotSquared#log
2020-07-06 17:17:46 +02:00
580212d66d
fix build
2020-07-01 21:49:53 +01:00
bd9bdc9e03
Separate the Vault Permission Handling from the Economy Handling
2020-06-28 14:28:11 +02:00
9c3d2cfb02
Move the caching and static accessors from EconHandler to PlotMain
2020-06-27 06:26:00 +02:00
f64026af1a
Only initialise EconHandler when economy is enabled and stop accessing the static instance directly.
2020-06-24 15:26:06 +02:00
55cf34508a
Fix issue where old player objects were not cleaned up properly.
...
This is caused by an issue with the event order in Spigot (and Spigot derivatives), so the fix is rather hacky.
2020-06-23 18:36:53 +02:00
2d6e6ceaeb
Improve documentation of BukkitMain#wrapPlayer and improve generic types
2020-06-22 15:45:57 +02:00
e3fbb32399
Formatting and documentation
2020-06-11 01:01:00 +02:00
5165c439fc
Add tab completion and fix minor bugs
2020-06-11 01:01:00 +02:00
6442922d86
Implement some more generic types to make the player objects easier to work with and also create wrapper objects for fake players (NPCs). Potentially fixes PS-27
2020-05-27 14:08:48 +02:00
28a7d027f6
Merge branch 'v5' into features/v5/uuid
2020-05-24 21:14:56 +02:00
32a55127f1
Fix partial area regeneration when using PlotSquared generation.
...
Also fix issues with region height and road width.
2020-05-23 14:32:02 +02:00
8efc78e1c9
IT COMPILES!
2020-05-19 23:05:36 +02:00
37b065a097
Progress.
2020-05-19 00:28:52 +02:00
7591c440c2
Begin working on the new UUID service API
2020-05-17 12:40:25 +02:00
441a73839e
Add /plot components
2020-05-16 21:37:14 +02:00
31edffcb63
Begin working on a platform specific world management system
...
This should make world management a fair bit cleaner
2020-05-16 21:37:14 +02:00
1fa41e6209
Merge branch 'v5' into tile-entity-cap
2020-05-14 13:17:41 +02:00
617abf89e6
Split ChunkManager to Chunk and Region Managers
...
- Having not chunk-specific code in ChunkManager felt wrong.
- Also allow FAWE to replace setbiome code
- Also improve performance (proper usage of chunk loading) for setbiome
2020-05-14 11:27:35 +01:00
e6a9daf31a
Make the tile entity limit in ProcessedWEExtent apply per chunk rather than per edit
2020-05-13 14:54:54 +02:00
ec347f8738
Add missing blocks and block tile entities from /plot set if the chunk processor is enabled
2020-05-13 14:24:04 +02:00
19fe2efb6e
Fix the WE extent and add our own tile entity list
2020-05-13 14:11:17 +02:00
d864792d09
Fixes #2800 Allow to wrap OfflinePlayers in 1.15.2
2020-05-02 11:28:06 +01:00
