Fix persistent brushes

worldedit-bukkit/build.gradle

@@ -35,14 +35,12 @@ dependencies {
 
 processResources {
     from (sourceSets.main.resources.srcDirs) {
-        expand 'version': project.internalVersion
+        expand 'internalVersion': project.internalVersion
         include 'plugin.yml'
-        include 'fawe.properties'
     }
 
     from (sourceSets.main.resources.srcDirs) {
         exclude 'plugin.yml'
-        exclude 'fawe.properties'
     }
 }
 

worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/util/ItemUtil.java

@@ -47,6 +47,8 @@ public class ItemUtil {
         return null;
     }
 
+
+
     public CompoundTag getNBT(ItemStack item) {
         try {
             if (!item.hasItemMeta()) return null;

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitAdapter.java

@@ -349,9 +349,7 @@ public class BukkitAdapter {
      */
     public static BaseItemStack adapt(ItemStack itemStack) {
         checkNotNull(itemStack);
-
-
-        return new BaseItemStack(ItemTypes.get(itemStack.getType().getKey().toString()), itemStack.getAmount());
+        return new BukkitItemStack(itemStack);
     }
 
     /**
@@ -362,6 +360,7 @@ public class BukkitAdapter {
      */
     public static ItemStack adapt(BaseItemStack item) {
         checkNotNull(item);
+        if (item instanceof BukkitItemStack) return ((BukkitItemStack) item).getBukkitItemStack();
         return new ItemStack(adapt(item.getType()), item.getAmount());
     }
 

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitItemStack.java

@@ -13,6 +13,7 @@ import javax.annotation.Nullable;
 
 public class BukkitItemStack extends BaseItemStack {
     private ItemStack stack;
+    private Object nativeItem;
     private boolean loadedNBT;
 
     public BukkitItemStack(ItemStack stack) {
@@ -33,7 +34,23 @@ public class BukkitItemStack extends BaseItemStack {
     @Nullable
     @Override
     public Object getNativeItem() {
-        return super.getNativeItem();
+        ItemUtil util = Fawe.<FaweBukkit>imp().getItemUtil();
+        if (util != null && nativeItem == null) {
+            return nativeItem = util.getNMSItem(stack);
+        }
+        return nativeItem;
+    }
+
+    public ItemStack getBukkitItemStack() {
+        return stack;
+    }
+
+    @Override
+    public boolean hasNbtData() {
+        if (!loadedNBT) {
+            return stack.hasItemMeta();
+        }
+        return super.hasNbtData();
     }
 
     @Nullable
@@ -54,6 +71,7 @@ public class BukkitItemStack extends BaseItemStack {
         ItemUtil util = Fawe.<FaweBukkit>imp().getItemUtil();
         if (util != null) {
             stack = util.setNBT(stack, nbtData);
+            nativeItem = null;
         }
         super.setNbtData(nbtData);
     }

worldedit-bukkit/src/main/resources/plugin.yml

@@ -1,6 +1,6 @@
 name: WorldEdit
 main: com.sk89q.worldedit.bukkit.WorldEditPlugin
-version: "${version}"
+version: "${internalVersion}"
 api-version: 1.13
 description: Fast Async WorldEdit plugin
 authors: [Empire92]