caskd
/
baritone
forked from RepoMirrors/baritone
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'comms' into tenor

This commit is contained in:
Leijurv 2018-11-23 16:35:35 -08:00
parent c73751ef98 11e44acf65
commit 82c64d4d06
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/comms/java/cabaletta/comms/BufferedConnection.java
View File

@ -84,6 +84,10 @@ public class BufferedConnection implements IConnection {
return msgs; return msgs;
} }
public void handleAllPendingMessages(IMessageListener listener) throws IOException {
receiveMessagesNonBlocking().forEach(msg -> msg.handle(listener));
}
public static BufferedConnection makeBuffered(IConnection conn) { public static BufferedConnection makeBuffered(IConnection conn) {
if (conn instanceof BufferedConnection) { if (conn instanceof BufferedConnection) {
return (BufferedConnection) conn; return (BufferedConnection) conn;

4
src/main/java/baritone/behavior/ControllerBehavior.java
View File

@ -38,7 +38,6 @@ import cabaletta.comms.upward.MessageStatus;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import java.io.IOException; import java.io.IOException;
import java.util.List;
import java.util.Objects; import java.util.Objects;
public class ControllerBehavior extends Behavior implements IMessageListener { public class ControllerBehavior extends Behavior implements IMessageListener {
@ -91,8 +90,7 @@ public class ControllerBehavior extends Behavior implements IMessageListener {
return; return;
} }
try { try {
List<iMessage> msgs = conn.receiveMessagesNonBlocking(); conn.handleAllPendingMessages(this);
msgs.forEach(msg -> msg.handle(this));
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
disconnect(); disconnect();