Merge branch 'master' into breaking

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,30 @@
+# Bug report for FastAsyncWorldEdit 1.13.2
+<!--- If you are using 1.13 or 1.13.1 consider updating to 1.13.2 before raising an issue -->
+<!--- In order to create a valid issue report you have to follow this template. -->
+<!--- Remove this template if making a suggestion or asking a question. -->
+<!--- Incomplete reports might be marked as invalid. -->
+**[REQUIRED] FastAsyncWorldEdit Version Number:** 
+<!--- Enter /fawe version in game or in your console and copy the full output here -->
+
+**[REQUIRED] Spigot/Paper Version Number:** 
+<!--- Enter /version ingame or in your console and paste the full output here -->
+
+**Links to config.yml and config-legacy.yml file:** 
+<!--- Copy and paste the information to the service of your choosing (pastebin, hasteb.in e.g) and provide the link here. -->
+
+**[REQUIRED] Description of the problem:**
+<!--- Check your console for errors while testing -->
+<!--- Include relevant information like errors or a picture of the problem -->
+
+**Plugins being used on the server:**
+<!--- Optional but recommended to look further into an issue --->
+
+**How to replicate**:
+<!--- If you can reproduce the issue please tell us as detailed as possible step by step how to do that -->
+
+**Checklist**:
+<!--- Make sure you've completed the following steps (put an "X" between of brackets): -->
+- [] I included all information required in the sections above
+- [] I made sure there are no duplicates of this report [(Use Search)](https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13/issues?utf8=%E2%9C%93&q=is%3Aissue)
+- [] I made sure I am using an up-to-date version of [FastAsyncWorldEdit for 1.13.2](https://ci.athion.net/job/FastAsyncWorldEdit-Breaking/)
+- [] I made sure the bug/error is not caused by any other plugin

.gitignore

@@ -23,3 +23,4 @@ lib/
 worldedit-bukkit/src/main/java/ignore/*
 todo.txt
 mvn/*
+docs/

ISSUE_TEMPLATE.md

@@ -1,19 +0,0 @@
-# Bug report for FastAsyncWorldEdit 1.13.x
-<!--- Follow this template if reporting an issue. -->
-<!--- Remove this template if making a suggestion or asking a question. -->
-<!--- Please comment or react to an existing ticket if it exists -->
-**Debug paste link**:
-<!--- Enter /fawe debugpaste in game or in your console and copy the output here -->
-
-**Description of the problem:**
-<!--- Include relevant info like errors or a picture of the problem -->
-
-**How to replicate**:
-<!--- If you can reproduce the issue please tell us as detailed as possible step by step how to do that -->
-
-**Checklist**:
-<!--- Make sure you've completed the following steps (put an "X" between of brackets): -->
-- [] I included a `/fawe debugpaste` link
-- [] I made sure there aren't duplicates of this report [(Use Search)](https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13/issues?utf8=%E2%9C%93&q=is%3Aissue)
-- [] I made sure I am using an up-to-date version of [FAWE for 1.13.x](https://ci.athion.net/job/FastAsyncWorldEdit-1.13/)
-- [] I made sure the bug/error is not caused by any other plugin

README.md

@@ -15,13 +15,15 @@ FAWE is a fork of WorldEdit that has huge speed and memory improvements and cons
 
 ## Downloads
 ### 1.13+
-* [Download](https://incendo.org/download/)
-* [Jenkins](https://ci.athion.net/job/FastAsyncWorldEdit-1.13/)
+* [Download](https://empcraft.com/fawe/download/)
+* [Jenkins](https://ci.athion.net/job/FastAsyncWorldEdit-Breaking/)
+* [JavaDoc](https://ci.athion.net/job/FastAsyncWorldEdit-1.13/javadoc/)
 
 ### < 1.12.2
-* [Download](https://incendo.org/download/)
+* [Download](https://empcraft.com/fawe/download/?bukkit)
 * [Jenkins](https://ci.athion.net/job/FastAsyncWorldEdit/)
 * [Repository](https://github.com/boy0001/FastAsyncWorldedit)
+* [JavaDoc](https://ci.athion.net/job/FastAsyncWorldEdit/javadoc/)
 
 
 ## Building

build.gradle

@@ -85,6 +85,7 @@ subprojects {
         maven {url "http://repo.dmulloy2.net/content/groups/public/"}
         maven {url "https://repo.destroystokyo.com/repository/maven-public//"}
         maven {url "http://ci.athion.net/job/PlotSquared-Breaking/ws/mvn/"}
+        maven { url "https://libraries.minecraft.net" }
         mavenLocal()
         maven {url "http://empcraft.com/maven2"}
         maven {url "https://hub.spigotmc.org/nexus/content/groups/public/"}
@@ -127,3 +128,21 @@ subprojects {
     //    include '**/*.java'
     //}
 }
+task aggregatedJavadocs(type: Javadoc, description: 'Generate javadocs from all child projects as if it was a single project', group: 'Documentation') {
+    destinationDir = file("./docs/javadoc")
+    title = "$project.name $version API"
+    options.author true
+    options.links 'http://docs.spring.io/spring/docs/4.3.x/javadoc-api/', 'http://docs.oracle.com/javase/8/docs/api/', 'http://docs.spring.io/spring-ws/docs/2.3.0.RELEASE/api/', 'http://docs.spring.io/spring-security/site/docs/4.0.4.RELEASE/apidocs/'
+    options.addStringOption('Xdoclint:none', '-quiet')
+
+    delete "./docs"
+
+    subprojects.each { proj ->
+        proj.tasks.withType(Javadoc).each { javadocTask ->
+            source += javadocTask.source
+            classpath += javadocTask.classpath
+            excludes += javadocTask.excludes
+            includes += javadocTask.includes
+        }
+    }
+}

worldedit-core/build.gradle

@@ -23,6 +23,7 @@ dependencies {
     compile ("com.github.intellectualsites.plotsquared:PlotSquared-API:latest") {
         transitive = false
     }
+    compile 'com.mojang:datafixerupper:1.0.20'
     compile 'com.github.luben:zstd-jni:1.1.1'
     compile 'co.aikar:fastutil-lite:1.0'
 }

worldedit-core/src/main/java/com/boydti/fawe/util/BrushCache.java

@@ -77,8 +77,11 @@ public final class BrushCache {
         Map<String, Tag> map;
         if (nbt == null) {
             if (tool == null) {
-                item.setNbtData(null);
-                return tool;
+                Map<String, Object> raw = nbt.getRaw();
+                if (raw.remove("weBrushJson") != null && raw.isEmpty()) {
+                    item.setNbtData(null);
+                }
+                return null;
             }
             nbt = new CompoundTag(map = new HashMap<>());
         } else {