dordsor21
|
ed77522c08
|
Add wna block setting, use WorldEdit worlds rather than Strings.
|
2020-07-17 14:38:50 +01:00 |
|
dordsor21
|
def9a1bcf8
|
begin new block setting/chunk pipeline
This will ultimately replace both the GlobalBlockQueue and the ChunkTask stuff
|
2020-07-17 13:22:33 +01:00 |
|
Alexander Söderberg
|
8eb903ad72
|
Merge branch 'v5' into v6
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
|
2020-07-14 19:18:08 +02:00 |
|
Alexander Söderberg
|
0294397021
|
Manually resolve a bunch of merge issues
|
2020-07-14 19:10:52 +02:00 |
|
Alexander Söderberg
|
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 |
|
Alexander Söderberg
|
510ea56431
|
Finalize DI stuff
|
2020-07-14 18:49:40 +02:00 |
|
Alexander Söderberg
|
f9e5fd714d
|
Merge remote-tracking branch 'origin/feature/v6/platform' into feature/v6/platform
|
2020-07-14 17:07:03 +02:00 |
|
Alexander Söderberg
|
1dc4da8beb
|
Fix issues from previous merge
|
2020-07-14 13:21:59 +02:00 |
|
Alexander Söderberg
|
33f2ff7e6d
|
Merge branch 'v6' into feature/v6/slf4j
|
2020-07-13 23:11:40 +02:00 |
|
Alexander Söderberg
|
6664d49928
|
Prefix all log messages
|
2020-07-13 23:04:27 +02:00 |
|
Alexander Söderberg
|
a1f262b5b2
|
Fix gradle setup and replace all debug calls
|
2020-07-13 22:51:57 +02:00 |
|
Alexander Söderberg
|
d141b040d6
|
Fix relocations
|
2020-07-13 20:45:04 +02:00 |
|
Alexander Söderberg
|
e84d82315c
|
Add log4j config (this might work :p)
|
2020-07-13 20:39:52 +02:00 |
|
N0tMyFaultOG
|
c6962ef4d2
|
Shift a few more messages to debug
|
2020-07-13 19:56:34 +02:00 |
|
Alexander Söderberg
|
0fa5a16cd0
|
replace remaining debug calls
|
2020-07-12 21:49:05 +02:00 |
|
N0tMyFaultOG
|
ac8841447c
|
6cf2c0ad97 (r40542418)
|
2020-07-12 17:11:25 +02:00 |
|
Alexander Söderberg
|
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 |
|
Alexander Söderberg
|
5cdb3f4fd5
|
Add missing injection points
|
2020-07-12 12:25:44 +02:00 |
|
Alexander Söderberg
|
5a5c5721cc
|
fix compiler crashing
|
2020-07-12 07:38:57 +02:00 |
|
Alexander Söderberg
|
916675fb08
|
Guice progress
|
2020-07-11 17:19:19 +02:00 |
|
dordsor21
|
a2ec404014
|
Fix /plot target nearest
|
2020-07-11 13:40:22 +01:00 |
|
Alexander Söderberg
|
6f6cb4b630
|
More DI progress
|
2020-07-11 05:29:41 +02:00 |
|
Alexander Söderberg
|
c0f69f321d
|
Guice progress
|
2020-07-10 22:12:37 +02:00 |
|
Alexander Söderberg
|
55bf41d2da
|
Remove dumdum static access
|
2020-07-10 19:25:05 +02:00 |
|
Alexander Söderberg
|
7687d7705b
|
Fix merge issue
|
2020-07-10 18:38:14 +02:00 |
|
Alexander Söderberg
|
21ad9a36c8
|
Merge branch 'v6' into feature/v6/platform
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java
# Core/src/main/java/com/plotsquared/core/PlotSquared.java
# Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java
# Core/src/main/java/com/plotsquared/core/location/Location.java
|
2020-07-10 18:37:18 +02:00 |
|
Alexander Söderberg
|
d00dc658df
|
Inject EventDispatcher and PlotListener
|
2020-07-10 18:17:44 +02:00 |
|
Alexander Söderberg
|
2dab7c8dda
|
Inject PlotAreaManager
|
2020-07-10 17:32:07 +02:00 |
|
Alexander Söderberg
|
5341015cb1
|
Finalize immutable locations and add a platform world implementation
|
2020-07-10 12:21:29 +02:00 |
|
dordsor21
|
2fb76e6636
|
Split road and plot paste-on-top settings
|
2020-07-09 22:39:06 +01:00 |
|
dordsor21
|
55139eb134
|
Do not respect paste on top for road schematics.
|
2020-07-09 22:19:23 +01:00 |
|
Alexander Söderberg
|
cf1b027db9
|
Start making locations immutable
|
2020-07-09 22:28:46 +02:00 |
|
Traks
|
63c308971b
|
Update location block vector on add and subtract
|
2020-07-09 20:14:06 +02:00 |
|
Alexander Söderberg
|
89cb6450fb
|
Fix issue where PlotPlayer#getLocation returns a mutable location
|
2020-07-09 20:04:00 +02:00 |
|
Alexander Söderberg
|
6b07f38cff
|
Send teleportation cancellation message immediately on movement, rather than after the timer has finished. This fixes PS-33.
|
2020-07-09 16:45:25 +02:00 |
|
Alexander Söderberg
|
904f5485ab
|
Merge remote-tracking branch 'origin/v5' into v5
|
2020-07-09 16:38:53 +02:00 |
|
Alexander Söderberg
|
e05d817482
|
Fix plot owner placeholder. Fixes PS-62.
|
2020-07-09 16:38:46 +02:00 |
|
Hannes Greule
|
d652225f36
|
Let players teleport to their merged plots
|
2020-07-08 19:33:58 +02:00 |
|
dordsor21
|
d267d1bb98
|
Start expiry tasks
|
2020-07-08 14:35:46 +01:00 |
|
Alexander Söderberg
|
c36e311520
|
Continue cleaning up PlotSquared.java
|
2020-07-08 15:09:25 +02:00 |
|
Alexander Söderberg
|
f2191cb731
|
Save style.yml again
|
2020-07-08 13:59:31 +02:00 |
|
Alexander Söderberg
|
265c10ec1c
|
Remove commands.yml
|
2020-07-08 13:59:31 +02:00 |
|
Alexander Söderberg
|
51bd21a464
|
Merge branch 'v6' into feature/v6/platform
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java
|
2020-07-08 13:57:33 +02:00 |
|
Hannes Greule
|
57127537f7
|
Add permission check for /plot home
|
2020-07-07 20:45:52 +02:00 |
|
Hannes Greule
|
3476522c00
|
Allow /p v <alias>
|
2020-07-07 20:45:52 +02:00 |
|
Hannes Greule
|
3d087b1bbe
|
Fix tab completion and usage
|
2020-07-07 20:45:52 +02:00 |
|
Hannes Greule
|
c058614fcc
|
Split visit command into home and visit
|
2020-07-07 20:45:52 +02:00 |
|
dordsor21
|
e826836c36
|
Merge branch 'v5' into features/v5/road-respect-flags
|
2020-07-07 17:48:46 +01:00 |
|
Alexander Söderberg
|
196df855ac
|
Clean up PlotAreaManager and move a bunch of plot area related logic out of PlotSquared
|
2020-07-07 13:37:03 +02:00 |
|
Alexander Söderberg
|
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 |
|
Alexander Söderberg
|
298e65a394
|
Replace remaining references to PlotSquared#log
|
2020-07-06 17:17:46 +02:00 |
|
Alexander Söderberg
|
429f5e55c3
|
Add option to disable background caching
|
2020-07-03 13:50:12 +02:00 |
|
dordsor21
|
ad1ec42b12
|
Add new clear pipeline to hpw and make some stuff read access as required.
|
2020-07-02 14:33:22 +01:00 |
|
dordsor21
|
b71de856a8
|
allow plugins extending and replacing RegionManager to be notified of, and "accept" plot clear "requests".
.
.
.
.
.
FAWE
|
2020-07-01 21:49:53 +01:00 |
|
dordsor21
|
2910176b97
|
Add road flag container
|
2020-07-01 14:53:57 +01:00 |
|
dordsor21
|
82a887fd3b
|
Merge branch 'v5' into features/v5/road-respect-flags
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java
|
2020-07-01 14:12:16 +01:00 |
|
Hannes Greule
|
fa2ad8ab22
|
Improve plot alias command (tab complete, admin permission) fixes PS-63
|
2020-06-29 13:48:37 +02:00 |
|
MeFisto94
|
bd9bdc9e03
|
Separate the Vault Permission Handling from the Economy Handling
|
2020-06-28 14:28:11 +02:00 |
|
Hannes Greule
|
e139550949
|
Make cache expiration configurable
|
2020-06-27 23:07:20 +02:00 |
|
Carter
|
74876f9e64
|
Get biome data from correct schematic for intersections (Fixes PS-50)
|
2020-06-27 20:44:46 +01:00 |
|
dordsor21
|
02f3c3ef50
|
Fix my stupid mistake of using lamdas not creating nested classes when creating schematics. "this" doesn't work like that. Cheers Java.
|
2020-06-27 20:38:55 +01:00 |
|
MeFisto94
|
9c3d2cfb02
|
Move the caching and static accessors from EconHandler to PlotMain
|
2020-06-27 06:26:00 +02:00 |
|
Hannes Greule
|
38425a1eae
|
Update world border on Plot#claim (Fixes PS-13)
|
2020-06-26 13:49:17 +02:00 |
|
Alexander Söderberg
|
4b997d42df
|
Some slf4j progress
|
2020-06-26 11:03:42 +02:00 |
|
Alexander Söderberg
|
f64026af1a
|
Only initialise EconHandler when economy is enabled and stop accessing the static instance directly.
|
2020-06-24 15:26:06 +02:00 |
|
Alexander Söderberg
|
efab6e92f7
|
Lower tab completion cache time and fix "Invalid player" message for /plot kick
|
2020-06-24 13:44:06 +02:00 |
|
Alexander Söderberg
|
f6f26c6102
|
Fix issue where numbers were sometimes parsed as usernames when they shouldn't be. This commit also fixes an issue where "Not a valid plot ID" was sent twice.
|
2020-06-24 08:31:23 +02:00 |
|
Alexander Söderberg
|
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 |
|
Alexander Söderberg
|
f4724a3c87
|
Fix expiration flag commands
|
2020-06-23 11:45:04 +02:00 |
|
Alexander Söderberg
|
2b4e2fc793
|
Add plot debugging and make tab completable aliases configurable
|
2020-06-23 11:39:45 +02:00 |
|
Alexander Söderberg
|
2d6e6ceaeb
|
Improve documentation of BukkitMain#wrapPlayer and improve generic types
|
2020-06-22 15:45:57 +02:00 |
|
Alexander Söderberg
|
1dcf8d3995
|
Progress on the debug logging API
|
2020-06-21 15:50:49 +02:00 |
|
Hannes Greule
|
d07d32e28b
|
Generate plot blocks on correct height when removing intersection
Fixes PS-46
|
2020-06-20 00:14:04 +02:00 |
|
Hannes Greule
|
6259287dff
|
Add tab completion for /plot <deny|kick|remove>
|
2020-06-13 15:54:38 +02:00 |
|
Hannes Greule
|
a3586791b5
|
Remove unused code and use less aggressive colors
|
2020-06-11 01:01:00 +02:00 |
|
Hannes Greule
|
bb298ab660
|
Remove leftover TODO
|
2020-06-11 01:01:00 +02:00 |
|
Hannes Greule
|
8c0f581ff0
|
Add missing license headers to new files
|
2020-06-11 01:01:00 +02:00 |
|
Hannes Greule
|
033b87deb5
|
Resolve TODOs
|
2020-06-11 01:01:00 +02:00 |
|
Hannes Greule
|
e3fbb32399
|
Formatting and documentation
|
2020-06-11 01:01:00 +02:00 |
|
Hannes Greule
|
67b80bb8e8
|
Fix /plot setup back
|
2020-06-11 01:01:00 +02:00 |
|
Hannes Greule
|
ae1427b189
|
Remove usage of SetupObject
|
2020-06-11 01:01:00 +02:00 |
|
Hannes Greule
|
5165c439fc
|
Add tab completion and fix minor bugs
|
2020-06-11 01:01:00 +02:00 |
|
Hannes Greule
|
b15c48e074
|
Implement setup steps
|
2020-06-11 01:01:00 +02:00 |
|
Hannes Greule
|
c5bfde330f
|
First draft of redesigned setup processing
|
2020-06-11 01:01:00 +02:00 |
|
N0tMyFaultOG
|
f1b79a3b0d
|
Add more documentation to the settings.yml
Apparently gradle wants to update the poms so here we go
|
2020-05-27 22:20:13 +02:00 |
|
Alexander Söderberg
|
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 |
|
Alexander Söderberg
|
b9b0d89b5f
|
Replace the R-tree library with PRTree. Fix SquirrelID shading issues. Bump the version to 5.12.0
|
2020-05-25 15:13:31 +02:00 |
|
Alexander Söderberg
|
52b90b6757
|
Merge pull request #2841 from IntellectualSites/features/v5/uuid
|
2020-05-25 01:40:35 +02:00 |
|
dordsor21
|
31b71ade69
|
* :D
|
2020-05-24 23:43:15 +01:00 |
|
dordsor21
|
0021b114de
|
Revert "Slow down queue a bit because 1.13+ performance is bad"
This reverts commit bbde2f5e06.
|
2020-05-24 23:24:27 +01:00 |
|
Alexander Söderberg
|
28a7d027f6
|
Merge branch 'v5' into features/v5/uuid
|
2020-05-24 21:14:56 +02:00 |
|
Alexander Söderberg
|
e32a2e2723
|
Merge pull request #2847 from IntellectualSites/features/v5/single-area
|
2020-05-24 21:13:51 +02:00 |
|
Alexander Söderberg
|
46b68e489d
|
Tab complete /p list
|
2020-05-24 21:08:11 +02:00 |
|
Alexander Söderberg
|
2436a6a402
|
remove debug, whoops
|
2020-05-24 20:54:10 +02:00 |
|
Alexander Söderberg
|
862467c0fa
|
Tab complete /plot visit
|
2020-05-24 20:53:16 +02:00 |
|
Alexander Söderberg
|
69cfb431b1
|
Unstupidify Visit
|
2020-05-24 20:18:02 +02:00 |
|
Alexander Söderberg
|
172bd6f0f2
|
This should hopefully fix that broken merge. Maybe. Possibly. Idk.
|
2020-05-24 19:05:09 +02:00 |
|
Alexander Söderberg
|
a882555d1b
|
Merge branch 'v5' into features/v5/uuid
# Conflicts:
# Bukkit/build.gradle
# Core/src/main/java/com/plotsquared/core/PlotSquared.java
# Core/src/main/java/com/plotsquared/core/command/ListCmd.java
# Core/src/main/java/com/plotsquared/core/command/Visit.java
|
2020-05-24 19:00:21 +02:00 |
|
NotMyFault
|
0b12c4e5b2
|
Update issue link
|
2020-05-24 18:48:15 +02:00 |
|
Alexander Söderberg
|
0ac6383c2c
|
Use PlotQuery in Visit
|
2020-05-24 18:35:32 +02:00 |
|