diff --git a/src/main/java/net/minecraft/server/AkarinUserCache.java b/src/main/java/net/minecraft/server/AkarinUserCache.java index f166b08de..d7753ccc7 100644 --- a/src/main/java/net/minecraft/server/AkarinUserCache.java +++ b/src/main/java/net/minecraft/server/AkarinUserCache.java @@ -88,7 +88,7 @@ public class AkarinUserCache { if (!isOnlineMode()) { String usernameKey = username.toLowerCase(Locale.ROOT); GameProfile offlineProfile = new GameProfile(EntityHuman.getOfflineUUID(usernameKey), usernameKey); - callback.onProfileLookupSucceeded(offlineProfile); + if (async) callback.onProfileLookupSucceeded(offlineProfile); return offlineProfile; } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java index f68de3ea9..61dc3e98f 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1744,7 +1744,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { // Paper Start if (!org.spigotmc.AsyncCatcher.shuttingDown && !ThreadAssertion.isMainThread() && !org.bukkit.Bukkit.isPrimaryThread()) { final String fCommandLine = s; - MinecraftServer.LOGGER.log(org.apache.logging.log4j.Level.ERROR, "Command Dispatched Async: " + fCommandLine); + MinecraftServer.LOGGER.log(org.apache.logging.log4j.Level.ERROR, "Command Dispatched Async: " + fCommandLine); // Akarin MinecraftServer.LOGGER.log(org.apache.logging.log4j.Level.ERROR, "Please notify author of plugin causing this execution to fix this bug! see: http://bit.ly/1oSiM6C", new Throwable()); Waitable wait = new Waitable() { @Override @@ -1754,6 +1754,8 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { } }; minecraftServer.processQueue.add(wait); + // Akarin start + /* try { wait.get(); return; @@ -1762,6 +1764,8 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { } catch (Exception e) { throw new RuntimeException("Exception processing chat command", e.getCause()); } + */ + // Akarin end } // Paper End this.handleCommand(s); diff --git a/work/Paper b/work/Paper index 3eeec2ec1..def003392 160000 --- a/work/Paper +++ b/work/Paper @@ -1 +1 @@ -Subproject commit 3eeec2ec1176e421b9e9391138e64906300f4eae +Subproject commit def003392986c54fdc63fc3f425607998fa5013c