Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-12-28 17:38:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix debugpaste with multiverse

Browse Source
This commit is contained in:
dordsor21 2020-12-28 12:31:51 +00:00
parent 2b9a194244
commit ef215b1b0c
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Bukkit/build.gradle
View File

@ -99,7 +99,7 @@ shadowJar {
include(dependency("org.bstats:bstats-bukkit:1.7"))
include(dependency("org.khelekore:prtree:1.7.0-SNAPSHOT"))
include(dependency("com.sk89q:squirrelid:1.0.0-SNAPSHOT"))
include(dependency("com.intellectualsites.paster:Paster:1.0.1-SNAPSHOT"))
include(dependency("com.intellectualsites.paster:Paster:1.0.2-SNAPSHOT"))
}
relocate('net.kyori.text', 'com.plotsquared.formatting.text')
relocate("io.papermc.lib", "com.plotsquared.bukkit.paperlib")

4
Core/build.gradle
View File

@ -18,7 +18,7 @@ dependencies {
implementation("org.jetbrains.kotlin:kotlin-stdlib:1.4.0")
implementation("org.jetbrains:annotations:20.1.0")
implementation("org.khelekore:prtree:1.7.0-SNAPSHOT")
implementation("com.intellectualsites.paster:Paster:1.0.1-SNAPSHOT"){ transitive = false }
implementation("com.intellectualsites.paster:Paster:1.0.2-SNAPSHOT"){ transitive = false }
}
sourceCompatibility = 1.8
@ -77,7 +77,7 @@ shadowJar {
include(dependency("net.kyori:text-serializer-legacy:3.0.2"))
include(dependency("net.kyori:text-serializer-plain:3.0.2"))
include(dependency("org.khelekore:prtree:1.7.0-SNAPSHOT"))
include(dependency("com.intellectualsites.paster:Paster:1.0.1-SNAPSHOT"))
include(dependency("com.intellectualsites.paster:Paster:1.0.2-SNAPSHOT"))
}
relocate('net.kyori.text', 'com.plotsquared.formatting.text')
relocate("org.json", "com.plotsquared.json") {

2
Core/pom.xml
View File

@ -101,7 +101,7 @@
<dependency>
<groupId>com.intellectualsites.paster</groupId>
<artifactId>Paster</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.0.2-SNAPSHOT</version>
<scope>runtime</scope>
<exclusions>
<exclusion>

2
Core/src/main/java/com/plotsquared/core/command/DebugPaste.java
View File

@ -141,7 +141,7 @@ public class DebugPaste extends SubCommand {
try {
final File MultiverseWorlds = new File(PlotSquared.get().IMP.getDirectory(),
"../Multiverse-Core/worlds.yml");
incendoPaster.addFile(MultiverseWorlds);
incendoPaster.addFile(MultiverseWorlds, "Multiverse-Core/worlds.yml");
} catch (final IOException ignored) {
MainUtil.sendMessage(player,
"&cSkipping Multiverse worlds.yml because the plugin is not in use");