various

use vector.add for compatibility with vs-flattened
flush before remember
share meta objects across players
fix wg compatibility

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

@@ -62,6 +62,7 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
 
 public class BukkitPlayer extends AbstractPlayerActor {
 
@@ -69,18 +70,31 @@ public class BukkitPlayer extends AbstractPlayerActor {
     private WorldEditPlugin plugin;
 
     public BukkitPlayer(Player player) {
-        this(WorldEditPlugin.getInstance(), player);
-        Fawe.debug("Should not construct BukkitPlayer. Instead use BukkitAdapter.adapt(player)");
+        super(getExistingMap(WorldEditPlugin.getInstance(), player));
+        this.plugin = WorldEditPlugin.getInstance();
+        this.player = player;
     }
 
     public BukkitPlayer(WorldEditPlugin plugin, Player player) {
         this.plugin = plugin;
         this.player = player;
+        init();
+    }
+
+    private void init() {
         if (Settings.IMP.CLIPBOARD.USE_DISK) {
             loadClipboardFromDisk();
         }
     }
 
+    private static Map<String, Object> getExistingMap(WorldEditPlugin plugin, Player player) {
+        BukkitPlayer cached = plugin.getCachedPlayer(player);
+        if (cached != null) {
+            return cached.getRawMeta();
+        }
+        return new ConcurrentHashMap<>();
+    }
+
     @Override
     public UUID getUniqueId() {
         return player.getUniqueId();

worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/SimpleInjector.java

@@ -0,0 +1,53 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.minecraft.util.commands;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+
+public class SimpleInjector implements Injector {
+
+    private static final Logger log = LoggerFactory.getLogger(SimpleInjector.class);
+    private Object[] args;
+    private Class<?>[] argClasses;
+
+    public SimpleInjector(Object... args) {
+        this.args = args;
+        argClasses = new Class[args.length];
+        for (int i = 0; i < args.length; ++i) {
+            argClasses[i] = args[i].getClass();
+        }
+    }
+
+    @Override
+    public Object getInstance(Class<?> clazz) {
+        try {
+            Constructor<?> ctr = clazz.getConstructor(argClasses);
+            ctr.setAccessible(true);
+            return ctr.newInstance(args);
+        } catch (NoSuchMethodException | IllegalAccessException | InstantiationException | InvocationTargetException e) {
+            log.error("Error initializing commands class " + clazz, e);
+            return null;
+        }
+    }
+}

worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/AbstractPlayerActor.java

@@ -81,7 +81,15 @@ import org.jetbrains.annotations.NotNull;
  */
 public abstract class AbstractPlayerActor implements Actor, Player, Cloneable {
 
-    private final ConcurrentHashMap<String, Object> meta = new ConcurrentHashMap<>();
+    private final Map<String, Object> meta;
+
+    public AbstractPlayerActor(Map<String, Object> meta) {
+        this.meta = meta;
+    }
+
+    public AbstractPlayerActor() {
+        this(new ConcurrentHashMap<>());
+    }
 
     @Override
     public Map<String, Object> getRawMeta() {

worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformCommandManager.java

@@ -727,14 +727,13 @@ public final class PlatformCommandManager {
             if (context instanceof MemoizingValueAccess) {
                 context = ((MemoizingValueAccess) context).snapshotMemory();
             } else {
-                System.out.println("Invalid context " + context);
             }
             Optional<EditSession> editSessionOpt = context.injectedValue(Key.of(EditSession.class));
 
             if (editSessionOpt.isPresent()) {
                 EditSession editSession = editSessionOpt.get();
-                session.remember(editSession);
                 editSession.flushQueue();
+                session.remember(editSession);
 
                 long time = System.currentTimeMillis() - start;
                 if (time > 1000) {

worldedit-core/src/main/java/com/sk89q/worldedit/math/BlockVector3.java

@@ -779,4 +779,9 @@ public abstract class BlockVector3 {
         return "(" + getX() + ", " + getY() + ", " + getZ() + ")";
     }
 
+    //Used by VS fork
+    public BlockVector3 plus(BlockVector3 other) {
+        return add(other);
+    }
+
 }