From 5ff8e6d143bce407af5f4efaf2e06f4bfe932ba1 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Sat, 28 Sep 2019 12:20:59 +0200 Subject: [PATCH] Fix Search targeting air blocks --- src/main/java/net/wurstclient/settings/BlockSetting.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/wurstclient/settings/BlockSetting.java b/src/main/java/net/wurstclient/settings/BlockSetting.java index 589e83dc..8b9aef93 100644 --- a/src/main/java/net/wurstclient/settings/BlockSetting.java +++ b/src/main/java/net/wurstclient/settings/BlockSetting.java @@ -14,6 +14,7 @@ import java.util.Set; import com.google.gson.JsonElement; import com.google.gson.JsonPrimitive; +import net.minecraft.block.AirBlock; import net.minecraft.block.Block; import net.wurstclient.WurstClient; import net.wurstclient.clickgui.BlockComponent; @@ -56,6 +57,9 @@ public final class BlockSetting extends Setting public void setBlock(Block block) { + if(block == null || block instanceof AirBlock) + return; + String newName = Objects.requireNonNull(BlockUtils.getName(block)); if(blockName.equals(newName)) @@ -93,7 +97,7 @@ public final class BlockSetting extends Setting String newName = JsonUtils.getAsString(json); Block newBlock = BlockUtils.getBlockFromName(newName); - if(newBlock == null) + if(newBlock == null || newBlock instanceof AirBlock) throw new JsonException(); blockName = BlockUtils.getName(newBlock);