From 15c0dc3fa50d4faad7bdf6bb9cec7c23f6d99b7b Mon Sep 17 00:00:00 2001 From: Brady Date: Tue, 3 Mar 2020 16:01:14 -0600 Subject: [PATCH] Fix bad thread check --- src/main/java/baritone/bot/connect/ConnectionResult.java | 8 ++++++++ src/main/java/baritone/bot/spec/BotMinecraft.java | 5 +++++ src/main/java/baritone/utils/ObjectAllocator.java | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/baritone/bot/connect/ConnectionResult.java b/src/main/java/baritone/bot/connect/ConnectionResult.java index e2c363321..4cf16b08a 100644 --- a/src/main/java/baritone/bot/connect/ConnectionResult.java +++ b/src/main/java/baritone/bot/connect/ConnectionResult.java @@ -84,4 +84,12 @@ public final class ConnectionResult implements IConnectionResult { return new ConnectionResult(SUCCESS, user); } + + @Override + public String toString() { + return "ConnectionResult{" + + "status=" + status + + ", user=" + user + + '}'; + } } diff --git a/src/main/java/baritone/bot/spec/BotMinecraft.java b/src/main/java/baritone/bot/spec/BotMinecraft.java index e54aaab92..294036572 100644 --- a/src/main/java/baritone/bot/spec/BotMinecraft.java +++ b/src/main/java/baritone/bot/spec/BotMinecraft.java @@ -65,6 +65,11 @@ public final class BotMinecraft extends Minecraft implements Helper { return mc.addScheduledTask(callableToSchedule); } + @Override + public boolean isCallingFromMinecraftThread() { + return mc.isCallingFromMinecraftThread(); + } + public static BotMinecraft allocate(IBaritoneUser user) { BotMinecraft mc = ObjectAllocator.allocate(BotMinecraft.class); mc.user = user; diff --git a/src/main/java/baritone/utils/ObjectAllocator.java b/src/main/java/baritone/utils/ObjectAllocator.java index b63406c38..0d2517e10 100644 --- a/src/main/java/baritone/utils/ObjectAllocator.java +++ b/src/main/java/baritone/utils/ObjectAllocator.java @@ -33,7 +33,7 @@ public final class ObjectAllocator { static { try { - Class clazz = Class.forName("sun.misc.Unsafe"); + Class clazz = Class.forName("sun.misc.Unsafe"); Field field = clazz.getDeclaredField("theUnsafe"); field.setAccessible(true); theUnsafe = (Unsafe) field.get(null);