diff --git a/build.gradle b/build.gradle index 8e05d280..43088309 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ ext { date = git.head().date.format("yy.MM.dd") revision = "-${git.head().abbreviatedId}" parents = git.head().parentIds; - index = -91; // Offset to match CI + index = -92; // Offset to match CI int major, minor, patch; major = minor = patch = 0; for (;parents != null && !parents.isEmpty();index++) { @@ -81,7 +81,7 @@ subprojects { mavenCentral() maven { url = "https://mvnrepository.com/artifact/"} maven {url "http://ci.emc.gs/nexus/content/groups/aikar/" } - maven {url "http://ci.regularbox.com/plugin/repository/everything/"} + maven {url "http://ci.mengcraft.com:8080/plugin/repository/everything/"} maven {url "http://ci.athion.net/job/PlotSquared/ws/mvn/"} maven {url "http://empcraft.com/maven2"} maven {url "https://hub.spigotmc.org/nexus/content/groups/public/"} diff --git a/bukkit/build.gradle b/bukkit/build.gradle index a05b954a..e3f0a388 100644 --- a/bukkit/build.gradle +++ b/bukkit/build.gradle @@ -5,7 +5,7 @@ dependencies { compile project(':core') compile 'org.bukkit.craftbukkitv1_10:craftbukkitv1_10:1.10' compile 'org.bukkit.craftbukkitv1_11:Craftbukkit:1.11' - compile 'org.bukkit.craftbukkitv1_12_P2:Craftbukkit:1.12' + compile 'org.bukkit.craftbukkitv1_12:Craftbukkit:1.12' compile 'net.milkbowl.vault:VaultAPI:1.5' compile 'com.massivecraft:factions:2.8.0' compile 'com.drtshock:factions:1.6.9.5' diff --git a/core/build.gradle b/core/build.gradle index 834dc4fd..51ead323 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -36,14 +36,20 @@ task createPom << { artifactId 'fawe-api' version project.parent.version } - }.writeTo("../mvn/com/boydti/fawe-api/${project.parent.version}/fawe-api-${project.parent.version}.pom") + } + .getEffectivePom() + .setDependencies(new ArrayList<>()) + .writeTo("../mvn/com/boydti/fawe-api/${project.parent.version}/fawe-api-${project.parent.version}.pom") pom { project { groupId 'com.boydti' artifactId 'fawe-api' version 'latest' } - }.writeTo("../mvn/com/boydti/fawe-api/latest/fawe-api-latest.pom") + } + .getEffectivePom() + .setDependencies(new ArrayList<>()) + .writeTo("../mvn/com/boydti/fawe-api/latest/fawe-api-latest.pom") } task copyFiles { diff --git a/core/src/main/java/com/sk89q/worldedit/command/OptionsCommands.java b/core/src/main/java/com/sk89q/worldedit/command/OptionsCommands.java index 5665efdf..eb11d434 100644 --- a/core/src/main/java/com/sk89q/worldedit/command/OptionsCommands.java +++ b/core/src/main/java/com/sk89q/worldedit/command/OptionsCommands.java @@ -117,7 +117,7 @@ public class OptionsCommands { ) @CommandPermissions("worldedit.global-mask") public void gsmask(Player player, LocalSession session, EditSession editSession, @Optional CommandContext context) throws WorldEditException { - if (context.argsLength() == 0) { + if (context == null || context.argsLength() == 0) { session.setSourceMask((Mask) null); BBC.SOURCE_MASK_DISABLED.send(player); } else { @@ -141,7 +141,7 @@ public class OptionsCommands { ) @CommandPermissions("worldedit.global-trasnform") public void gtransform(Player player, EditSession editSession, LocalSession session, @Optional CommandContext context) throws WorldEditException { - if (context.argsLength() == 0) { + if (context == null || context.argsLength() == 0) { session.setTransform(null); BBC.TRANSFORM_DISABLED.send(player); } else { diff --git a/gradle.properties b/gradle.properties index 2a8b685e..946ab8e4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ #org.gradle.java.home=C:/PROGRA~2/Java/jdk1.7.0_79 #org.gradle.java.home=C:/PROGRA~1/Java/jdk1.8.0_51 -org.gradle.daemon=false +org.gradle.daemon=true org.gradle.configureondemand=true org.gradle.parallel=true \ No newline at end of file diff --git a/nukkit/build.gradle b/nukkit/build.gradle index 50de8775..bdc3cd6c 100644 --- a/nukkit/build.gradle +++ b/nukkit/build.gradle @@ -4,7 +4,7 @@ repositories { dependencies { compile project(':core') compile 'cn.nukkit:nukkit:1.0-SNAPSHOT' - compile name: 'worldedit-core-6.1.4-SNAPSHOT-dist' + compile name: 'worldedit-core-6.1.4-SNAPSHOT-dist', changing: true } processResources {