From 770b9be1607207412915d550161a71d27e88d4ea Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Mon, 25 Jul 2016 09:23:20 +1000
Subject: [PATCH] Minor uuid cache changes

---
 .../java/com/plotsquared/bukkit/uuid/FileUUIDHandler.java  | 3 +--
 .../sponge/generator/SpongeAugmentedGenerator.java         | 7 ++++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/FileUUIDHandler.java b/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/FileUUIDHandler.java
index e9733c952..a7c048572 100644
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/FileUUIDHandler.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/FileUUIDHandler.java
@@ -80,8 +80,8 @@ public class FileUUIDHandler extends UUIDHandlerImplementation {
                         e.printStackTrace();
                     }
                 }
+                HashBiMap<StringWrapper, UUID> toAdd = HashBiMap.create(new HashMap<StringWrapper, UUID>());
                 if (Settings.UUID.NATIVE_UUID_PROVIDER) {
-                    HashBiMap<StringWrapper, UUID> toAdd = HashBiMap.create(new HashMap<StringWrapper, UUID>());
                     HashSet<UUID> all = UUIDHandler.getAllUUIDS();
                     PS.debug("&aFast mode UUID caching enabled!");
                     File playerDataFolder = new File(container, world + File.separator + "playerdata");
@@ -124,7 +124,6 @@ public class FileUUIDHandler extends UUIDHandlerImplementation {
                         PS.debug("Failed to cache: " + all.size() + " uuids - slowly processing all files");
                     }
                 }
-                HashBiMap<StringWrapper, UUID> toAdd = HashBiMap.create(new HashMap<StringWrapper, UUID>());
                 HashSet<String> worlds = Sets.newHashSet(world, "world");
                 HashSet<UUID> uuids = new HashSet<>();
                 HashSet<String> names = new HashSet<>();
diff --git a/Sponge/src/main/java/com/plotsquared/sponge/generator/SpongeAugmentedGenerator.java b/Sponge/src/main/java/com/plotsquared/sponge/generator/SpongeAugmentedGenerator.java
index f71317949..99660f1a9 100644
--- a/Sponge/src/main/java/com/plotsquared/sponge/generator/SpongeAugmentedGenerator.java
+++ b/Sponge/src/main/java/com/plotsquared/sponge/generator/SpongeAugmentedGenerator.java
@@ -4,9 +4,12 @@ import com.flowpowered.math.vector.Vector3i;
 import com.intellectualcrafters.plot.generator.AugmentedUtils;
 import com.intellectualcrafters.plot.object.PlotBlock;
 import com.intellectualcrafters.plot.util.block.DelegateLocalBlockQueue;
+import com.plotsquared.sponge.SpongeMain;
 import com.plotsquared.sponge.util.SpongeUtil;
 import java.util.List;
 import org.spongepowered.api.block.BlockState;
+import org.spongepowered.api.event.cause.Cause;
+import org.spongepowered.api.event.cause.NamedCause;
 import org.spongepowered.api.world.World;
 import org.spongepowered.api.world.extent.ImmutableBiomeArea;
 import org.spongepowered.api.world.extent.MutableBlockVolume;
@@ -33,6 +36,8 @@ public class SpongeAugmentedGenerator implements GenerationPopulator {
         populators.add(generator);
         return generator;
     }
+
+    private Cause cause = Cause.of(NamedCause.of("PlotSquared", SpongeMain.THIS));
     
     @Override
     public void populate(World world, MutableBlockVolume terrain, ImmutableBiomeArea biome) {
@@ -44,7 +49,7 @@ public class SpongeAugmentedGenerator implements GenerationPopulator {
         AugmentedUtils.generate(world.getName(), cx, cz, new DelegateLocalBlockQueue(null) {
             @Override
             public boolean setBlock(int x, int y, int z, int id, int data) {
-                terrain.setBlock(bx + x, y, bz + z, SpongeUtil.getBlockState(id, data));
+                terrain.setBlock(bx + x, y, bz + z, SpongeUtil.getBlockState(id, data), cause);
                 return true;
             }