mirror/WorldEdit
2
0
Fork 0
mirror of https://github.com/EngineHub/WorldEdit.git synced 2025-01-24 12:44:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Clean up handling of sel/nav wand tool (#540)

Browse Source
This commit is contained in:
Octavia Togami 2019-12-18 01:11:43 -08:00 committed by Matthew Miller
parent 77fd982b38
commit 7039dc8306
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java
View File

@ -53,6 +53,7 @@
import com.sk89q.worldedit.world.block.BaseBlock;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.item.ItemType;
import com.sk89q.worldedit.world.item.ItemTypes;
import com.sk89q.worldedit.world.snapshot.experimental.Snapshot;
import javax.annotation.Nullable;
@ -65,6 +66,7 @@
import java.util.Map;
import java.util.TimeZone;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Consumer;
import static com.google.common.base.Preconditions.checkNotNull;
@ -653,16 +655,35 @@ public void setTool(ItemType item, @Nullable Tool tool) throws InvalidToolBindEx
throw new InvalidToolBindException(item, "Blocks can't be used");
}
if (tool instanceof SelectionWand) {
this.wandItem = item.getId();
setDirty();
setSingleItemTool(id -> this.wandItem = id, this.wandItem, item);
} else if (tool instanceof NavigationWand) {
this.navWandItem = item.getId();
setDirty();
setSingleItemTool(id -> this.navWandItem = id, this.navWandItem, item);
} else if (tool == null) {
// Check if un-setting sel/nav
String id = item.getId();
if (id.equals(this.wandItem)) {
this.wandItem = null;
setDirty();
} else if (id.equals(this.navWandItem)) {
this.navWandItem = null;
setDirty();
}
}
this.tools.put(item, tool);
}
private void setSingleItemTool(Consumer<String> setter, @Nullable String itemId, ItemType newItem) {
if (itemId != null) {
ItemType item = ItemTypes.get(itemId);
if (item != null) {
this.tools.remove(item);
}
}
setter.accept(newItem.getId());
setDirty();
}
/**
* Returns whether inventory usage is enabled for this session.
*