diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle index 1d03fd0f8..1732ebb8b 100644 --- a/Bukkit/build.gradle +++ b/Bukkit/build.gradle @@ -11,10 +11,10 @@ repositories { dependencies { implementation project(':Core') compile project(':Core') - compile 'com.destroystokyo.paper:paper-api:1.14.1-R0.1-SNAPSHOT' + compile 'com.destroystokyo.paper:paper-api:1.14.3-R0.1-SNAPSHOT' //implementation 'com.onarandombox.multiversecore:Multiverse-Core:3.0.0-SNAPSHOT' - implementation 'org.spigotmc:spigot-api:1.14.1-R0.1-SNAPSHOT' - compile(group: 'com.sk89q.worldedit', name: 'worldedit-bukkit', version: '7.0.0-SNAPSHOT') + implementation 'org.spigotmc:spigot-api:1.14.3-R0.1-SNAPSHOT' + compile(group: 'com.sk89q.worldedit', name: 'worldedit-bukkit', version: '7.0.0') compile("net.milkbowl.vault:VaultAPI:1.7") { exclude module: 'bukkit' } diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java index 2217c7eff..44c262b10 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java @@ -7,6 +7,7 @@ import com.github.intellectualsites.plotsquared.plot.object.PlotBlock; import com.github.intellectualsites.plotsquared.plot.object.StringPlotBlock; import com.github.intellectualsites.plotsquared.plot.util.LegacyMappings; import com.github.intellectualsites.plotsquared.plot.util.StringComparison; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -15,6 +16,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.stream.Collectors; + import lombok.AccessLevel; import lombok.EqualsAndHashCode; import lombok.Getter; @@ -769,7 +771,9 @@ public final class BukkitLegacyMappings extends LegacyMappings { idDataPair = new IdDataPair(Integer.parseInt(string), 0); } PlotBlock plotBlock; - if (NEW_STRING_TO_LEGACY_PLOT_BLOCK.keySet().contains(workingString.toLowerCase())) { + if (Material.matchMaterial(workingString) != null) { + return PlotBlock.get(workingString); + } else if (NEW_STRING_TO_LEGACY_PLOT_BLOCK.keySet().contains(workingString.toLowerCase())) { return PlotBlock.get(workingString); } else if ((plotBlock = fromLegacyToString(idDataPair)) != null) { return plotBlock; diff --git a/build.gradle b/build.gradle index c96224e82..ce53e06c8 100644 --- a/build.gradle +++ b/build.gradle @@ -62,7 +62,7 @@ subprojects { } dependencies { - implementation('com.sk89q.worldedit:worldedit-core:7.0.0-SNAPSHOT') { + implementation('com.sk89q.worldedit:worldedit-core:7.0.0') { exclude(module: 'bukkit-classloader-check') exclude(module: 'mockito-core') exclude(module: 'dummypermscompat')