diff options
| author | External Time <84183548+ExternalTime@users.noreply.github.com> | 2022-04-07 20:30:06 +0200 |
|---|---|---|
| committer | External Time <84183548+ExternalTime@users.noreply.github.com> | 2022-04-07 20:30:06 +0200 |
| commit | 4ac927ca52d580f3db3f7908cbb45a520e89c55a (patch) | |
| tree | c194c947de0a8d1a3889eabe5459ef981a106fd7 /src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven | |
| parent | 481ea9be68c316ff362c64457f72968ec72120d5 (diff) | |
| download | Skyblocker-4ac927ca52d580f3db3f7908cbb45a520e89c55a.tar.gz Skyblocker-4ac927ca52d580f3db3f7908cbb45a520e89c55a.tar.bz2 Skyblocker-4ac927ca52d580f3db3f7908cbb45a520e89c55a.zip | |
Replaced most assertions with proper error handling
Diffstat (limited to 'src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven')
| -rw-r--r-- | src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/Fetchur.java | 2 | ||||
| -rw-r--r-- | src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/Puzzler.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/Fetchur.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/Fetchur.java index ce1dde11..ccd47c5a 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/Fetchur.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/Fetchur.java @@ -26,7 +26,7 @@ public class Fetchur extends ChatPatternListener { @Override public boolean onMatch(Text message, Matcher matcher) { MinecraftClient client = MinecraftClient.getInstance(); - assert client.player != null; + if (client.player == null) return false; String riddle = matcher.group(1); String answer = answers.getOrDefault(riddle, riddle); client.player.sendMessage(Text.of("§e[NPC] Fetchur§f: " + answer), false); diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/Puzzler.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/Puzzler.java index f61e007e..06395898 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/Puzzler.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/Puzzler.java @@ -32,8 +32,8 @@ public class Puzzler extends ChatPatternListener { else if (c == '▶') x--; } ClientWorld world = MinecraftClient.getInstance().world; - assert world != null; - world.setBlockStateWithoutNeighborUpdates(new BlockPos(x, 195, z), Blocks.CRIMSON_PLANKS.getDefaultState()); + if (world != null) + world.setBlockStateWithoutNeighborUpdates(new BlockPos(x, 195, z), Blocks.CRIMSON_PLANKS.getDefaultState()); return false; } }
\ No newline at end of file |