Upstream
/
WorldGuard
mirror of https://github.com/EngineHub/WorldGuard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

deps: Update Paper to 1.20, snakeyml to 2.0

This commit is contained in:
Joo200 2023-06-08 20:55:11 +02:00
parent 2c448f1ba2
commit 16887c8540
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
worldguard-bukkit/build.gradle.kts
View File

@ -20,8 +20,8 @@ configurations {
dependencies { dependencies {
"api"(project(":worldguard-core")) "api"(project(":worldguard-core"))
"compileOnly"("io.papermc.paper:paper-api:1.19.3-R0.1-SNAPSHOT") "compileOnly"("io.papermc.paper:paper-api:1.20-R0.1-SNAPSHOT")
"runtimeOnly"("org.spigotmc:spigot-api:1.19.3-R0.1-SNAPSHOT") { "runtimeOnly"("org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT") {
exclude("junit", "junit") exclude("junit", "junit")
} }
"api"("com.sk89q.worldedit:worldedit-bukkit:${Versions.WORLDEDIT}") { isTransitive = false } "api"("com.sk89q.worldedit:worldedit-bukkit:${Versions.WORLDEDIT}") { isTransitive = false }

2
worldguard-core/build.gradle.kts
View File

@ -8,7 +8,7 @@ dependencies {
"api"(project(":worldguard-libs:core")) "api"(project(":worldguard-libs:core"))
"api"("com.sk89q.worldedit:worldedit-core:${Versions.WORLDEDIT}") "api"("com.sk89q.worldedit:worldedit-core:${Versions.WORLDEDIT}")
"implementation"("org.flywaydb:flyway-core:3.0") "implementation"("org.flywaydb:flyway-core:3.0")
"implementation"("org.yaml:snakeyaml:1.33") "implementation"("org.yaml:snakeyaml:2.0")
"implementation"("com.google.guava:guava:${Versions.GUAVA}") "implementation"("com.google.guava:guava:${Versions.GUAVA}")
"compileOnly"("com.google.code.findbugs:jsr305:${Versions.FINDBUGS}") "compileOnly"("com.google.code.findbugs:jsr305:${Versions.FINDBUGS}")

5
worldguard-core/src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/SQLRegionDatabase.java
View File

@ -32,6 +32,7 @@ import com.sk89q.worldguard.util.io.Closer;
import com.sk89q.worldguard.util.sql.DataSourceConfig; import com.sk89q.worldguard.util.sql.DataSourceConfig;
import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.DumperOptions.FlowStyle; import org.yaml.snakeyaml.DumperOptions.FlowStyle;
import org.yaml.snakeyaml.LoaderOptions;
import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.SafeConstructor; import org.yaml.snakeyaml.constructor.SafeConstructor;
import org.yaml.snakeyaml.representer.Representer; import org.yaml.snakeyaml.representer.Representer;
@ -191,11 +192,11 @@ class SQLRegionDatabase implements RegionDatabase {
DumperOptions options = new DumperOptions(); DumperOptions options = new DumperOptions();
options.setIndent(2); options.setIndent(2);
options.setDefaultFlowStyle(FlowStyle.FLOW); options.setDefaultFlowStyle(FlowStyle.FLOW);
Representer representer = new Representer(); Representer representer = new Representer(options);
representer.setDefaultFlowStyle(FlowStyle.FLOW); representer.setDefaultFlowStyle(FlowStyle.FLOW);
// We have to use this in order to properly save non-string values // We have to use this in order to properly save non-string values
return new Yaml(new SafeConstructor(), new Representer(), options); return new Yaml(new SafeConstructor(new LoaderOptions()), representer, options);
} }
@Override @Override