Permalink
Browse files

Minor improvements to the server side CUI

  • Loading branch information...
me4502 committed Dec 26, 2018
1 parent 4cc8e9a commit a88f6b84308e9edde72385926f4a90fa3977d114
@@ -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 (useServerCUI) {
updateServerCUI(actor);
}
if (!hasCUISupport && useServerCUI) {
updateServerCUI(actor);
return;
}

@@ -228,6 +228,8 @@ public void learnChanges() {
public void clear() {
position1 = null;
position2 = null;
region.setPos1(BlockVector3.ZERO);
region.setPos2(BlockVector3.ZERO);
}

@Override

0 comments on commit a88f6b8

Please sign in to comment.