From fae44ffaf2e1b8ad919c2ec17f03f6758087a263 Mon Sep 17 00:00:00 2001 From: wizjany Date: Sat, 29 Jun 2019 07:49:09 -0400 Subject: [PATCH] Re-send type id for cuboid CUI. Works like poly CUI now. CUI in general needs to cleanup :\ --- .../worldedit/regions/selector/CuboidRegionSelector.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 index c9fd982a9..913d4a333 100644 --- 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 @@ -26,6 +26,7 @@ import com.sk89q.worldedit.LocalSession; import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.internal.cui.CUIRegion; import com.sk89q.worldedit.internal.cui.SelectionPointEvent; +import com.sk89q.worldedit.internal.cui.SelectionShapeEvent; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.regions.CuboidRegion; import com.sk89q.worldedit.regions.Region; @@ -124,7 +125,7 @@ public class CuboidRegionSelector implements RegionSelector, CUIRegion { public boolean selectPrimary(BlockVector3 position, SelectorLimits limits) { checkNotNull(position); - if (position1 != null && position1.equals(position)) { + if (position.equals(position1)) { return false; } @@ -137,7 +138,7 @@ public class CuboidRegionSelector implements RegionSelector, CUIRegion { public boolean selectSecondary(BlockVector3 position, SelectorLimits limits) { checkNotNull(position); - if (position2 != null && position2.equals(position)) { + if (position.equals(position2)) { return false; } @@ -181,6 +182,8 @@ public class CuboidRegionSelector implements RegionSelector, CUIRegion { checkNotNull(player); checkNotNull(session); + session.dispatchCUIEvent(player, new SelectionShapeEvent(getTypeID())); + if (position1 != null) { session.dispatchCUIEvent(player, new SelectionPointEvent(0, position1, getArea())); }