Minor improvements to the server side CUI

EngineHub · Dec 26, 2018 · a88f6b8 · a88f6b8
1 parent 4cc8e9a
commit a88f6b8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java b/worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java
@@ -657,23 +657,25 @@ public void updateServerCUI(Actor actor) {
             return; // If it's not enabled, ignore this.
         }
 
-        // Remove the old block.
-        if (cuiTemporaryBlock != null) {
-            player.sendFakeBlock(cuiTemporaryBlock, null);
-            cuiTemporaryBlock = null;
-        }
-
         BaseBlock block = ServerCUIHandler.createStructureBlock(player);
         if (block != null) {
             // If it's null, we don't need to do anything. The old was already removed.
             Map<String, Tag> tags = block.getNbtData().getValue();
-            cuiTemporaryBlock = BlockVector3.at(
+            BlockVector3 tempCuiTemporaryBlock = BlockVector3.at(
                     ((IntTag) tags.get("x")).getValue(),
                     ((IntTag) tags.get("y")).getValue(),
                     ((IntTag) tags.get("z")).getValue()
             );
-
+            if (cuiTemporaryBlock != null && !tempCuiTemporaryBlock.equals(cuiTemporaryBlock)) {
+                // Update the existing block if it's the same location
+                player.sendFakeBlock(cuiTemporaryBlock, null);
+            }
+            cuiTemporaryBlock = tempCuiTemporaryBlock;
             player.sendFakeBlock(cuiTemporaryBlock, block);
+        } else if (cuiTemporaryBlock != null) {
+            // Remove the old block
+            player.sendFakeBlock(cuiTemporaryBlock, null);
+            cuiTemporaryBlock = null;
         }
     }
 
@@ -713,10 +715,8 @@ public void dispatchCUISetup(Actor actor) {
     public void dispatchCUISelection(Actor actor) {
         checkNotNull(actor);
 
-        if (!hasCUISupport) {
+        if (!hasCUISupport && useServerCUI) {
-            if (useServerCUI) {
+            updateServerCUI(actor);
-                updateServerCUI(actor);
-            }
             return;
         }
 

diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/CuboidRegionSelector.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/CuboidRegionSelector.java
@@ -228,6 +228,8 @@ public void learnChanges() {
     public void clear() {
         position1 = null;
         position2 = null;
+        region.setPos1(BlockVector3.ZERO);
+        region.setPos2(BlockVector3.ZERO);
     }
 
     @Override