Merge branch 'master' into breaking

This commit is contained in:
Jesse Boyd
2019-05-13 00:41:28 +10:00
7 changed files with 63 additions and 26 deletions

View File

@ -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'
}

View File

@ -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 {