Alexander Söderberg
020b030667
More fixes
2020-07-17 17:53:30 +02:00
Alexander Söderberg
5a3eacde0b
Replace method synchronization logic
2020-07-17 17:53:30 +02:00
Alexander Söderberg
7f412f5472
Begin work on the task system
2020-07-17 17:53:30 +02:00
Alexander Söderberg
33b6ef66d6
Delombok + import organisation
2020-07-17 17:24:45 +02:00
dordsor21
9fefe57c90
Switch to using QueueCoordinators everywhere
2020-07-17 15:41:06 +01:00
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
N0tMyFaultOG
01ff9a34c2
Merge branch 'features/v5/placeholders' into v5
2020-07-16 18:48:45 +02:00
Hannes Greule
2d9cf8b759
Get placeholders working
2020-07-16 18:04:17 +02:00
Alexander Söderberg
32b28a4ca5
Turn all UUID messages into debug messages
2020-07-15 22:42:58 +02:00
NotMyFault
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
Alexander Söderberg
5d2d4ac12b
fix language issue
2020-07-14 20:47:15 +02:00
Alexander Söderberg
64f5580edd
Fix code styling issue
2020-07-14 20:46:52 +02:00
dordsor21
2e4c43c251
Add config option to disable placing top wall blocks
2020-07-14 19:10:53 +01:00
Alexander Söderberg
c0a0d36e5d
Remove remaining jetbrains imports
2020-07-14 19:40:47 +02:00
Alexander Söderberg
b68d7150f1
Manually fix some merge conflicts
2020-07-14 19:34:44 +02:00
Alexander Söderberg
198bcfdf4d
Merge branch 'v6' into feature/v6/json
...
# Conflicts:
# Bukkit/build.gradle
# Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
# Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java
# Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
# Core/build.gradle
# 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/command/Add.java
# Core/src/main/java/com/plotsquared/core/command/Area.java
# Core/src/main/java/com/plotsquared/core/command/Auto.java
# Core/src/main/java/com/plotsquared/core/command/Command.java
# Core/src/main/java/com/plotsquared/core/command/ListCmd.java
# Core/src/main/java/com/plotsquared/core/configuration/Caption.java
# Core/src/main/java/com/plotsquared/core/listener/PlotListener.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/message/PlotMessage.java
# Core/src/main/java/com/plotsquared/core/setup/CommonSetupSteps.java
# Core/src/main/java/com/plotsquared/core/util/MainUtil.java
# Core/src/main/java/com/plotsquared/core/util/WorldUtil.java
2020-07-14 19:25:14 +02: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
55eefd09da
Merge branch 'v6' into feature/v6/json
2020-07-14 16:52:40 +02:00
Alexander Söderberg
0ce1f3e0f6
Send special message when caption cannot be found
2020-07-14 16:36:13 +02:00
Alexander Söderberg
99be181aea
Migrate some more captions
2020-07-14 16:31:58 +02:00
Alexander Söderberg
fbf6a3517d
Add back title method that somehow went missing and add a template utility class to make templates less annoying to work with
2020-07-14 15:04:31 +02:00
Alexander Söderberg
1dc4da8beb
Fix issues from previous merge
2020-07-14 13:21:59 +02:00
Alexander Söderberg
af7db08036
Add new placeholder system
2020-07-14 13:14:02 +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
N0tMyFaultOG
f93714a44e
Properly add prefixes to messages
2020-07-13 13:01:13 +02:00
Hannes Greule
564efd77f7
Fix some messages
2020-07-12 22:11:23 +02:00
Hannes Greule
5442c7cc2e
Start moving commands to new message system
2020-07-12 22:06:07 +02:00
Alexander Söderberg
0fa5a16cd0
replace remaining debug calls
2020-07-12 21:49:05 +02:00
N0tMyFaultOG
1881cdc9ab
Revert "Add prefix"
...
This reverts commit fb2aa44f78
.
2020-07-12 21:28:38 +02:00
N0tMyFaultOG
fb2aa44f78
Add prefix
2020-07-12 21:25:22 +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
dordsor21
c045ef698c
Add license headers and fix method change in PlotSquared.java
2020-07-12 11:42:45 +01: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
dordsor21
3a11ffc77a
Clean up bukkit listeners by splitting them up
2020-07-11 19:03:55 +01: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
Alexander Söderberg
db37077af7
Make signs able to use captions
2020-07-09 12:58:28 +02:00
Hannes Greule
d652225f36
Let players teleport to their merged plots
2020-07-08 19:33:58 +02:00
Alexander Söderberg
3fa532a3c0
Move message sending into PlotPlayer to make it platform independent
2020-07-08 15:35:58 +02:00
dordsor21
d267d1bb98
Start expiry tasks
2020-07-08 14:35:46 +01:00
Alexander Söderberg
9792d4cc4b
Remove style.yml
2020-07-08 15:23:33 +02:00
Alexander Söderberg
090bd69be5
Merge branch 'v6' into feature/v6/json
...
# Conflicts:
# Bukkit/src/main/java/com/plotsquared/bukkit/chat/FancyMessage.java
2020-07-08 15:22:02 +02: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
078b776f60
Implement console messages
2020-07-05 18:14:29 +02:00
Alexander Söderberg
4d61a345c6
Small documentation fixes
2020-07-05 18:06:10 +02:00
Alexander Söderberg
42d648e338
Use adventure for titles
2020-07-05 17:57:58 +02:00
Alexander Söderberg
f287cc34e7
Remove json message stuff
2020-07-05 13:46:25 +02:00
Alexander Söderberg
c8a8806e7d
Component progress. The plugin is **very** broken right now.
2020-07-05 13:41:40 +02:00
Alexander Söderberg
d061f728bd
Merge remote-tracking branch 'origin/feature/v5/json' into feature/v5/json
2020-07-05 12:44:25 +02:00
Hannes Greule
6bf5bc60d1
Update messages_en.json with new placeholders
2020-07-04 18:57:56 +02:00
Alexander Söderberg
c784c69eb3
progress
2020-07-04 18:53:03 +02:00
Alexander Söderberg
e3759d059a
Fixing missing license headers.
2020-07-04 18:03:47 +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
Hannes Greule
35cff29917
Add license header
2020-07-01 17:24:47 +02: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
f80cadcd7f
Draft of Caption resolving
2020-06-29 21:33:57 +02:00
Hannes Greule
fa2ad8ab22
Improve plot alias command (tab complete, admin permission) fixes PS-63
2020-06-29 13:48:37 +02:00
N0tMyFaultOG
600f757046
Finish messages
2020-06-29 12:34:09 +02:00
N0tMyFaultOG
a2aaa3633a
More work
2020-06-28 16:56:42 +02:00
MeFisto94
bd9bdc9e03
Separate the Vault Permission Handling from the Economy Handling
2020-06-28 14:28:11 +02:00
N0tMyFaultOG
3b793929d8
Initialize messages_en.json
2020-06-28 13:51:57 +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
Alexander Söderberg
76913d4a78
immutable -> mutable
2020-05-24 18:35:32 +02:00
Alexander Söderberg
a0d1da3274
fix dum typo
2020-05-24 18:35:32 +02:00
Alexander Söderberg
1aa144e47d
Deprecate old PlotFilter class
2020-05-24 18:35:32 +02:00
Alexander Söderberg
6b31743fb3
add missing javadoc
2020-05-24 18:35:32 +02:00
Alexander Söderberg
508fdce704
Add missing methods to PlotQuery and use PlotQuery in ListCmd
2020-05-24 18:35:32 +02:00
Alexander Söderberg
e912909aad
Add plot query system
2020-05-24 18:35:32 +02:00
Alexander Söderberg
7b97130af7
Add option to disable legacy cache, also add an option to return "Unknown" when a request cannot be fulfilled (old behaviour)
...
This should fix issues where lowercase offline mode UUIDs don't have access to their old cache.
2020-05-24 05:00:36 +02:00
Alexander Söderberg
6c6c2b57a1
Add options to disable tab completion and extend username completion, also limit the total number of username suggestions to 200 per request
2020-05-23 17:20:09 +02:00
Alexander Söderberg
113da81f29
Actually save the schematic
2020-05-23 16:15:48 +02:00
Alexander Söderberg
4dd2613f2f
Add missing caption
2020-05-23 15:02:53 +02:00
Alexander Söderberg
8c37cc5340
Fix minor issues
2020-05-23 15:02:31 +02:00
Alexander Söderberg
47c74cfa6d
Set correct region height
2020-05-23 14:39:28 +02:00
Alexander Söderberg
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
Alexander Söderberg
6d0458281b
Merge remote-tracking branch 'origin/v5' into features/v5/single-area
2020-05-23 02:30:45 +02:00
Alexander Söderberg
d2af342a5d
Shade r-tree into the bukkit module
2020-05-22 22:04:46 +02:00
Alexander Söderberg
93619b3988
Don't access tree until it has been created
2020-05-22 22:04:46 +02:00
Alexander Söderberg
dd4c5014fc
Get rid of unused field
2020-05-22 22:04:46 +02:00
Alexander Söderberg
1e3379b00a
Fix up the plot area nightmare
2020-05-22 22:04:46 +02:00
dordsor21
bbde2f5e06
Slow down queue a bit because 1.13+ performance is bad
2020-05-22 10:44:51 +01:00
Alexander Söderberg
b61dfd6f97
Single plot area progress
2020-05-22 03:20:11 +02:00
Alexander Söderberg
9752e5f62b
Start working on single plot areas
2020-05-22 02:48:32 +02:00
Alexander Söderberg
38a7c771be
Don't access tree until it has been created
2020-05-21 20:23:36 +02:00
Alexander Söderberg
1c6075df2b
Get rid of unused field
2020-05-21 20:06:37 +02:00
Alexander Söderberg
3ede0447b0
Fix up the plot area nightmare
2020-05-21 20:06:04 +02:00
Alexander Söderberg
f01b242e4a
For sign updating to be scheduled asynchronously.
...
It then forces it back on the main thread, so it's fine, but this way we can safely wait for the UUID mapping to be fetched.
2020-05-20 15:26:20 +02:00
Alexander Söderberg
2417dace2d
Add UUID caching
2020-05-20 15:12:09 +02:00
Alexander Söderberg
f82a111518
Merge branch 'v5' into features/v5/uuid
...
# Conflicts:
# Bukkit/pom.xml
# Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java
2020-05-20 11:27:11 +02:00
dordsor21
0160c2bb55
Add setCuboids method to RegionManager
...
- Allow FAWE to take charge of big operations like /plot set all
2020-05-20 08:43:58 +01:00
Alexander Söderberg
ea41c842bc
Fix a bunch of minor issues
2020-05-20 00:31:59 +02:00
Alexander Söderberg
8efc78e1c9
IT COMPILES!
2020-05-19 23:05:36 +02:00
Alexander Söderberg
973c18623f
Port more commands and add more tab completion utilities
2020-05-19 19:34:33 +02:00
dordsor21
7aba70ea65
Make plot clears/sets less crashy.
...
There's still the issue of Spigot's (or paper's) terrible GC that does nothing and stores everything in PS old gen memory so the server just numpties itself though.
2020-05-19 16:54:12 +01:00
Alexander Söderberg
123ca8efe9
Update more commands and add proper request timeouts
2020-05-19 17:33:59 +02:00
dordsor21
22c26fe962
Add PlotArea#getFlag
2020-05-19 13:07:50 +01:00
dordsor21
761803f777
Add option for roads to respect a plot area's flags and implement to PlayerEvents
2020-05-19 12:41:51 +01:00
dordsor21
d5d18a60fb
Fix #2836
...
getCompoundTag can also be in Core since we're using WorldEdit.
2020-05-19 11:53:18 +01:00
Alexander Söderberg
37b065a097
Progress.
2020-05-19 00:28:52 +02:00
Alexander Söderberg
31c84ab18f
Basic pipeline setup
2020-05-18 00:22:34 +02:00
Alexander Söderberg
12f2cb0d58
Add a cache uuid service
2020-05-17 23:57:40 +02:00
Alexander Söderberg
b5f92f5003
Add sync catcher to the blocking pipeline methods
2020-05-17 23:26:19 +02:00
Alexander Söderberg
58989c9311
Add some missing methods to the pipeline
2020-05-17 23:20:36 +02:00
Alexander Söderberg
736004d88b
Don't fill in stacktrace for ServiceError
2020-05-17 18:03:04 +02:00
Alexander Söderberg
49f51f24f7
Don't loop services when all mappings have been found
2020-05-17 18:02:26 +02:00
Alexander Söderberg
95df62e59b
Add missing consumer API methods
2020-05-17 17:48:42 +02:00
Alexander Söderberg
29f2863cf4
Progress
2020-05-17 17:26:48 +02:00
Alexander Söderberg
792fa1f11d
Improve design
2020-05-17 12:55:07 +02:00
Alexander Söderberg
7591c440c2
Begin working on the new UUID service API
2020-05-17 12:40:25 +02:00
Alexander Söderberg
29e0479081
Fix preset initialization
2020-05-16 21:37:14 +02:00
Alexander Söderberg
441a73839e
Add /plot components
2020-05-16 21:37:14 +02:00
Alexander Söderberg
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
Alexander Söderberg
3d30885daf
No PlotSquared-Core-Core
2020-05-14 15:47:25 +02:00
Alexander Söderberg
6814b4bef2
Fix Core archive name
2020-05-14 15:24:43 +02:00
Alexander Söderberg
501fd9c8e6
Merge remote-tracking branch 'origin/v5' into v5
2020-05-14 14:16:17 +02:00
Alexander Söderberg
7ba7df5cb2
Make the upload task work
2020-05-14 14:16:10 +02:00
dordsor21
9dd9201b67
Allow plot auto from non-plot areas if the server has only one plot area
2020-05-14 13:10:53 +01:00
Alexander Söderberg
1fa41e6209
Merge branch 'v5' into tile-entity-cap
2020-05-14 13:17:41 +02:00
dordsor21
a2db2e8268
Add return
2020-05-14 11:27:35 +01:00
dordsor21
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
dordsor21
98b4ceab7d
Fix style.yml
2020-05-13 16:29:10 +01:00
Alexander Söderberg
86a996b2ff
Make the tile entity check true by default, as it only applies when the chunk processor is enabled (and it's disabled by default)
2020-05-13 15:09:00 +02:00
Alexander Söderberg
e6a9daf31a
Make the tile entity limit in ProcessedWEExtent apply per chunk rather than per edit
2020-05-13 14:54:54 +02:00
Alexander Söderberg
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
Alexander Söderberg
19fe2efb6e
Fix the WE extent and add our own tile entity list
2020-05-13 14:11:17 +02:00
Alexander Söderberg
e6878d7804
clean up ProcessedWEExtent
2020-05-13 12:47:52 +02:00
Alexander Söderberg
3deff629b0
Add paper specific listener for limiting the amount of tile entities in a chunk during build, instead of just doing it during chunk unloading
2020-05-12 23:01:14 +02:00
Alexander Söderberg
d20fa39cf5
Add flag that prevents people from copying NBT data in the plot unless they're added as members
2020-05-12 19:25:06 +02:00
Aurélien
be6910d5d9
Reformated and update French translation
...
Some of my translations used '' to represent ' but it's not needed. Also splited some long lines and translated new backup system and keep-inventory flag.
2020-05-12 17:29:32 +02:00
Alexander Söderberg
4ad90d423d
Fix timeout comment
2020-05-12 12:52:45 +02:00
Alexander Söderberg
d2dae45082
Add leaves to the blacklist
2020-05-12 12:49:39 +02:00
Alexander Söderberg
85c9bd7ceb
Add all sign type to blacklist
2020-05-12 12:24:36 +02:00
dordsor21
d0ee579069
Move backup config section to a more appropriate place
2020-05-12 10:44:34 +01:00
Alexander Söderberg
32c23e6ced
Merge branch 'v5' into backups
2020-05-11 22:27:16 +02:00
Alexander Söderberg
81aaba328a
ENGLISH > ROOT
2020-05-11 22:21:37 +02:00
Alexander Söderberg
3c5dd3d0d2
Merge remote-tracking branch 'origin/v5' into v5
2020-05-11 22:11:29 +02:00
Alexander Söderberg
2dc07d9321
Add a looooot of default disallowed blocks
2020-05-11 22:11:21 +02:00
N0tMyFaultOG
841dd5e189
Update wiki links
2020-05-11 20:27:06 +02:00
Alexander Söderberg
b2bc2887d2
Fix dumdum merge
2020-05-11 20:17:41 +02:00
Alexander Söderberg
e20319f4e1
Merge branch 'v5' into backups
...
# Conflicts:
# Core/src/main/java/com/plotsquared/core/configuration/Captions.java
2020-05-11 20:15:48 +02:00
Alexander Söderberg
d40160d205
Fix javadoc
2020-05-11 20:04:22 +02:00
Alexander Söderberg
f7167d5e83
Fix typo
2020-05-11 20:03:26 +02:00
Alexander Söderberg
282773a43f
Replace Guava methods with stdlib equivalents
2020-05-11 20:02:33 +02:00
Alexander Söderberg
8944be5319
(Complex) command suggestions for /plot set
2020-05-11 19:37:25 +02:00
Alexander Söderberg
df01f9bea7
Add a list of blocks that cannot be used in /plot set <component>
2020-05-11 18:35:06 +02:00
Alexander Söderberg
7a6909dab1
Merge branch 'v5' into backups
2020-05-11 11:19:59 +02:00
Alexander Söderberg
3064ae80d1
Add a keep-inventory flag
2020-05-11 11:19:36 +02:00
dordsor21
06bb6856a8
Fix bad getApplicablePlotArea(Location) code
...
- Fixes #2815 alongside 667098268f
2020-05-11 09:48:18 +01:00
Alexander Söderberg
702caa6feb
Remove rogue line break
2020-05-10 22:09:56 +02:00
Alexander Söderberg
fc74c582bf
Add option to disable deletion of plot backups when the plot is unclaimed
2020-05-10 21:52:57 +02:00
Alexander Söderberg
658361f825
Destroy backups when the plot is uncalimed
2020-05-10 21:31:16 +02:00
Alexander Söderberg
e0c9a802d8
Add automatic backups and implement them /plot clear
and /plot set <component>
.
2020-05-10 20:31:07 +02:00
Alexander Söderberg
c4a70c0945
Fix tab completion for the backup command
2020-05-10 19:42:42 +02:00
Alexander Söderberg
f7d6ac00e4
Make the backup commands work
2020-05-10 19:20:11 +02:00
Alexander Söderberg
8ed5a21b36
Merge branch 'v5' into backups
2020-05-10 17:03:36 +02:00
Alexander Söderberg
6fb63c9609
Implement backup restoration command. This might work, idk, we'll see.
2020-05-10 16:53:19 +02:00
Alexander Söderberg
079289eb74
Use #getTranslated on GENERIC_UNOWNED
2020-05-10 16:40:12 +02:00
Alexander Söderberg
59f96d4455
Translate all backup failure reasons
2020-05-10 16:39:14 +02:00
Alexander Söderberg
cdab52fcbe
dumdum space go bye bye
2020-05-10 16:04:33 +02:00
Alexander Söderberg
63c9037b10
Fix typo
2020-05-10 16:00:20 +02:00
Alexander Söderberg
bbc86eba39
/plot debug
progress
2020-05-10 15:51:27 +02:00
Alexander Söderberg
e0fb6f5440
/plot debug
structure
2020-05-10 15:36:20 +02:00
Alexander Söderberg
2bd30af361
Cache both backup profiles and backup objects
2020-05-10 15:12:17 +02:00
NotMyFault
b136f44f12
Merge branch 'v5' into remove-eol-translation-strings
2020-05-10 15:05:58 +02:00
Alexander Söderberg
d0dbb495b0
Add BackupProfile#restoreBackup
2020-05-10 14:58:45 +02:00
Alexander Söderberg
8715a27a93
No backups for merged plots 🐮
2020-05-10 14:41:02 +02:00
Aurélien
503fc44208
Updated according to new translations and old removed
2020-05-10 14:12:56 +02:00
Aurélien
d3bfaeb5a4
Ready for merging !
...
Removed useless space at the end of the file + precision of the date (latest edition)
2020-05-10 14:12:56 +02:00
Aurélien
7adecd0808
Last fix (removed unused translation + added the missing)
2020-05-10 14:12:56 +02:00
Aurélien
c99e081ae0
Fiexed issues reported by CodeFactor
2020-05-10 14:12:56 +02:00
Aurélien
285b6bf62d
Updated and corrected French translation
...
Old translation has been reviewed and new v5 flags' translations has been added.
Some mistakes could now remain, I will fix them if needed ;)
Enjoy !
2020-05-10 14:12:56 +02:00
Alexander Söderberg
723e29cdd0
Continue working on the backup system
2020-05-10 14:02:25 +02:00
dordsor21
e6408b35a2
fix merge auto
2020-05-10 10:44:14 +01:00
Alexander Söderberg
3eb0de68c4
Begin working on the structure for the backup system
2020-05-09 20:05:39 +02:00
N0tMyFaultOG
ae11f0610e
Add a few more translation strings for setup wizard
2020-05-09 16:45:32 +02:00
N0tMyFaultOG
198c7ca58d
Remove dead translations
2020-05-09 14:04:08 +02:00
Hannes Greule
5a2f70238a
Typo
2020-05-06 12:53:27 +01:00
Hannes Greule
8257b0b563
No lazy init when calling toString,equals or hashCode
...
That prevents premature initialization as NullBlockCategory
2020-05-06 12:53:27 +01:00
Hannes Greule
9b997d2195
Make constructor private
2020-05-06 12:53:27 +01:00
Hannes Greule
a19fa1b92c
Send a debug message if category not found
2020-05-06 12:53:27 +01:00
Hannes Greule
2c060db9c0
Lazily initialize block tags
2020-05-06 12:53:27 +01:00
dordsor21
a8621a15ad
Override setblock setting Pattern in ChunkBlockQueue
...
> Should stop NPE during plot analysis
> Without overriding this method, DelegateLocalBlockQueue setblock Pattern is called
> DelegateLocalBlockQueue's setblocks use parent.setBlock, but we set that to null in ChunkBlockQueue
> ChunkBlockQueue is simply just to cache the values from generation to use in analysis
> Therefore there is no need to setblocks in any other Queue implementation
2020-05-06 12:53:16 +01:00
dordsor21
179e9e1e74
Clean up plot grants and plot auto
...
- Correct maths for calculating granted plots, etc etc
- Don't check if the player has the correct number of plots AGAIN on AutoClaimFinishTask. That's dumb.
2020-05-06 11:39:34 +01:00
dordsor21
df5feff9ec
Display the correct number of grants used in auto
2020-05-05 13:50:29 +01:00
dordsor21
9226aaff1f
In the interest of debug should show everything, add debug when registering an unknown flag.
2020-05-05 12:57:14 +01:00
dordsor21
afe874a59b
try-catch for NPE in purge and fail gracefully if the world is null
...
Plausible scenario since purge is often run to remove plots in the DB from removed worlds
Shouls fix #2806
2020-05-05 11:12:39 +01:00
N0tMyFaultOG
4ad9f12d5d
Move plot version to debugpaste top
2020-05-04 23:58:01 +02:00
dordsor21
228c37815a
Fix merge all
...
Fixes #2804
2020-05-04 17:15:53 +01:00
dordsor21
729469e030
Add config options for all paper events.
2020-05-02 11:58:32 +01:00
dordsor21
c6dc9ee189
Add some more listeners
...
- Also use setShouldAbortSpawn so it doesn't just try forever
- Add config to enable or disable all paper listeners
2020-05-02 11:58:32 +01:00
dordsor21
85a75ad868
Yeet that PaperSPiGoT out of here
2020-05-02 11:58:32 +01:00
dordsor21
8ec8b8d803
Add some paper-specific listeners
2020-05-02 11:58:32 +01:00
dordsor21
ed2e9a80ed
Fix rare bug where if the plot size was less than 15 and the chunk contained an entire plot, it would generate incorrectly
2020-05-01 20:30:59 +01:00
dordsor21
36948ed351
Move world settings dump to a better location (where all of the fields will actually have been set)
2020-05-01 20:29:35 +01:00
dordsor21
e06429f3b0
Correct world types given to player
2020-05-01 19:18:11 +01:00
MattBDev
fd4a9a16de
Execute commands when clicked for expire messages
2020-05-01 13:34:43 -04:00
dordsor21
d6d49e0912
Show suffix in versionString() too
2020-05-01 15:56:35 +01:00
dordsor21
b5de5f30ac
Allow suffixes to the version
...
- Useful for "PlotSquared-5.10.4-SNAPSHOT" etc
2020-05-01 15:53:40 +01:00
Alexander Söderberg
135c6f2c15
Send a less obnoxious message if the flag name length exceeds the maximum allowed length
2020-04-30 13:36:03 +02:00
dordsor21
a263fe2f2d
Apparently we need to recover from bad flags
2020-04-30 12:15:42 +01:00
dordsor21
cbe46539ca
Pick up the rest of the reformating
2020-04-30 11:53:07 +01:00
dordsor21
5e842f1572
Force flag names to be 64 characters or less
...
- A few people seem to be on interesting SQL installs. This should fix the issues they have with 767 bytes,
2020-04-30 11:52:39 +01:00
dordsor21
42106bb97a
I didn't get everything first time
2020-04-30 11:33:59 +01:00
dordsor21
e7216d4aef
Merge branch 'v5' into reformat
2020-04-30 11:33:31 +01:00
dordsor21
0751e9cea3
Make LiquidFlowFlag an enum
2020-04-30 11:18:28 +01:00
dordsor21
0091580ae0
Reformat it all.
2020-04-30 11:01:52 +01:00
N0tMyFaultOG
894d673c90
Fix tests
2020-04-30 11:32:50 +02:00
dordsor21
577fe3037f
Update checker improvements and 5.10.4
...
- Add config option to disable poll once it's found an update (true by default)
- Better PlotVersion stuff can now detect if you're using a later version than the spigot API, and not tell you about it
2020-04-30 10:17:19 +01:00
dordsor21
8a21334e66
Merge branch 'v5' of https://github.com/IntellectualSites/PlotSquared into v5
2020-04-28 11:21:51 +01:00
dordsor21
a130d801d5
schem.intellectualsites.com (just forwards to athion.net but cnamed)
2020-04-28 11:21:30 +01:00
N0tMyFaultOG
a829799b36
Update scripting message
2020-04-25 23:53:46 +02:00
Hannes Greule
5bd53436df
Prevent NPE for report comments
2020-04-23 13:44:34 +01:00
dordsor21
9081a5aff6
Fix incorrectly formatted biomes in worlds.yml automagically
2020-04-22 08:22:14 +01:00
N0tMyFaultOG
c8d8fb6aff
Reformat premium information
2020-04-21 23:38:56 +02:00
N0tMyFaultOG
6da4994955
Enhance premium verification
2020-04-21 23:06:11 +02:00
N0tMyFaultOG
4780fcd534
Fixes #2782
...
Thanks for the contribution :)
2020-04-21 15:53:38 +02:00
dordsor21
ffee7a518e
update default biome to match format WorldEdit accepts.
2020-04-21 09:16:02 +01:00
Cheezybo99
f1d10c96bc
Added PERMISSIONS_ADMIN_CHAT_BYPASS enum for the permission plots.admin.chat.bypass allowing users to bypass the plot chat security feature.
2020-04-20 18:55:28 +02:00
Alexander Söderberg
3c8b22688a
I'm dumb.
2020-04-19 21:24:45 +02:00
Alexander Söderberg
cdd1fad85c
Fix github link in debugpaste
2020-04-19 21:22:45 +02:00
Alexander Söderberg
bf5862942a
Disable prefixes for flag info headers and footers and suppress NPE in the update utility
2020-04-18 22:26:13 +02:00
Alexander Söderberg
cbea595fa0
Don't relocate json-simple.
2020-04-18 21:14:44 +02:00
dordsor21
952ea0b090
Fix setowner none (unclaim)
2020-04-18 17:59:45 +01:00
dordsor21
af951ac11c
Update upload to debug the content if incorrect properly.
2020-04-18 17:53:45 +01:00
dordsor21
165614efe9
make sure never to have unclaim be an alias of delete. Even if it doesn't work.
2020-04-18 17:44:01 +01:00
dordsor21
95335df84d
Merge branch 'v5' of https://github.com/IntellectualSites/PlotSquared into v5
2020-04-18 17:22:58 +01:00
dordsor21
100861484a
Fix plot claim.
2020-04-18 17:22:51 +01:00
Alexander Söderberg
c206de263b
Merge remote-tracking branch 'origin/v5' into v5
2020-04-18 02:28:29 +02:00
Alexander Söderberg
0c12972c03
Register misc-flags.
2020-04-18 02:28:11 +02:00
N0tMyFaultOG
546c4defb7
Add SirYwell to authors list
...
Thanks for all your hard work regarding v5 ❤️
2020-04-16 23:49:08 +02:00
N0tMyFaultOG
814fca3832
Update flag description
2020-04-16 19:15:40 +02:00
dordsor21
3ee29297e0
Add option to force plot chat in plot areas.
2020-04-16 16:55:14 +01:00
dordsor21
6d9d0fff10
Add description caption for chat flag
2020-04-16 12:49:00 +01:00
dordsor21
714b8dad87
Implement IntellectualSites/PlotSquaredSuggestions/96
...
Also make Plot Chat work properly. Not sure what was going on there before...
2020-04-16 11:54:32 +01:00
dordsor21
a44807d47b
Don't dump biome array on /ps reload. Gradle also seems to want to change the Core pom.
2020-04-16 11:43:13 +01:00
Alexander Söderberg
4aac3bf7e4
Merge pull request #2757 from IntellectualSites/api/v5/packages
...
Package Restructure
2020-04-16 10:58:13 +02:00
Alexander Söderberg
ee2ed8222d
Merge config packages
2020-04-16 06:14:33 +02:00
Alexander Söderberg
edaf396894
Merge features/v5/internal-updates into api/v5/packages
2020-04-16 06:11:03 +02:00
Alexander Söderberg
6f052f0001
Remove extra line from HEADER
2020-04-16 05:05:58 +02:00
Alexander Söderberg
ba40a56c32
Add GPLv3 License headers to all source files.
2020-04-16 04:52:39 +02:00
MattBDev
780be3776a
Addressed some comments
2020-04-15 15:26:54 -04:00
dependabot-preview[bot]
f5a9abfc8d
Bump kotlin-stdlib from 1.3.61 to 1.3.72
...
Bumps [kotlin-stdlib](https://github.com/JetBrains/kotlin ) from 1.3.61 to 1.3.72.
- [Release notes](https://github.com/JetBrains/kotlin/releases )
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md )
- [Commits](https://github.com/JetBrains/kotlin/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-14 18:25:00 +00:00
dependabot-preview[bot]
c812bb1295
Bump annotations from 18.0.0 to 19.0.0
...
Bumps [annotations](https://github.com/JetBrains/java-annotations ) from 18.0.0 to 19.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases )
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md )
- [Commits](https://github.com/JetBrains/java-annotations/compare/18.0.0...19.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-14 17:50:27 +00:00
Alexander Söderberg
79bd69e599
Make the entity counting code use the new entity categories, remove usage of magic numbers and add /plot caps
2020-04-12 19:30:50 +02:00
Alexander Söderberg
658f2a3fc3
Finalize entity type categorisation
2020-04-12 01:23:13 +02:00
Hannes Greule
6e536f81ac
Add more entity categories
2020-04-12 00:57:50 +02:00
Alexander Söderberg
dd9450d36a
Add entity category loading code to WorldUtil (implemented in BukkitUtil)
2020-04-11 22:26:31 +02:00
Alexander Söderberg
e6c76ad3f3
Entity categories implementation
2020-04-11 21:49:08 +02:00
Hannes Greule
6f2b31f4a3
Add missing default flag values to GlobalFlagContainer ( fixes #2748 )
2020-04-11 18:49:04 +02:00
Alexander Söderberg
c5590440d6
Merge remote-tracking branch 'origin/features/v5/internal-updates' into features/v5/internal-updates
2020-04-11 17:58:27 +02:00
Alexander Söderberg
7931390ae4
Fix json relocation issue. Make plot areas dump their default flags and add progress output for flag conversion.
2020-04-11 17:58:08 +02:00
Alexander Söderberg
546b857b9d
Fail default flag parsing gracefully
2020-04-11 17:19:43 +02:00
Alexander Söderberg
ce10d54a9c
Don't use legacy IDs to get block types in the hybrid plot manager
2020-04-11 13:28:58 +02:00
Alexander Söderberg
965bbb9f3b
Extract block queues from AugmentedUtils
2020-04-11 13:23:57 +02:00
Alexander Söderberg
e88b331155
Clean up AugmentedUtils and make the code readable by humans
2020-04-11 12:08:46 +02:00
Alexander Söderberg
ce177c3c46
Clean up HybridGen and make the code readable by humans
...
Previously it was only readable by androids, and Jesse.
2020-04-11 12:00:42 +02:00
Alexander Söderberg
5a6dbfda36
Fix javadoc generation issues
2020-04-11 03:23:48 +02:00
Alexander Söderberg
9c3c42c3e6
Rename published maven artifacts
...
# Conflicts:
# Bukkit/build.gradle
# Core/build.gradle
2020-04-11 02:54:34 +02:00
Alexander Söderberg
5fc33dcc06
Rename published maven artifacts
2020-04-11 02:39:02 +02:00
Alexander Söderberg
c196ced0e2
Move org.json into core
2020-04-11 02:28:15 +02:00
MattBDev
dfa977a020
Moved more packaged based on feedback
2020-04-10 20:19:18 -04:00
MattBDev
5be2dfa747
Package Changes
2020-04-10 19:26:07 -04:00
Alexander Söderberg
f9ea99fa1d
Merge pull request #2754 from IntellectualSites/features/v5/owners
...
Remove all direct access to Plot.owner
2020-04-10 19:52:41 +02:00
Alexander Söderberg
79583c011f
Replace getOwnerAbs() == null
with !hasOwner()
2020-04-10 19:28:10 +02:00
Alexander Söderberg
172bcc7677
Revert "Replace getOwnerAbs() == null
with hasOwner()
"
...
This reverts commit 79620042
2020-04-10 19:22:12 +02:00
Alexander Söderberg
c2060ea1a7
Remove deprecation of getOwner()
2020-04-10 19:11:53 +02:00
Alexander Söderberg
7962004215
Replace getOwnerAbs() == null
with hasOwner()
2020-04-10 19:10:43 +02:00
Alexander Söderberg
45476f2867
I missed AbstractDB somehow...
2020-04-10 18:15:35 +02:00
Alexander Söderberg
280ced7904
Add GPLv3 License headers to all source files.
...
Reason: " How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found."
2020-04-10 18:09:01 +02:00
Alexander Söderberg
474795367e
Reformat Plot after the owner changes. It was a bit too messy.
2020-04-10 14:07:52 +02:00
Alexander Söderberg
ce756411cf
Remove all direct access to Plot.owner
...
New methods were added for access to the absolute owner of a plot, and the documentation of the owner getters to clarify the purpose of the methods.
2020-04-10 14:05:01 +02:00
Alexander Söderberg
dada7dbb86
Use relocated org.json instead of including the source files
2020-04-09 17:41:55 +02:00
Alexander Söderberg
cb05d34d20
Fixes #2751
2020-04-09 17:07:14 +02:00
Alexander Söderberg
86149224d1
Don't set walls, wall filling or outline in plots using full vanilla terrain generation
2020-04-09 13:06:45 +02:00
Alexander Söderberg
f717589074
Fix typo in MainUtil and switch out Consumer<Integer> to IntConsumer
2020-04-09 11:23:39 +02:00
Alexander Söderberg
271109a726
Fix dumdum async getLoadedChunks call, but only because Aikar broke everything.
2020-04-08 21:49:41 +02:00
Alexander Söderberg
865d11e844
Register vehicle-place and make it disabled by default
2020-04-08 17:28:16 +02:00
Alexander Söderberg
bc45b8b695
Merge branch 'features/v5/internal-updates' into features/v5/async-load
2020-04-08 17:17:17 +02:00
Alexander Söderberg
f6332d2cd9
Add tab completions to flyflag
2020-04-08 16:53:39 +02:00
Alexander Söderberg
4ca7a81e96
Fix untrusted-visit.
2020-04-08 16:52:10 +02:00
Alexander Söderberg
ae2867136a
Make the fly flag an enum flag instead. It now accepts: true
, false
and default
, where default
is the default value, and does not change the flight status at all.
2020-04-08 16:39:19 +02:00
Alexander Söderberg
ef04ed9151
Fix augmented generation
2020-04-08 04:10:22 +02:00
Alexander Söderberg
be6bcafccc
Make sure augmented generation doesn't crash the server
2020-04-08 01:23:22 +02:00
Alexander Söderberg
5d332e7d58
Fix plot clearing in normal plot worlds
2020-04-08 00:01:58 +02:00
Alexander Söderberg
283ff945f3
Fix /plot auto
performance and remove sign-guessing
2020-04-07 23:39:56 +02:00
Alexander Söderberg
0d4af3023d
Extract TaskManager lambdas for better debugging
2020-04-07 23:18:36 +02:00
Alexander Söderberg
7fdb7961ce
Merge branch 'features/v5/internal-updates' into features/v5/async-load
2020-04-07 22:13:42 +02:00
Alexander Söderberg
e161209a46
Fix plot claiming
2020-04-07 22:12:52 +02:00
Alexander Söderberg
5547185b3f
Prevent synchronous chunk loading whenever possible
2020-04-07 20:19:39 +02:00
dordsor21
7841ee3dcc
Fix a few encapsulate merge issues
2020-04-02 13:40:11 +01:00
Hannes Greule
099a680c85
Encapsulation and Magic Values ( #2711 )
...
* Encapsulate attributes of PlotArea using lombok Getters/Setters
* Limit access to collections, don't expose implementation details
* Better naming for some boolean attributes
* Replace magic type value with PlotAreaType enum
* Replace magic terrain value with PlotAreaTerrainType enum
* Fix remaining rebase conflicts
* Reduce code duplication
Co-authored-by: Alexander Söderberg <Sauilitired@users.noreply.github.com>
2020-04-02 13:34:38 +01:00
dordsor21
9764d4d226
Actually add biomes to road schematics
2020-03-28 10:43:24 +00:00
NotMyFault
37336fffe2
Merge branch 'features/v5/internal-updates' of https://github.com/IntellectualSites/PlotSquared into features/v5/internal-updates
2020-03-28 02:26:25 +01:00
dordsor21
2994b2c158
Use try with resource to close ClipboardReader and stop adding "atic" to schematic files or not reason
2020-03-26 20:55:27 +00:00
NotMyFault
3a3a06631d
Add coral-dry flag
2020-03-25 21:14:58 +01:00
dordsor21
f9bf576d2e
Actually initialise the biome array in HybridPlotWorlds.
...
Fixes generation using schematics (and allows generation using biomes in schematics for roads and plots....)
2020-03-25 17:46:08 +00:00
dordsor21
f2f7fbce09
Allow trusted users to use /plot set
2020-03-25 11:01:19 +00:00
dordsor21
412a3ee344
Support v2 schematics properly. No 3D biomes are supported by it as yet. ( #2716 )
2020-03-24 09:08:56 +01:00
dordsor21
2f4eea118a
add clear option to /ps purge ( #2714 )
2020-03-24 09:08:32 +01:00
dordsor21
7310506ed4
Add option to have road regeneration be persistent across restarts. ( #2715 )
...
* Add option to have road regeneration be persistent across restarts.
* Use int[] not Integer[]. There's the possibility of large arrays given the size of some worlds.
* Correctly close Input/Output streams with try-with-resource.
Also don't try to ObjectOutputStream if an existing file hasn't actually been deleted.
2020-03-22 19:23:35 +00:00
dordsor21
26b5ee7482
Merge branch 'features/v5/internal-updates' of https://github.com/IntellectualSites/PlotSquared into features/v5/internal-updates
2020-03-20 12:12:30 +00:00
dordsor21
58280a20a8
Log don't debug on regenallroad completion
2020-03-20 12:11:39 +00:00
dordsor21
3d47d7e73f
Use worldedit to regenerate chunks. ( #2708 )
...
* Use worldedit to regeneration chunks. It's very slow, but it works.
* Use the AutoClose-ness of EditSession
2020-03-20 13:05:13 +01:00
Alexander Söderberg
d9f9d7dc34
Features/v5/event results ( #2706 )
...
* Begin events rewrite using Guava EventBus:
- moved events to within core
- removed BukkitEventUtil
- EventUtil in core is now the implementation
- Refactor any event calls
TODO:
- Test :)
- Implement changes to PlotSquared's own listeners
- Other
* Correct code style for annotations and refactor EventUtil to EventDispatcher
* Make getEventResultRaw default method and remove empty PlotEventListener file
* not raw map
* Remove PlotPlusListener
* Add listener registration to PlotAPI. Add documentation and refactor Result enum
* Add reason for the Event Result. Change how the claim event is called
TODO: better auto event somehow. Possible re-write of auto required..?
* Implement changes to events properly
Add PlayerAutoPlotEvent
Add PlotDoneEvent
Add schematic variable to Claim event and allow it to be changed
Add reason for plot unlink to unlink event
Add pattern to component set event and allow it to be changed
Allow component of component set event to be changed
Add player to plot merge event
* Fix compile
* Correct formating
* Various cleanup
- Correct formatting in places
- Add feedback to Desc command cancellation
- Correct use of flag API
- Add FlagRemove event to flagcommand where required
* Replace reason with caption
* Switch colours in Event Deny caption
Co-authored-by: dordsor21 <dordsor21@gmail.com>
2020-03-15 12:22:49 +01:00
NotMyFault
4bcd926543
Update discord links
2020-03-09 23:50:22 +01:00
Alexander Söderberg
05626c2c8f
Features/v5/move swap fixes + some other important commits (comments, etc) ( #2699 )
...
* Use generics instead of the raw class
* Add Gradle wrapper verification
* Fix biome setting in versions prior to 1.15
* Fixes #2654
* Document area getters in PlotAreaManager, and replace y-value with z in the area contains check.
* Remove update notifications
* Remove unused dependencies
* Do not kick plot owners on "/p deny *"
* Do not kick any added players on /p deny *
* Allow redstone to be used in server plot with `redstone.disable-offline` enabled.
Potentially fixes #2613
* Disallow swapping ,erged plots
* Fix legacy converter.
* Fix blockbucket pattern generation
* Prevent pasting schematics onto merged plots.
* Cancel claim event correctly
* Revert "Cancel claim event correctly"
This reverts commit 0f786155
Further investigation required
* Fix plot swapping messing up owners. Fixes #2282
* Fix plot move
* Prevent plot swapping form changing the database unless the swap was successful.
* Update signs after swap.
* Only send move success message if the move was successful.
Co-authored-by: Matt <4009945+MattBDev@users.noreply.github.com>
Co-authored-by: NotMyFault <mc.cache@web.de>
Co-authored-by: Daniel <admin@hywse.eu>
Co-authored-by: Hannes Greule <SirYwell@users.noreply.github.com>
2020-02-28 22:15:04 +01:00
NotMyFault
30b83faab6
Fix plot downloading
2020-02-28 00:31:53 +01:00
Alexander Söderberg
9868648fcb
Pull/2693 ( #2694 )
...
* Commit WIP flag work.
* More ported flag types, and additions to the flag API.
* Make PlotFlag more generic to allow generic flag creation
* Pull Captions methods into a Caption interface.
* Port MusicFlag
* Port flight flag
* Port UntrustedVisitFlag
* Port DenyExitFlag
* Remove paper suggestion
* Make ListFlag lists immutable
* Update Flag containers. Add javadocs. Add missing methods.
* Port description flag
* Port greeting and farewell flags
* Port weather flag
* Move getExample implementation to BooleanFlag
* Port reserved flags
* Port all boolean flags.
* Remove unused flag types
* Invert liquid-flow flag
* Find the real (legacy) flag name
* Change NOITFY -> NOTIFY in Captions
* Make IntegerFlag extendable
* Port integer flags
* Update Flag command to current API state
* Begin remaking flag command
* Create DoubleFlag + extract common parsing stuff
* Supply arguments in flag parse exceptions
* Implement missing flag subcommands
* Update Flag command to current API state
* Implement PriceFlag
* Port deny-teleport
* Port gamemode flags
* Port BreakFlag
* Port PlaceFlag
* Port UseFlag
* Remove old unused flag constants
* Port blocked-cmds flag
* Fix entity util
* Port TimeFlag
* Use CaptionUtility for formatting
* Port keep flag
* Fix imports
* Reformat code
* Remove unused classes
* Fix MainUtil.java
* Remove FlagCmd
* Add flag info header and footer
* Comment out flag related stuff in SchematicHandler
* Remove FlagManager
* Finalize Plot.java
* Finalize PlotArea.java
* Finalize PlotListener
* Fix API issues
* Fix a bunch of compile errors
* Fix `/plot flag remove`
* Fix initialization of GlobalFlagContainer
* Apply API changes to events
* Update SQLManager to new API
* Invert default value for DenyExitFlag
* Replace flag.getValue().toString() with flag.toString()
* Make FlagContainer instance in Plot final
* Fix various command issues
* Clean up PlotSettings
* Don't show internal flags in flag list
* Fix `/plot flag add`
* Remove the info inventory as it's 100% broken
* Add plot info entries and fix up the default format
* Fix default flag state in Captions
* 781c200
part 2
* Fix odd grammar in captions
* Fix odd grammar in captions v2
* Add create table statements for plot_flags
* Remove old flag references in SQLManager
* Use the new plot_flags table
* Add tab completion to `/plot flag`
* Improve parse error handling
* Make flag permission check recognize parse exceptions
* Initial progress towards flag conversion
* Fix minor issues
* Don't validate flags during flag conversion
* Allow unrecognized flags to be parsed
* Filter out internal flags from command sugguestions
* Use the wrong caption when there's no plot description set
* Limit command suggestions for boolean flags
* Make blocktypelistflags accept blockcategories
* Require categories to be prefixed with '#' and fix some minor display issues
* Fix plot database conversion
* Update PlotFlagEvent.java
Updated return description
* Fix command annotation wrapping
* Add FLAG_UPDATE event for FlagContainer listeners
* Make getParentContainer nullable
* Document castUnsafe in FlagContainer
* Document FlagContainer constructors
* Add missing documentation to FlagContainer
* Document FlagParseException
* Fix wording in FlagContainer javadoc
* Document InternalFlag
* Document PlotFlag
* Minor changes
* Remove revisit comments
Co-authored-by: Hannes Greule <SirYwell@users.noreply.github.com>
Co-authored-by: NotMyFault <mc.cache@web.de>
Co-authored-by: Matt <4009945+MattBDev@users.noreply.github.com>
2020-02-24 18:42:02 +01:00
Alexander Söderberg
b99631f1bd
Fix regen. Fixes #2692
2020-02-24 14:00:45 +01:00
NotMyFault
f2aa9dccd1
Revert "Remove unused code"
...
This reverts commit 6d779dad05
.
2020-02-20 20:08:25 +01:00
Alexander Söderberg
464f5e09ae
Allow all messages to be formatted by external formatters and add PAPI support
2020-02-20 16:03:17 +01:00
NotMyFault
6d779dad05
Remove unused code
...
Or at least I made it unused lul
2020-02-20 00:39:32 +01:00
Alexander Söderberg
38d0cc1b29
Fix isPremium method
2020-02-20 00:05:55 +01:00
NotMyFault
95394ec54f
Add Premium verification
2020-02-19 23:55:43 +01:00
NotMyFault
2632283431
Move recent changes into 1 branch
2020-02-16 15:17:06 +01:00
NotMyFault
8a014e3ad5
Remove wiki generator and unnencessary comments from the settings
2020-02-16 15:08:02 +01:00
NotMyFault
1b3427837e
Rename maven artifacts
...
Renaming the Core module artifact matchin its module name on GitHub, like the bukkit or nukkit module does.
Given that, it's more clear which maven artifact belongs to which module.
2020-02-16 14:42:27 +01:00
NotMyFault
b3c91d866b
Lazy cherry-pick 5db1e73eae4b0d4628df8bbbc172670c42d96435 without merge conflics
2020-02-16 14:41:51 +01:00
NotMyFault
6953187cac
Add current + new version to update notification
...
And fix a little typo alongside bumping versioning to v5
2020-02-16 14:37:07 +01:00
NotMyFault
4ed108b5c0
Remove legacy auto updater (v3)
2020-02-16 01:36:24 +01:00
NotMyFault
24b6b23d25
Bind update notifications to spigot resource updates
...
The notification permission could be moved back into the other class, but well
2020-02-16 01:33:43 +01:00
MattBDev
b16db904cc
Removed unused class which should be unbreaking.
2020-02-11 17:09:36 -05:00
MattBDev
4b306d454b
Fixed an error with the debug command and added @NotNull to generator methods
2020-02-11 17:06:58 -05:00
MattBDev
e53ea2377c
Fixed #2671
...
Sort of fixed. I added an if statement to log and return if a certain condition is met. It is unclear if there will be more generation issues as a result.
2020-02-11 16:52:16 -05:00
MattBDev
f79f2ac29e
Tweaks to the world generator
2020-02-11 16:16:56 -05:00
NotMyFault
54348d824c
Update authors
2020-02-10 17:36:54 +01:00
dependabot-preview[bot]
76e25953b1
Bump lombok from 1.18.10 to 1.18.12
...
Bumps [lombok](https://github.com/rzwitserloot/lombok ) from 1.18.10 to 1.18.12.
- [Release notes](https://github.com/rzwitserloot/lombok/releases )
- [Changelog](https://github.com/rzwitserloot/lombok/blob/master/doc/changelog.markdown )
- [Commits](https://github.com/rzwitserloot/lombok/compare/v1.18.10...v1.18.12 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-10 08:03:18 +00:00
NotMyFault
2f0bf97162
Fix displaying 1 player remove as players
2020-02-09 01:12:32 +01:00
Hannes Greule
d0b6badf09
Fix DebugClaimTest ( #2667 )
...
* Fix DebugClaimTest
* Remove code causing 3 database updates per plot + errors when using MySQL
2020-01-31 17:12:06 +00:00
NotMyFault
30f37e1e8b
Update /plot info placeholders
2020-01-27 23:39:29 +01:00
NotMyFault
4e1c90bbcc
Fixes space between names in plot info ( Fixes #2675 )
2020-01-27 23:06:42 +01:00
Matt
57af89f1d0
Merge pull request #2652 from SynergyMC/breaking
...
Revert teleportation behavior to pre-4.400
2020-01-22 21:23:25 -05:00
NotMyFault
118adb42b9
add hungarian translation
2020-01-14 12:27:23 +01:00
NotMyFault
f3187a465c
Oops
2020-01-10 19:38:38 +01:00
NotMyFault
6ee9d91aef
Update requriedTypes
2020-01-10 14:01:28 +01:00
NotMyFault
808a1ed703
Add wildcards to command args
2020-01-10 13:35:59 +01:00
NotMyFault
7142e9e0e3
deprecate metrics settings
2020-01-07 22:45:53 +01:00
zombachu
3aa554c52b
Implemented optional specification of teleport causes
...
This should have backwards-compatibility for any users of the API but would require an update from anything reimplementing (for whatever reason) the interfaces amended by this commit.
2020-01-02 18:29:12 -10:00
NotMyFault
42a83b56c3
Add clarification of tp bypass permission node to settings.yml
2020-01-03 01:10:32 +01:00
NotMyFault
0ad2682210
Add update and jvm flags to debugpaste
2019-12-27 16:53:38 +01:00
Alexander Söderberg
3abb35e506
Prevent NPE when trying to set statement = null
in SQLManager
...
If the statement is null, the `isClosed` check will lead to a NPE. As it's going to be null either way, just ignoring the NPE has no side effects.
2019-12-20 18:01:36 +01:00
Alexander Söderberg
c6e36fd70e
Fix plot biomes.
...
When migrating to the WorldEdit Biome types, code was not altered to account for these changes. This lead to configuration parsing breaking, and the `/plot setbiome` command no longer functioning. This fixes #2599 .
2019-12-20 17:37:48 +01:00
MattBDev
9fd29b264e
Some logging operations to check for tps loss.
2019-12-15 13:08:02 -05:00
MattBDev
3af05e7960
Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking
2019-12-09 14:44:16 -05:00
MattBDev
07b6942690
Minor code tweaks
2019-12-09 14:43:53 -05:00
dependabot-preview[bot]
7d8a5213dd
Bump okio from 2.2.2 to 2.4.1
...
Bumps [okio](https://github.com/square/okio ) from 2.2.2 to 2.4.1.
- [Release notes](https://github.com/square/okio/releases )
- [Changelog](https://github.com/square/okio/blob/master/CHANGELOG.md )
- [Commits](https://github.com/square/okio/compare/2.2.2...2.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-07 19:34:28 +01:00
dependabot-preview[bot]
eb09e0a633
Bump okhttp from 3.12.0 to 4.2.2
...
Bumps [okhttp](https://github.com/square/okhttp ) from 3.12.0 to 4.2.2.
- [Release notes](https://github.com/square/okhttp/releases )
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md )
- [Commits](https://github.com/square/okhttp/compare/parent-3.12.0...parent-4.2.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-07 18:49:39 +01:00
dependabot-preview[bot]
4e2c90e399
Bump gson from 2.8.0 to 2.8.6
...
Bumps [gson](https://github.com/google/gson ) from 2.8.0 to 2.8.6.
- [Release notes](https://github.com/google/gson/releases )
- [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/gson/compare/gson-parent-2.8.0...gson-parent-2.8.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-07 18:48:37 +01:00
dependabot-preview[bot]
e5423b5e08
Bump kotlin-stdlib from 1.3.50 to 1.3.61
...
Bumps [kotlin-stdlib](https://github.com/JetBrains/kotlin ) from 1.3.50 to 1.3.61.
- [Release notes](https://github.com/JetBrains/kotlin/releases )
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.3.61/ChangeLog.md )
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.3.50...v1.3.61 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-07 18:41:32 +01:00
dependabot-preview[bot]
c1a7844f4a
Bump lombok from 1.18.8 to 1.18.10
...
Bumps [lombok](https://github.com/rzwitserloot/lombok ) from 1.18.8 to 1.18.10.
- [Release notes](https://github.com/rzwitserloot/lombok/releases )
- [Changelog](https://github.com/rzwitserloot/lombok/blob/master/doc/changelog.markdown )
- [Commits](https://github.com/rzwitserloot/lombok/compare/v1.18.8...v1.18.10 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-07 18:36:45 +01:00
NotMyFault
3ba29583fc
Add all colors to style.yml
...
For further releases , we should aim to get a rid of the styles.yml and $ codes. I've seen a lot of people struggling with them, and if you want to use other formatting codes, you need to yamlize the non yamlized messages, otherwise it won't work properly.
2019-12-07 17:40:15 +01:00
MattBDev
7760631751
Remove deprecated method from Captions.java
2019-12-06 21:18:56 -05:00
MattBDev
05d6d557b8
Merge remote-tracking branch 'origin/breaking' into breaking
2019-12-06 21:16:19 -05:00
MattBDev
9925a320f5
Fix event listeners
2019-12-06 21:16:09 -05:00
NotMyFault
dca5d84d29
Fixes #2620
2019-12-06 00:28:07 +01:00
MattBDev
7e58f4341e
Minor fixes and performance improvement
2019-12-02 17:07:57 -05:00
MattBDev
d8933afb50
Merge remote-tracking branch 'origin/breaking' into breaking
2019-11-28 21:50:31 -05:00
MattBDev
4bb45fc220
Replace ByteArrayUtilities code with Guava and Replace PlotGameMode with WorldEdit equivalent.
2019-11-28 21:50:21 -05:00
NotMyFault
09f913cba4
Enhanced Fixes #2595
...
Updating messages and adding new strings that fit better.
2019-11-28 19:02:58 +01:00
MattBDev
006d730185
Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking
2019-11-26 18:00:44 -05:00
Jesse Boyd
cf558d8f62
Update DebugPaste.java
2019-11-25 22:40:50 +00:00
Jesse Boyd
a65d546f3b
Fix debugpaste split
2019-11-25 22:38:03 +00:00
Jesse Boyd
cd06dbc915
Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking
2019-11-22 16:12:01 +00:00
Jesse Boyd
977dfa807f
potentially fix partial world auto
2019-11-22 16:11:48 +00:00
NotMyFault
c14e1d7add
Update Settings.java
2019-11-22 12:40:27 +01:00
NotMyFault
7377366372
Updating some debug colors
2019-11-22 12:28:34 +01:00
Jesse Boyd
9c9841663a
Fixes #2595 (leave error)
2019-11-19 01:39:51 +00:00
MattBDev
612e96201c
Fixed ItemTypeListFlag issue
2019-11-18 13:43:16 -05:00
MattBDev
d7aa4a0e1f
Revert "Fix some flag issues"
...
This reverts commit 8b741477
2019-11-18 13:41:46 -05:00
MattBDev
8b7414770f
Fix some flag issues
2019-11-18 11:09:32 -05:00
Jesse Boyd
7623698a00
don't use legacy ids here
2019-11-12 22:31:02 +00:00
Jesse Boyd
c23086259d
Potentially fixes rename issues
...
#2450
2019-11-12 20:48:33 +00:00
Jesse Boyd
765a021ecd
Some flag fixes
...
Use ItemType for the flags, since they accept items, not blocks.
Fixes #2571
2019-11-12 20:38:18 +00:00
Jesse Boyd
322e186c4b
Ignore invalid blocks
2019-11-12 07:32:05 +00:00
Jesse Boyd
7d7414ebb9
Fix for single chance parsing
2019-11-11 19:47:26 +00:00
Jesse Boyd
55d6217c32
Check if WORLDEDIT_RESTRICTIONS is enabled
...
Unregister if disabled.
2019-11-11 19:44:51 +00:00
Jesse Boyd
f797141a29
Update Plot.java
2019-11-10 22:08:03 +00:00
Jesse Boyd
bf4d953f3c
No need to convert to a BlockState here
2019-11-10 18:49:31 +00:00
Jesse Boyd
d34f5cc97e
Config reading/writing
2019-11-10 18:32:32 +00:00
Jesse Boyd
d254633b77
Use patterns instead of BlockBucket
...
Still use BlockBucket for loading/saving from config
2019-11-10 17:47:37 +00:00
Jesse Boyd
1d9ad94822
Fix plot getRegions off by 1
2019-11-10 14:01:12 +00:00
Jesse Boyd
fe438fd62a
swallow stacktrace
2019-11-10 13:29:58 +00:00
Jesse Boyd
93894aca96
Force lowercase
2019-11-10 13:27:37 +00:00
Jesse Boyd
f1b8510708
forgot to find
2019-11-10 13:24:04 +00:00
Jesse Boyd
7dcecf486d
Use regex for block bucket, yay
2019-11-10 13:18:15 +00:00
Jesse Boyd
8c1985f9c0
Split by regex
2019-11-10 13:08:34 +00:00
Jesse Boyd
34eb7d05dc
Print actual value for setup?
2019-11-10 12:45:51 +00:00
Jesse Boyd
729452038b
Check if integer
2019-11-10 12:43:47 +00:00
Alexander Söderberg
1a923063b5
Merge branch 'breaking' into we
2019-11-10 13:18:16 +01:00
Jesse Boyd
c155c65a8f
Remove modifier reflection
...
Fixes #2484
2019-11-10 11:23:25 +00:00
Alexander Söderberg
37280779b0
Make /plot setowner
require an argument. Fixes #2501 .
2019-11-10 12:06:33 +01:00
Jesse Boyd
ed588476e0
Fix single plot areas
2019-11-08 22:31:01 +00:00
Jesse Boyd
07fcd53bf8
Fixes IntellectualSites/PlotSquaredSuggestions#58
2019-11-08 05:17:51 +00:00
NotMyFault
72c6f1165a
Fix okio
2019-11-07 17:02:08 +01:00
Jesse Boyd
252fdefef3
bad regex replace
2019-11-06 11:39:55 +00:00
Jesse Boyd
2cb734bba2
editsession util
2019-11-04 21:55:40 +00:00
MattBDev
46926a4d99
Merge remote-tracking branch 'origin/breaking' into breaking
2019-11-04 16:20:03 -05:00
Jesse Boyd
88732bb88c
Use CuboidRegion instead of RegionWrapper
2019-11-04 21:08:33 +00:00
Jesse Boyd
ba3ff08d6c
Update BlockStateListFlag.java
2019-11-04 20:17:29 +00:00
Jesse Boyd
8f7f6a4f40
Merge branch 'breaking' into we
2019-11-04 20:17:15 +00:00
Jesse Boyd
7e6dc48d69
imports
2019-11-04 19:58:24 +00:00
Jesse Boyd
37f608258f
Remove PlotBlock
2019-11-04 19:55:55 +00:00
NotMyFault
a25511c849
Add custom translations for special flags
2019-11-04 19:22:54 +01:00
Jesse Boyd
930dee9326
Refactor BlockVector2
2019-11-04 17:44:23 +00:00
NotMyFault
e972cb4c1a
Make flag error messages translatable
2019-11-04 00:33:04 +01:00
MattBDev
17e784c283
Revert dependency upgrades
2019-11-01 21:45:06 -04:00
Matt
627ecd2b71
Merge pull request #2542 from mindw0rm/UntrustedVisit
...
New plot flag untrusted-visit
2019-10-31 17:02:48 -04:00
NotMyFault
e29727827d
Fix missing word
2019-10-27 16:02:34 +01:00
NotMyFault
1f89948948
Remove unused flags
2019-10-27 16:01:57 +01:00
Alexander Söderberg
3be0be1b60
Make sure DENY_EXIT checks for the admin override permission. Fixes #2411 .
2019-10-27 12:11:48 +01:00
Alexander Söderberg
2e15934666
Fix /plot flag set
allowing for invalid flag values. ( Fixes #2519 )
2019-10-27 12:01:04 +01:00
Alexander Söderberg
cb52ee8cfb
Make the flag list output message configurable.
2019-10-27 11:55:15 +01:00
Alexander Söderberg
01eee306f1
Fixes #2462 by making flag categories translatable. This reflects (somewhat) recent changes to command categories.
2019-10-27 11:45:18 +01:00
Alexander Söderberg
a601739fbd
Improve handling of list flags, which in turn resolves issues where add and remove would allow players to add flags with unrecognized values.
2019-10-27 11:25:33 +01:00
mindw0rm
cb1767347b
Merge branch 'breaking' into UntrustedVisit
2019-10-23 20:51:59 +02:00
mindw0rm
91108a5df9
Merge branch 'breaking' into UntrustedVisit
2019-10-22 17:21:24 +02:00
mindw0rm
e5e522bc31
Merge branch 'breaking' into DenyTeleportBugfix
2019-10-22 17:20:43 +02:00
Matt
8b30d6a7ff
Merge pull request #2537 from IntellectualSites/dependabot/gradle/com.google.code.gson-gson-2.8.6
...
Bump gson from 2.8.0 to 2.8.6
2019-10-19 17:45:28 -04:00
dependabot-preview[bot]
d7d9b1793f
Bump okhttp from 3.14.0 to 4.2.2
...
Bumps [okhttp](https://github.com/square/okhttp ) from 3.14.0 to 4.2.2.
- [Release notes](https://github.com/square/okhttp/releases )
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md )
- [Commits](https://github.com/square/okhttp/compare/parent-3.14.0...parent-4.2.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-19 21:40:45 +00:00
dependabot-preview[bot]
427cf081e3
Bump okio from 2.2.2 to 2.4.1
...
Bumps [okio](https://github.com/square/okio ) from 2.2.2 to 2.4.1.
- [Release notes](https://github.com/square/okio/releases )
- [Changelog](https://github.com/square/okio/blob/master/CHANGELOG.md )
- [Commits](https://github.com/square/okio/compare/2.2.2...2.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-19 21:37:55 +00:00
Matt
c103504fc8
Merge pull request #2529 from IntellectualSites/dependabot/gradle/org.jetbrains.kotlin-kotlin-stdlib-1.3.50
...
Bump kotlin-stdlib from 1.3.30 to 1.3.50
2019-10-19 17:36:40 -04:00
mindw0rm
24d82e562a
merge upstream changes
2019-10-18 07:44:04 +02:00
NotMyFault
9ad2537ca2
Merge pull request #2517 from IntellectualSites/debugpaste-update
...
Improve world generator diagnosis
2019-10-17 12:23:47 +02:00
dependabot-preview[bot]
53e94cc001
Bump gson from 2.8.0 to 2.8.6
...
Bumps [gson](https://github.com/google/gson ) from 2.8.0 to 2.8.6.
- [Release notes](https://github.com/google/gson/releases )
- [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/gson/compare/gson-parent-2.8.0...gson-parent-2.8.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-14 15:17:37 +00:00
mindw0rm
039b7aee9e
Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into UntrustedVisit
2019-10-10 20:34:41 +02:00
Matt
e445f96e0c
Merge pull request #2528 from IntellectualSites/dependabot/gradle/org.yaml-snakeyaml-1.25
...
Bump snakeyaml from 1.23 to 1.25
2019-10-07 13:49:52 -04:00
dependabot-preview[bot]
ec6c9dac49
Bump lombok from 1.18.8 to 1.18.10
...
Bumps [lombok](https://github.com/rzwitserloot/lombok ) from 1.18.8 to 1.18.10.
- [Release notes](https://github.com/rzwitserloot/lombok/releases )
- [Changelog](https://github.com/rzwitserloot/lombok/blob/master/doc/changelog.markdown )
- [Commits](https://github.com/rzwitserloot/lombok/compare/v1.18.8...v1.18.10 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-07 15:16:57 +00:00
dependabot-preview[bot]
8068671200
Bump kotlin-stdlib from 1.3.30 to 1.3.50
...
Bumps [kotlin-stdlib](https://github.com/JetBrains/kotlin ) from 1.3.30 to 1.3.50.
- [Release notes](https://github.com/JetBrains/kotlin/releases )
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.3.50/ChangeLog.md )
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.3.30...v1.3.50 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-07 15:16:54 +00:00
dependabot-preview[bot]
8927f50cc6
Bump snakeyaml from 1.23 to 1.25
...
Bumps [snakeyaml](https://bitbucket.org/asomov/snakeyaml ) from 1.23 to 1.25.
- [Commits](https://bitbucket.org/asomov/snakeyaml/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-07 15:16:31 +00:00
NotMyFault
b806a30639
Setting debug value default to false
...
If the user is interested in the information or needs it for debugging, they can enable them, but we don't need to spam them unnecessarily with stats about his plot worlds on each startup, /plot reload, etc.
The same information can be obtained from a debugpaste as well, so it's not a loss of information to offer assistance.
2019-10-03 01:32:19 +02:00
NotMyFault
120d36e413
Add a confirmation to the debugpaste
...
That should prevent people from accidentally pressing buttons (whyever you would do that)
2019-10-03 01:12:08 +02:00
NotMyFault
c8c5d777a1
Make paths... idk what to say here
2019-10-03 00:40:41 +02:00
NotMyFault
b92d42e7cc
Add clarification to what files are pasted
2019-10-01 14:46:19 +02:00
NotMyFault
59bc6f19e5
General clarification of the config
...
Certain values were rather vague and caused some confusion in the past, hopefully things are more clear now.
2019-10-01 14:01:50 +02:00
NotMyFault
267bebd0e8
Improve world generator diagnosis
2019-10-01 12:12:42 +02:00
mindw0rm
58dbe96bd8
Added a plot flag 'untrusted visit', that allows /plot visit for untrusted players without the permission plot.visit.other.
2019-09-19 10:40:47 +02:00
mindw0rm
ae1273a7f3
Bugfixes for deny-teleport
2019-09-14 12:58:22 +02:00
NotMyFault
05ef076ef0
Remove unnecessary spaces
2019-09-12 04:01:47 +02:00
NotMyFault
d20d95d29b
Remove schematic test command
2019-09-12 03:53:29 +02:00
NotMyFault
6e387f3321
Do not remove the schematic file extension
2019-09-12 03:44:31 +02:00
MattBDev
68a5166d2f
Fixes the major lag source from GlobalBlockQueue
2019-09-11 19:04:29 -04:00
MattBDev
2bf47478b2
Merge remote-tracking branch 'origin/breaking' into breaking
2019-09-09 15:15:53 -04:00
MattBDev
07b88e3147
Minor changes to the block queue classes to match FAWE more closely.
2019-09-09 15:15:44 -04:00
56738
5b3426f4ac
Make removing * remove the Everyone node before removing all members
2019-09-09 18:44:36 +02:00
MattBDev
ecfb71b08f
Changes made to GlobalBlockQueue to help diagnose lag.
2019-09-08 19:36:02 -04:00
MattBDev
fd6fbebd69
Fixed #2496
2019-09-08 18:43:47 -04:00
NotMyFault
04f789d404
Fix merging
2019-09-08 20:02:45 +02:00
NotMyFault
20b0fa31d0
Update gradle and deprecated methods
2019-09-07 22:46:13 +02:00
MattBDev
462c113ce8
Fixed accidental code reversion
2019-09-06 21:20:54 -04:00
NotMyFault
e01b470493
Resolve merge conflicts
2019-09-07 03:06:05 +02:00
MattBDev
b3136b4ebe
Version number fixes, fixed documentation, new caption added, and tweaks to API functionality.
2019-09-06 20:40:28 -04:00
NotMyFault
4d0bd8a3a3
Upgrade build files
2019-09-04 03:04:51 +02:00
NotMyFault
e1db27010c
Updating command usage formats
2019-09-04 03:01:25 +02:00
MattBDev
a7012814ab
Deprecated a poorly named method
2019-09-01 19:40:16 -04:00
MattBDev
5e8909883d
Modified internal configuration classes, Updated Mojang UUID fetcher, other various method and documentation tweaks
2019-09-01 16:54:43 -04:00
dordsor21
434d219f41
Add plots.admin.area.sudo for permission to commands of the form "/plot <area> <command...>" as well as plots.admin
2019-08-23 17:18:25 +01:00
MattBDev
ec84b91f84
added a stupid check because of a spigot issue.
2019-08-19 14:51:14 -04:00
MattBDev
76dc60194d
Added an invalid world name check.
2019-08-17 19:17:01 -04:00
MattBDev
cc9c1f63d8
When an exception is actually being used it shouldn't be named ignored
2019-08-17 18:45:07 -04:00
MattBDev
920796d8ec
Fixed #2468
2019-08-17 16:28:53 -04:00
NotMyFault
c6a4206266
Fix Typo
2019-08-17 17:06:17 +02:00
NotMyFault
1cf85ff2c6
Removed unused translation strings
...
And added a new alias
2019-08-17 02:19:29 +02:00
NotMyFault
be20b2404b
OCD
...
- Typo Fixes
- Small amendments (Spelling)
- Reformatting
2019-08-17 01:48:43 +02:00
NotMyFault
011baba140
Update PlotSquared.java
2019-08-16 02:05:51 +02:00
NotMyFault
b22919a278
Variable renames and fixes
2019-08-16 01:47:22 +02:00
NotMyFault
49b7c71fbb
Adding some more translation strings
2019-08-16 01:22:24 +02:00
NotMyFault
31c81fc9fe
Update command aliases format
2019-08-15 17:35:40 +02:00
NotMyFault
8653b9b0a2
Update unfitting messages
2019-08-15 16:37:57 +02:00
NotMyFault
b3e53e34b6
Simplify help string
2019-08-15 16:20:30 +02:00
NotMyFault
fbaef13553
Unify player string
...
<> args are used in a lot of commands, PlayerName is used in only 3 commands and I don'T want to remove methods if not really necessary, so let's just change it here.
2019-08-15 15:39:37 +02:00
MattBDev
3473f5dc85
Fixed compatibility with FAWE and compile issue.
2019-08-14 20:47:01 -04:00
MattBDev
b4c33aaa18
Midnight work
...
Also fixes #2463
2019-08-14 14:36:20 -04:00
MattBDev
a910b542a0
Replace annotations with JetBrains annotations
2019-08-13 23:43:11 -04:00
MattBDev
403916748c
Variable renaming
2019-08-13 23:37:15 -04:00
MattBDev
3e6b0b8394
Work on directions and merging
2019-08-13 22:01:23 -04:00
MattBDev
56e055c671
Second attempt at a sign fix.
2019-08-13 18:39:38 -04:00
MattBDev
1341100f03
Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking
2019-08-13 18:28:54 -04:00
MattBDev
d7c72d5f75
Variable renames
2019-08-13 18:26:55 -04:00
MattBDev
265f0c6615
Potential fix for #1930
2019-08-13 18:06:10 -04:00
MattBDev
9642777750
If NMF can have midnight work, so can I
2019-08-13 17:33:32 -04:00
NotMyFault
41052b27a0
I have some random ideas sometimes
...
- Adjusting some RequiredTypes fitting their partners/default behavior
- A plot doesn't need to be claimed to get the center
- Adapting another gamemode acronym
- Fix copyFile to adapt the latest changes
- Removing HastebinUtility, we have our own paste service
2019-08-13 21:57:49 +02:00
NotMyFault
0ac4b7728f
Merge pull request #2460 from jewome62/feature/toggle-time
...
Add toggle for time
2019-08-13 18:44:32 +02:00
NotMyFault
bb97fb8e19
Update Templates to sponge schematic format
...
Skyblock has been removed as it was simply the default island if ASkyBlock
2019-08-13 04:08:17 +02:00
NotMyFault
b1391bd6d7
Fix template export
2019-08-13 03:13:03 +02:00
NotMyFault
f1c190028e
Fixes #2013
...
Tested with LuckPerms, result successful.
2019-08-12 23:59:14 +02:00
MattBDev
ad7bcd19d4
Added a debug command to diagnose the issues in #2411
2019-08-12 13:40:22 -04:00
jewome62
ca954ccc97
Add toggle for time
2019-08-11 21:15:02 +02:00
Sauilitired
8ab10de4ad
Fix plot title toggling ( fixes #2456 )
2019-08-10 17:54:44 +02:00
MattBDev
df9d5ae2ac
Merge remote-tracking branch 'origin/breaking' into breaking
2019-08-07 19:16:55 -04:00
MattBDev
5ddbf3def4
Update gradle
2019-08-07 19:16:44 -04:00
MattBDev
289f01f7a2
Import changes and variable renames
2019-08-06 21:46:38 -04:00
MattBDev
f3aa9c43ef
Fixed a potential NPE
2019-08-06 21:44:39 -04:00
NotMyFault
165cf26818
Fix typo
2019-08-07 03:43:49 +02:00
MattBDev
e6a7f4e5a7
Add null checks to validation task
...
Fixes #2407
2019-08-06 20:45:01 -04:00
MattBDev
8f685b754a
Modifications to formatting and UUID Handler
...
Fixes #2423
2019-08-06 20:35:36 -04:00
MattBDev
539ad9f05c
Small changes
2019-08-06 16:08:56 -04:00
MattBDev
5b8f6e466a
Minor gradle edit
2019-08-06 15:05:04 -04:00
Leomixer17
520be48198
Create fixborders.js
2019-08-05 14:47:19 -04:00
Leomixer17
e4a345880e
Update addsigns.js
2019-08-05 14:46:54 -04:00
MattBDev
f06903f1b8
Merge remote-tracking branch 'origin/paperstuff' into paperstuff
...
# Conflicts:
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java
2019-08-05 14:07:09 -04:00
MattBDev
fe83ef0975
Get chunks asynchronously
2019-08-05 14:03:09 -04:00
NotMyFault
cd26b1647d
Add kelp-grow flag
...
Simply as the name says, add a controlled way to let kelp grow.
2019-08-05 14:03:07 -04:00
NotMyFault
cdc01a5bc4
Reformat debugpaste
...
And upgrade from IC -> IS
2019-08-05 14:03:07 -04:00
MattBDev
1295f7c4bf
Merge with breaking
2019-08-05 14:03:06 -04:00
Sauilitired
20dd98d3b9
Use PaperLib and make command task return completable futures
2019-08-05 14:02:30 -04:00
MattBDev
bd51292f4c
Get chunks asynchronously
2019-08-05 13:33:27 -04:00
MattBDev
cc45208605
Merge remote-tracking branch 'origin/breaking' into paperstuff
2019-08-05 13:32:19 -04:00
MattBDev
01dfdbe2ef
Merge with breaking
2019-08-03 23:26:16 -04:00
MattBDev
bb21abb110
Merge branch 'breaking' into paperstuff
...
# Conflicts:
# Bukkit/build.gradle
# Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
# Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerPlotTrustedEvent.java
# Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java
# Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Buy.java
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Clear.java
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugExec.java
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Grant.java
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/MainCommand.java
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Near.java
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Relight.java
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SubCommand.java
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Visit.java
2019-08-03 23:11:02 -04:00
NotMyFault
6d0849eb66
Merge pull request #2431 from IntellectualSites/kelp-grow
...
Add kelp-grow flag
2019-07-27 21:55:39 +02:00
NotMyFault
dbf5084fa1
Reformat debugpaste
...
And upgrade from IC -> IS
2019-07-25 20:02:39 +02:00
NotMyFault
feda094273
Add kelp-grow flag
...
Simply as the name says, add a controlled way to let kelp grow.
2019-07-20 01:29:30 +02:00
dordsor21
095dccd30f
Revert changes to intersection generation
2019-06-28 13:59:57 +01:00
Alexander Krivács Schrøder
d6401d1638
Allow running the road regeneration on a single region
...
The plot-based road regeneration from before does not have the same behavior as the real road regeneration code. This new debug operation will regenerate the roads within the region the player is standing using the same code that regenerates all roads. This makes it much easier to tell if things are working correctly and as expected.
2019-06-16 11:57:35 -04:00
Alexander Krivács Schrøder
7f404e1cf5
Fix plot walls after running regenallroads
...
Also clears whatever was above the plot wall, such as pieces of the road.
2019-06-16 11:57:35 -04:00
Alexander Krivács Schrøder
a94c588a17
Check if location has PlotArea to avoid NPE
2019-06-03 16:26:20 -04:00
Alexander Krivács Schrøder
d106262454
Have PlotAreas create their own PlotManager
...
Leads to cleaner code, less need for instanceof and casting, as a PlotArea knows which kind of PlotManager it needs to make
2019-06-03 16:26:20 -04:00
Alexander Krivács Schrøder
c5bca66618
Remove PlotArea parameter from PlotManager method calls
...
As per the previous commit, all PlotManagers now have a reference to their managed PlotArea.
2019-06-03 16:26:20 -04:00
Alexander Krivács Schrøder
6b3960fc3f
Pass the PlotArea into the PlotManager
2019-06-03 16:26:20 -04:00
Alexander Krivács Schrøder
908a5784a1
Cache conversions to BaseBlock and fix leaky abstraction
2019-06-03 16:24:59 -04:00
Alexander Krivács Schrøder
bbff898073
Extract air block into variable to reduce unnecessary function calls
2019-06-03 16:24:59 -04:00
Alexander Krivács Schrøder
19f8704cb4
Remove leftovers from getting rid of PlotBlocks in LocalChunk
2019-06-03 16:24:59 -04:00
Alexander Krivács Schrøder
b366b0d261
Set unspecified blocks from the schematic to air
...
If this isn't done, any blocks not specified in the schematic will remain after a clear, which is obviously undesirable.
2019-06-03 16:24:59 -04:00
Alexander Krivács Schrøder
941821e453
Convert all PlotBlocks to BaseBlocks in the BasicLocalBlockQueue
...
The `BukkitLocalQueue` only supports using one of the sets (the removed `baseBlocks` variable in `BasicLocalBlockQueue` was the deciding factor for which one won out) which led to issues with missing blocks when trying to use both types at the same time, such as in the `HybridPlotManager`s `clearPlot` method, where `PlotBlock` is used to fill in the various layers, while the`createSchemAbs` method uses `BaseBlock` for its data.
2019-06-03 16:24:59 -04:00
MattBDev
475e9b50e1
Fixes #2380
2019-05-31 12:00:44 -04:00
MattBDev
812d41092e
Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking
2019-05-31 11:57:18 -04:00
Alexander Krivács Schrøder
41299e6851
Fix issue with plot border during merge
...
* `getExtendedTopAbs()` used wrong relative plot for calculating X position.
* Not running `finishPlotMerge()` after every merge led to broken roads during a `merge all`
2019-05-29 23:28:16 -04:00
Alexander Krivács Schrøder
95cb0d84f0
Fix issue with road generation during unlink
...
Roads should always be created with respect to `current`.
2019-05-29 23:28:16 -04:00
zombachu
fb478de164
Update outdated list of files to check on failed world load ( #2365 )
2019-05-22 12:09:31 -04:00
MattBDev
1bd7c8ca5f
Variable renames
2019-05-21 18:50:52 -04:00
MattBDev
fe471c3571
new library in gradle and another change I can't remember.
2019-05-21 18:32:26 -04:00
MattBDev
8ff833de36
Added Paper to Platform
2019-05-17 18:50:24 -04:00
MattBDev
5dd2610b5e
Misc. changes and removal of title manager
2019-05-17 18:49:09 -04:00
MattBDev
4e3a927323
Modifications to the generator code
2019-05-17 16:21:03 -04:00
MattBDev
595a68ecba
variable renames
2019-05-17 15:32:05 -04:00
MattBDev
6f5cb30734
Minor message changes and variable changes
2019-05-17 14:38:57 -04:00
MattBDev
b66734a472
Misc. code changes
...
A lot of renaming
Some formatting
Narrowed scope of variables
Added annotations
2019-05-13 21:57:41 -04:00
MattBDev
adefe2eeef
Titles can be used on Spigot and Paper now
2019-05-13 18:20:58 -04:00
MattBDev
a841b4ea86
Titles are now exclusive to paper servers
2019-05-10 22:42:07 -04:00
MattBDev
f232334bcc
Various formatting tweaks as well as metrics changes.
2019-05-10 21:18:28 -04:00
dordsor21
885d1b9d7e
Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking
2019-05-05 16:56:14 +01:00
dordsor21
f6e492638d
Bad temporary fix for #2345 - just don't use BukkitLocalQueue#regenChunkSafe and that on 1.14 :) (:
2019-05-05 16:56:00 +01:00
dordsor21
46beb90112
Correcter versioning
2019-05-05 11:58:45 +01:00
dordsor21
0a6fad73c3
Correct versioning
2019-05-05 11:56:08 +01:00
dordsor21
eb9d98d289
Use https://www.athion.net/ISPaster/paste
2019-05-01 19:52:26 +01:00
MattBDev
2ec13e4e76
Replace code with hasFlag() where appropriate.
2019-05-01 12:31:50 -04:00
MattBDev
db6115eae5
Documentation and formatting changes
2019-04-29 15:20:52 -04:00
MattBDev
9e324762b6
Move the update utility setup to it's own method
2019-04-29 15:18:38 -04:00
MattBDev
237b10a2a2
Tidying up the code
2019-04-29 10:49:58 -04:00
dordsor21
bef3dbc6f4
Reformat code
2019-04-23 23:48:22 +01:00
dordsor21
d352804b5d
Update gradle lombok version for core
2019-04-23 23:47:00 +01:00
dordsor21
c7ba94f959
Fix legacy material loading error and Jenkins4J dependencies
2019-04-23 23:03:52 +01:00
dordsor21
5ac00c4920
downgrade Jenkins4J
2019-04-23 22:41:06 +01:00
dordsor21
1e97392244
Update to gradle 5.4
2019-04-23 22:27:32 +01:00
Jesse Boyd
0c0a696d36
Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking
2019-04-23 12:57:46 +10:00
Jesse Boyd
21a5b04b7b
remove debug
2019-04-23 12:57:39 +10:00
MattBDev
ef8d33db41
Minor command changes
...
Changed RequiredType in some classes and formatting changed in others.
2019-04-22 11:55:05 -04:00
MattBDev
f5fa15080c
Minor javadoc updates
2019-04-22 11:45:23 -04:00
Jesse Boyd
ea26ec628d
Use Settings.Teleport.ON_LOGIN
2019-04-19 13:02:50 +10:00
Jesse Boyd
815e513093
Fix teleportOnLogin error
2019-04-19 12:53:48 +10:00
Jesse Boyd
8ac23b92d8
Use UUID, not just name
2019-04-17 22:18:03 +10:00
Jesse Boyd
d31dbc7c7c
Fix debugimportworlds 1.13
...
because someone changed PlotId.fromString to throw an exception without updating things that call it
2019-04-17 22:07:33 +10:00
Jesse Boyd
000e3de35d
Don't allow importing using base directory
2019-04-17 14:36:31 +10:00
Jesse Boyd
7e63ffe745
Optimize vanilla world generation*
...
*For single plot worlds
Reuse base world data. Instead of taking several seconds, it should now take tens of milliseconds.
2019-04-17 14:30:05 +10:00
Jesse Boyd
0fdc5eafbd
Allow single plot areas to load survival worlds
2019-04-17 13:46:33 +10:00
Jesse Boyd
59f89980a3
Don't need ratio out of 100 anymore
2019-04-17 13:13:56 +10:00
Jesse Boyd
50acf4f51f
Print exception on failed schematic setup
2019-04-13 13:06:21 +10:00
Jesse Boyd
6916752434
Fixes #2322
2019-04-12 12:11:03 +10:00
Jesse Boyd
6cea26f436
Add random collection
2019-04-10 17:10:44 +10:00
Jesse Boyd
533edc5f40
Change default threshold to -1
2019-04-10 17:10:17 +10:00
Jesse Boyd
97903f3870
Fix you are not in a plot area for single plot worlds
2019-04-10 11:34:21 +10:00
Jesse Boyd
9225a13808
sorry for breaking roads
2019-04-09 00:29:13 +10:00
Jesse Boyd
5d515b3863
This shouldn't have been made private
2019-04-06 12:55:45 +11:00
Jesse Boyd
676ef0159a
only change plotY if height not 256
2019-04-06 03:54:27 +11:00
Jesse Boyd
3e3951a3e7
*negate
2019-04-06 02:07:39 +11:00
Jesse Boyd
c71fe00741
Missed this as well
2019-04-06 02:07:14 +11:00
Jesse Boyd
69a029a555
Fix plot schematic y
2019-04-06 01:54:02 +11:00
Sauilitired
3f194f90ce
Unbreakify things
2019-04-04 18:31:47 +02:00
Sauilitired
7e401a83cf
Make PlotLoc's immutable
2019-04-04 18:26:10 +02:00
dordsor21
69b05932eb
Update to gradle 5. gradlew clean assemble build actually WORKS
2019-04-03 17:15:09 +01:00
Sauilitired
f5388b9737
Merge remote-tracking branch 'origin/breaking' into breaking
2019-04-01 17:40:10 +02:00
Sauilitired
6323fb0041
Add plot like/dislikes
2019-04-01 17:39:28 +02:00
Jesse Boyd
b1835f0998
whoops, wrong schematic
2019-04-01 21:45:55 +11:00
Jesse Boyd
1c9c0d0207
Schematic fixes
...
The 1.13 schematic format uses the `.schem` extension, use that instead
Support loading both legacy `.schematic` and `.schem` files for road
schematics
Fix reading road schematics with an offset
2019-04-01 21:39:10 +11:00
Sauilitired
0f8b7cd588
fixes #2211
2019-04-01 11:14:47 +02:00
Sauilitired
c450e4aed3
Fix interval flags ( fixes #2302 )
2019-04-01 10:17:50 +02:00
Sauilitired
14badf8cfc
remove rogue debug message
2019-04-01 09:43:29 +02:00
Sauilitired
df3e78ee40
Make the "Display all commands" message configurable too
2019-04-01 09:04:19 +02:00
Sauilitired
11689bf855
Configurable help categories
2019-04-01 09:00:08 +02:00
Sauilitired
4152582ae0
Fix UUID related NPE
2019-04-01 08:35:06 +02:00
Jesse Boyd
3be7511b7c
Fix genChunk setCuboid
2019-04-01 05:01:32 +11:00
Jesse Boyd
f3adeeac0e
Fix single plot area NPEs & generator stackoverflow
2019-04-01 04:44:18 +11:00
Jesse Boyd
67cf1b45ed
Fix another legacy converter NPE
2019-04-01 04:43:44 +11:00
Jesse Boyd
04b9b67c9d
Fixes #2288
2019-03-31 18:31:16 +11:00
Sauilitired
45360f0979
Make sure /plot home
ignores server owned plots
2019-03-30 13:32:45 +01:00
Sauilitired
ae57264487
Add server-plot flag, and option to disable on-claim teleportation
2019-03-30 13:27:18 +01:00
Sauilitired
08ebf57c90
Add hide-info flag
2019-03-30 12:50:32 +01:00
Sauilitired
c6ae2456f2
Add support for Paper async chunk generation
2019-03-26 09:27:20 +01:00
Sauilitired
0b77b863ba
Update notifications.
2019-03-18 19:49:22 +01:00
matt
61cb288382
oops sorry.
...
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
2019-03-15 13:39:51 -04:00
matt
7f14e88c4c
last commit before 4.0.0
...
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
2019-03-14 21:49:33 -04:00
matt
ed3cadd439
Formatting fixes and minor performance improvement
...
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
2019-03-08 19:25:59 -05:00
matt
56c24a6a56
Type weakening and Direction changes
...
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
2019-03-06 12:47:38 -05:00
matt
4c8457ad14
OCD
...
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
2019-02-22 11:54:13 -05:00
matt
1755272f81
Merge remote-tracking branch 'origin/breaking' into breaking
2019-02-22 11:51:22 -05:00
matt
25530ed7f0
Doc Updates, Renaming, Reformatting, and a Test
...
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
2019-02-22 11:51:06 -05:00
dordsor21
53e732b4fe
Make replacing wall on merge configurable
...
In case people are doing fun things with road schematics etc :)
2019-02-22 15:21:44 +00:00
dordsor21
7aebd9b74b
Set wall filling on merge
2019-02-22 15:11:35 +00:00
dordsor21
be51d8e159
Correct artifact id for maven
2019-02-22 14:38:18 +00:00
matt
bfc6b62213
Stupid docs
...
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
2019-02-21 21:31:12 -05:00
matt
a9bebb10da
Merge remote-tracking branch 'origin/breaking' into breaking
...
# Conflicts:
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEExtent.java
2019-02-21 21:18:03 -05:00
matt
2f18ef6828
Critical bug fixes, reformatting, and cleaning
...
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
2019-02-21 21:14:48 -05:00
dordsor21
350e151214
Don't use streams as they're lower performance for our use cases.
...
Some minor reformating too.
2019-02-20 14:50:49 +00:00
dordsor21
d0a4465985
Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking
2019-02-20 11:55:50 +00:00
dordsor21
0ef8b4ad14
Update to WorldEdit's *breaking* Biome handling changes
2019-02-20 11:55:39 +00:00
matt
c5d9412c6c
Cleaning and API Addition
...
Begins the process of removing "magic values" for directions in the plugin.
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
2019-02-19 22:57:35 -05:00
matt
92718a5ec8
Merge branch 'consumers' into breaking
2019-02-19 22:29:59 -05:00
matt
099a807ce0
CLeaning of code
...
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
2019-02-19 22:29:27 -05:00
matt
df47697ca6
CLeaning of code
...
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
2019-02-19 19:00:37 -05:00
matt
b7aeeb151d
Replace RunnableVal with java Consumer
...
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
2019-02-19 18:39:43 -05:00
matt
a64d764cc1
New API method, more 1.13 entity support, and cleanup.
...
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
2019-02-15 12:50:43 -05:00
dordsor21
477e698f7e
Reformat
2019-02-13 17:13:57 +00:00
matt
11c4a90cc9
Merge remote-tracking branch 'origin/breaking' into breaking
2019-02-13 12:05:42 -05:00
matt
35493662da
Cleanup
...
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
2019-02-13 12:05:28 -05:00
dordsor21
3e8308ecd7
Catch statement already being null
2019-02-13 13:35:19 +00:00
matt
17027e6292
Javadoc changes and cleaning of old unused code
...
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
2019-02-08 14:49:37 -05:00
matt
e891873d28
Cleaning and scope changes
...
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
2019-02-08 11:21:53 -05:00
matt
b39ea1b68b
Cleaning and API clarifications
...
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
2019-02-06 21:29:51 -05:00
matt
3d8179a4e6
Small tweaks
...
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
2019-02-06 17:30:25 -05:00
matt
9101cb9218
PlotComment API tweaks.
...
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
2019-02-06 12:33:14 -05:00
dordsor21
d6a801d854
Reformat
2019-02-06 16:42:27 +00:00
matt
0c780166e0
Documentation and PlotId updates
...
minor code tweaks in the plot class too
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
2019-02-06 00:10:05 -05:00
matt
9a23b718f3
Cleanup of various methods
...
mainly just more lambda's
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
2019-02-05 19:41:03 -05:00
matt
e3d43509cf
Cleanup of some database methods
...
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
2019-02-04 18:00:05 -05:00
matt
dfbcecb081
Removes Cluster Flags
...
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
2019-02-04 12:46:27 -05:00
dordsor21
cf82bc5efb
Revert 8ac9b86
2019-02-04 15:18:50 +00:00
dordsor21
51afbdfcdc
Apply correct codestyle
2019-02-04 13:59:11 +00:00
matt
8ac9b862f8
Major cleanup.
...
Added todo comments to many 1.13 issues still lingering. Changed access to some methods to be weaker. Removed cluster flags (most of it). Java 8 stuff added. Hid more PlotSetting methods. etc.
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
2019-01-31 14:20:48 -05:00
NotMyFault
cd8a1a0816
Fixed some translation mismatches
2019-01-27 00:48:03 +01:00
dordsor21
25ed9d2798
Fix road schematic pasting height
2019-01-23 12:23:05 +00:00
Sauilitired
c96a1afaed
Don't fuck up road schematics, I guess
2019-01-22 21:32:24 +01:00
Sauilitired
344a2afeff
Use StringBuilder, like a sane person
2019-01-22 19:54:31 +01:00
Sauilitired
e54f964eca
Fix #2009
2019-01-22 18:51:13 +01:00
Sauilitired
7e56e47046
Fix block list flag permissions
2019-01-21 17:49:36 +01:00
Sauilitired
7edfc313d6
I did an oopsie
2019-01-21 12:24:34 +01:00
Sauilitired
d37f5b9aa8
Fix schematic pasting offsets
2019-01-21 09:53:04 +01:00
Sauilitired
1fbfc767c4
Use PaperLib and make command task return completable futures
2019-01-21 09:20:33 +01:00
dordsor21
bd797b59fe
Allow disabling of scientific notation (disabled by default) for DoubleFlags
2019-01-20 15:56:49 +00:00
dordsor21
0609b3d7f6
Safer generation of the BlockBucketChunk
2019-01-19 16:28:49 +00:00
dordsor21
ca883c211a
Add merge permission changes from master
2019-01-18 19:02:12 +00:00
dordsor21
ea422b5561
Fix NPE on world initialise
2019-01-17 13:19:24 +00:00
dordsor21
223064567f
Plot analysis ( #2239 )
...
* Start to fix (and may have fixed) plot analysis with block buxkets and 1.13
* Standard deviation ought also be multiplied by 100, and only obtain the BlockBucket array once
* Add schematics to Plot Analysis
Add generateBlockBucketChunk method to SingleWorldGenerator
2019-01-17 01:04:00 +00:00
matt
0817d7de5a
Removed PlotMe converting features.
...
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
2019-01-15 22:19:29 -05:00
dordsor21
0e0a534620
Fix regenallroads extend (height)
2019-01-16 01:55:45 +00:00
dordsor21
61f8ceaaaa
I'm an idiot and left one of my debug messages in
2019-01-16 01:28:07 +00:00
dordsor21
7e6b11a21b
Fix plot swap and have a nicer static AIR block
2019-01-15 23:58:21 +00:00
dordsor21
28c219c694
/plot leave has a terrible description
2019-01-15 16:20:50 +00:00
dordsor21
f679d3f873
Debug not debug
2019-01-14 18:27:20 +00:00
dordsor21
232b7ccfc1
Don't allow debugroadregen on merged plots
2019-01-14 18:15:44 +00:00
dordsor21
44fc8a55ea
Add "kick" meta check in PlotListener
2019-01-14 17:41:28 +00:00
dordsor21
b2d035cf69
Fix deny-exit flag causing plot kick to break
2019-01-14 17:31:22 +00:00
dordsor21
d81d3c72e4
Update scripts and code to work nicely with each other.
...
Fixes #2208
2019-01-12 19:56:11 +00:00
dordsor21
f62777bc1a
Minor:
...
Fix BukkitLegacyMappings method map usage
Move obtaining legacy block to default clause
Task should be async
2019-01-12 18:05:20 +00:00
dordsor21
15ea0f3210
Fix BukkitLegacyMappings having maps the wrong way round & fix PlotBlockListFlag to use PlotBlocks.
...
Fixes #2229
2019-01-12 17:39:29 +00:00
dordsor21
0d76e46fa2
Fix requiring restart for /ps load after /ps save & make descriptions nicer
2019-01-11 12:50:38 +00:00
NotMyFault
222585bf01
Update C.java
2019-01-10 22:21:34 +01:00
NotMyFault
63af0de9f0
Update Settings.java
2019-01-10 22:20:30 +01:00
NotMyFault
5df6f2a13e
Update Download.java
2019-01-10 22:18:28 +01:00
NotMyFault
c5f1c60ad7
Delete base.yml
2019-01-10 22:16:22 +01:00
Sauilitired
3ac7785cc3
Skip empty files in DebugPaste
2019-01-10 21:34:52 +01:00
dordsor21
3bbd97e7e1
Fix PlotDeleteEvent and PlotMergeEvent not being called.
...
Replaced current PlotMergeEvent with PlotAutoMergeEvent (called when a plot is merged on /plot auto). And made PlotMergeEvent be called for /plot merge command.
2019-01-10 17:10:25 +00:00
Sauilitired
e47b4fef20
Remove update and changelog commands
2019-01-10 17:45:40 +01:00
matt
7302480728
Merge branch 'optional' into breaking
2019-01-09 20:01:32 -05:00
NotMyFault
457c520eb6
Fixing debugpaste description
2019-01-09 23:40:08 +01:00
Sauilitired
053edb823d
Use Incendo pasting instead of Hastebin
2019-01-09 23:12:36 +01:00
dordsor21
727d120e70
Regenallroads:
...
- remove the "estimated time" as it's just not remotely correct, nor would it be correct if it were based on actual chunk number
- fix the air to be pasted above the road when using regenallroads
2019-01-09 16:15:34 +00:00
dordsor21
ea01a5171b
Add missing admin unlink permission
2019-01-03 22:36:09 +00:00
dordsor21
77ddeabca2
Fix NPE with plot version (update to new versioning within code)
...
Also add date and commit to plugin.properties file.
2019-01-03 17:32:21 +00:00
matt
e12a7bb85f
Migrated remaining Optionals
2019-01-02 23:15:42 -05:00
matt
c7b9bfeb4b
Migrate from Guava Optionals to Java Optionals
2019-01-02 23:11:26 -05:00
dordsor21
ae9e52f093
Don't dump g_sch
2019-01-02 13:18:20 +00:00
dordsor21
29868bdd29
Fix road generation for roads of even width
2019-01-01 14:43:41 +00:00
Sauilitired
38a382f8e5
Add missing argument to unlink
2019-01-01 00:55:25 +01:00
dordsor21
7bcc4c4ce3
Fix plot move/swap block rotation issue (switch to BaseBlock). Also fix container inventory pasting.
...
Some cleanup.
Fixes #2209
2018-12-31 17:15:47 +00:00
dordsor21
8c52e20736
Use BaseBlocks in regenallroads and minor cleanup of HybridUtils.
...
Fixes #2210
2018-12-31 16:08:09 +00:00
dordsor21
750be6c5fe
clean merge up
2018-12-28 17:03:00 +00:00
Rick Strafy
6292bff7c9
Fix rotation ( #2200 )
...
* Fix rotation
* Clean up some events and utility classes. Try to use as general type
declarations as possible. Add configurable override for the unsafe block checker.
* Treat tridents as a projectile
* Fix rotation and merged with current breaking branch
2018-12-28 09:42:03 +00:00
Sauilitired
12b8ae3eed
Clean up some events and utility classes. Try to use as general type
...
declarations as possible. Add configurable override for the unsafe block checker.
2018-12-28 07:39:39 +01:00
dordsor21
660754511b
Fix rotation of road schematics
2018-12-28 00:47:48 +00:00
dordsor21
2846363a2c
Revert "Use our own schematic readers in only create one input stream, and allow for future customisation of schematics if required/wanted."
...
This reverts commit 3521b8aa22
.
2018-12-27 20:06:02 +00:00
dordsor21
3521b8aa22
Use our own schematic readers in only create one input stream, and allow for future customisation of schematics if required/wanted.
2018-12-27 19:42:56 +00:00
Sauilitired
249b5d4068
Revert dors commit
2018-12-27 17:29:35 +01:00
Sauilitired
76113cb0ab
Allow specifying Y value for default plot home
2018-12-27 16:18:54 +01:00
matt
a529518b91
Minor changes, formatting, comments.
...
One notable thing added was the inclusion of more of the new mobs in one of the events.
2018-12-27 00:46:32 -05:00
Alexander Söderberg
75bcd1adec
Update StringMan.java
2018-12-27 01:31:48 +01:00
dordsor21
fba7eac6d8
Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking
2018-12-26 21:18:38 +00:00
dordsor21
6e127db982
Cleanup
2018-12-26 21:18:22 +00:00
Sauilitired
f1cf541606
Merge remote-tracking branch 'origin/breaking' into breaking
2018-12-26 19:16:42 +01:00
Sauilitired
2b9fe5afda
Fix plot music (and plot inventories)
2018-12-26 19:16:34 +01:00
dordsor21
ba47a21971
- Update code style to format annotations nicely
...
- Reformat code
2018-12-26 17:21:06 +00:00
dordsor21
8cb2bdc846
Nice code to handle schematic loading and remove the ability to debugroadregen a specific chunk, as it uses a completely different method to actual road generation.
2018-12-26 16:44:39 +00:00
Sauilitired
b05316c000
Recommend paper just like FAWE. I want to be like the cool kids.
...
Oh, and fix an issue with `/plot music`. Still broken. Just not
the same kind of broken.
2018-12-26 15:29:39 +01:00
Sauilitired
f1378013c1
Fix plot home
2018-12-26 01:39:49 +01:00
Sauilitired
edc758334c
Actually copy over the files as well...
2018-12-25 18:30:42 +01:00
Sauilitired
beb0f5708f
Whoops...
2018-12-25 18:28:07 +01:00
Sauilitired
71baee063c
Update maven info for Core
2018-12-25 18:27:07 +01:00
dordsor21
c14b76b324
Fix rotational blocks in road generation
2018-12-24 23:14:13 +00:00
dordsor21
af23d3d98e
Fix schematic pasting to paste tile entities and blocks with BlockData (e.g. stairs) properly
2018-12-24 17:56:13 +00:00
Sauilitired
9fe9c2662b
Fix legacy conversion of block lists
2018-12-24 08:57:17 +01:00
Sauilitired
9e0c226632
Fix schematic pasting
2018-12-24 08:13:15 +01:00
Sauilitired
4f43788307
Merge remote-tracking branch 'origin/breaking' into breaking
2018-12-24 01:50:45 +01:00
Sauilitired
8dae2555db
Make mv create
work again
2018-12-24 01:50:17 +01:00
dordsor21
1bf621fb4b
Fix schematic saving (and improve performance slightly)
2018-12-23 22:49:43 +00:00
Sauilitired
2ede77318a
Add dordsor21 to author list
2018-12-23 20:32:48 +01:00
Sauilitired
5c678e86bb
Fix configuration loading issues
2018-12-23 20:31:29 +01:00
Sauilitired
02937cc543
Add configuration conversion and fix BukkitLegacyMappings
2018-12-23 19:43:36 +01:00
Sauilitired
165cac8b13
Fix bStats problem and commit Setup progress
2018-12-23 17:38:27 +01:00
Sauilitired
7900a95b25
Implement LegacyConverter
2018-12-21 22:55:47 +01:00
Sauilitired
fe12d03916
Remove unused classes.
2018-12-21 21:28:33 +01:00
dordsor21
886081e27f
The local build was a fluke, and I couldn't work it out in the last 3 hours, so here are some basic updates/cleanup to a few things, and an updated bui;d command in README.md
2018-12-21 16:26:19 +00:00
dordsor21
e757c3e13c
Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking
2018-12-21 13:39:27 +00:00
dordsor21
5fdb60f85d
Default plot height is at sea level (62)
2018-12-21 13:39:20 +00:00
dordsor21
aaed3f622a
Fix build for gradlew clean assemble build
2018-12-21 13:38:28 +00:00
sauilitired
130274de86
Fix multiverse setup and don't allow unsafe blocks in setup
2018-12-21 03:31:08 +01:00
dordsor21
28f3be56b3
Fix schematic creation
...
Seems fairly ugly, but only because the format requires the blocks be inputted in that exact order, and it prevents us from having to cache the blocks per chunk to then insert into the relevant tags.
2018-12-21 00:49:15 +00:00
dordsor21
c53cd1ec91
oops
2018-12-20 23:34:55 +00:00
dordsor21
90682e9f8b
Various:
...
- Some minor cleanup
- Test for null id, not for null PlotBlock
- Small fixes to schematic saving (still broken)
2018-12-20 23:33:24 +00:00
sauilitired
341e386df8
Delete Collection getBlocks to Array getBlocks
2018-12-20 21:46:00 +01:00
sauilitired
f4140ae728
Add getBlockArray() method
2018-12-20 21:40:50 +01:00
dordsor21
4e10682748
A few minor fixes
2018-12-20 18:46:52 +00:00
sauilitired
096ad1febe
Make sure that blocks are actually compiled. Whoopsie 🐮
2018-12-20 19:35:02 +01:00
dordsor21
1543ac50cd
Various:
...
- Empty StringPlotBlocks are air
- Update signs to 1.13
- Fix getting material in BukktiLocalQueue#setMaterial
2018-12-20 17:20:13 +00:00
sauilitired
568b4c8e85
Merge remote-tracking branch 'origin/breaking' into breaking
...
# Conflicts:
# Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java
# Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
2018-12-20 02:25:55 +01:00
sauilitired
e939b8237e
Changelist:
...
- Added aliases for custom configuration types
- Removed numerical ID based methods in Block Queues
- Fixed sign removal in Plot.java
- (Hopefully) fixed dividing by 0 errors in BlockBucket
- Removed random from some methods, as blockbucket has it's own random
- Temporarily removed chunk analysis
- Changed a lot in GenChunk and BukkitPlotGenerator
2018-12-20 02:23:48 +01:00
dordsor21
cbc2b70336
Merge commit 'be485075993f8dc807595c524f58c3bb58156a0c' into breaking
...
# Conflicts:
# README.md
2018-12-20 00:55:44 +00:00
dordsor21
11ccfe7ac4
Reformat code
2018-12-19 23:26:20 +00:00
dordsor21
fa2dbb2b89
Update to WorldEdit 7 (and WE7-compatible schematics, *hopefully keeping legacy*)
2018-12-19 23:18:57 +00:00
sauilitired
e724aa8caf
Fix PlotItem.
2018-12-19 18:24:35 +01:00
sauilitired
8f23299e7d
Use BlockBuckets everywhere.
2018-12-19 17:19:54 +01:00
dordsor21
361cc9e9f7
Remove old LegacyMappings class from Bukkit
...
Add "fromAny" method
2018-12-19 15:08:49 +00:00
dordsor21
531d8cc706
Merge branch 'breaking' into breaking
2018-12-19 14:54:32 +00:00
dordsor21
4b02bb1df8
Refactor legacy mappings to use PlotBlocks
2018-12-19 14:52:15 +00:00
sauilitired
1d3270d869
BlockBuckets r cool 🐮
2018-12-19 00:01:13 +01:00
sauilitired
af9418552a
Whoops.
2018-12-18 20:58:52 +01:00
sauilitired
10b87f5728
Add mappings for pre initialized items
2018-12-18 20:56:55 +01:00
sauilitired
ccad0bced9
Progress.
2018-12-18 20:54:20 +01:00
sauilitired
fb7bcef05f
1.13 shizzle
2018-12-17 20:57:21 +01:00
NotMyFault
8ad75efa0e
Adding French translation
2018-12-12 16:12:40 +01:00
sauilitired
820710721e
Schematic list command
2018-12-06 18:01:33 +01:00
sauilitired
a4a923c23c
Extract duplicated switch statement in EntityUtil
2018-11-15 00:08:32 +01:00
sauilitired
06f64aeff0
Extract duplicated method declaration
2018-11-15 00:06:20 +01:00
sauilitired
a8b4729845
Rename DBFunc#everyone to DBFunc#EVERYONE, and create two string constants 🐱
2018-11-14 23:51:56 +01:00
sauilitired
3c64376abe
Fix guest gamemode flag.
2018-11-14 23:40:27 +01:00
dordsor21
8cd54929e7
Merge branch 'master' into breaking
...
# Conflicts:
# Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotRateEvent.java
# Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEventUtil.java
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Delete.java
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Kick.java
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Load.java
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Music.java
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Reload.java
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SchematicCmd.java
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java
# Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/GameModeFlag.java
# Core/src/main/java/com/intellectualcrafters/plot/commands/Clear.java
# Core/src/main/java/com/intellectualcrafters/plot/commands/PluginCmd.java
# Core/src/main/java/com/intellectualcrafters/plot/commands/Relight.java
# Core/src/main/java/com/intellectualcrafters/plot/commands/SetHome.java
# Core/src/main/java/com/intellectualcrafters/plot/config/C.java
# Core/src/main/java/com/intellectualcrafters/plot/config/Configuration.java
# Core/src/main/java/com/intellectualcrafters/plot/config/Settings.java
# Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventUtilTest.java
# Nukkit/src/main/java/com/plotsquared/nukkit/util/NukkitEventUtil.java
# README.md
# Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlotRateEvent.java
# Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeSchematicHandler.java
# Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/block/SpongeLocalQueue.java
# Sponge/src/main/java/com/plotsquared/sponge/util/SpongeEventUtil.java
2018-11-14 14:44:07 +00:00
sauilitired
8df7f63931
Refactor PS (and rename to PlotSquared)
2018-11-14 14:19:57 +01:00
sauilitired
16dbbe5244
Refactoring of PS#getPlots:
...
Initialize to HashSet rather than ArrayList, because of add in HashSet
is O(1) vs. add in ArrayList which is O(n). Also make the wrapping
set immutable.
2018-11-14 13:52:09 +01:00
NotMyFault
ae2869a29b
Translation update and fixing wrong lines
2018-11-05 16:00:44 +01:00
NotMyFault
302051a6ca
Minor cleanup
2018-10-20 14:03:21 +02:00
Jesse Boyd
b6d4872ca4
Merge pull request #2102 from dordsor21/master
...
Add PlotChangeOwner Event
2018-10-13 15:11:45 +11:00
NotMyFault
4b7ca2ff37
Minor cleanup
2018-10-10 18:29:21 +02:00
NotMyFault
1734c0e357
Rename ko_KR.yml to ko-KR.yml
2018-10-10 16:52:35 +02:00
NotMyFault
e2e34f24d6
Rename zh_CN.yml to zh-CN.yml
2018-10-10 16:51:43 +02:00
NotMyFault
765db2df0c
Added languages 'back'
2018-10-10 16:49:31 +02:00
NotMyFault
e1e6d95f75
Merge pull request #2049 from f0rb1d/master
...
Updated Simplified Chinese translation and formalized language codes.
2018-10-10 16:40:52 +02:00
NotMyFault
70584a338c
Update PS.java
2018-10-10 16:38:01 +02:00
NotMyFault
11e2777f60
Update PS.java
2018-10-10 16:36:14 +02:00
NotMyFault
b6303a7615
Update PS.java
2018-10-10 16:33:03 +02:00