nitro/G-Earth
1
0
Fork 0
mirror of https://github.com/sirjonasxx/G-Earth.git synced 2024-11-23 08:50:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

yes

Browse Source
This commit is contained in:
sirjonasxx 2021-04-28 15:42:09 +02:00
parent 35d18da4da
commit 0132978fb9
3 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
G-Earth/src/main/java/gearth/protocol/HPacket.java
View File

@ -108,6 +108,15 @@ public class HPacket implements StringifyAble {
isEdited = wasEdited; isEdited = wasEdited;
} }
public void maybeCompletePacket(PacketInfoManager packetInfoManager) {
if (canComplete(HMessage.Direction.TOCLIENT, packetInfoManager) && !canComplete(HMessage.Direction.TOSERVER, packetInfoManager)) {
completePacket(HMessage.Direction.TOCLIENT, packetInfoManager);
}
else if (!canComplete(HMessage.Direction.TOCLIENT, packetInfoManager) && canComplete(HMessage.Direction.TOSERVER, packetInfoManager)) {
completePacket(HMessage.Direction.TOSERVER, packetInfoManager);
}
}
public boolean canComplete(HMessage.Direction direction, PacketInfoManager packetInfoManager) { public boolean canComplete(HMessage.Direction direction, PacketInfoManager packetInfoManager) {
if (isCorrupted() || identifier == null) return false; if (isCorrupted() || identifier == null) return false;

8
G-Earth/src/main/java/gearth/services/extensionhandler/ExtensionHandler.java
View File

@ -231,13 +231,7 @@ public class ExtensionHandler {
@Override @Override
protected void stringToPacketRequest(String string) { protected void stringToPacketRequest(String string) {
HPacket packet = new HPacket(string); HPacket packet = new HPacket(string);
PacketInfoManager packetInfoManager = hConnection.getPacketInfoManager(); packet.maybeCompletePacket(hConnection.getPacketInfoManager());
if (packet.canComplete(HMessage.Direction.TOCLIENT, packetInfoManager) && !packet.canComplete(HMessage.Direction.TOSERVER, packetInfoManager)) {
packet.completePacket(HMessage.Direction.TOCLIENT, packetInfoManager);
}
else if (!packet.canComplete(HMessage.Direction.TOCLIENT, packetInfoManager) && packet.canComplete(HMessage.Direction.TOSERVER, packetInfoManager)) {
packet.completePacket(HMessage.Direction.TOSERVER, packetInfoManager);
}
extension.stringToPacketResponse(packet); extension.stringToPacketResponse(packet);
} }
}; };

8
G-Earth/src/main/java/gearth/ui/injection/InjectionController.java
View File

@ -153,13 +153,7 @@ public class InjectionController extends SubForm {
// complete packet to show correct headerId // complete packet to show correct headerId
if (!packets[0].isPacketComplete()) { if (!packets[0].isPacketComplete()) {
HPacket packet = packets[0]; packets[0].maybeCompletePacket(packetInfoManager);
if (packet.canComplete(HMessage.Direction.TOCLIENT, packetInfoManager) && !packet.canComplete(HMessage.Direction.TOSERVER, packetInfoManager)) {
packet.completePacket(HMessage.Direction.TOCLIENT, packetInfoManager);
}
else if (!packet.canComplete(HMessage.Direction.TOCLIENT, packetInfoManager) && packet.canComplete(HMessage.Direction.TOSERVER, packetInfoManager)) {
packet.completePacket(HMessage.Direction.TOSERVER, packetInfoManager);
}
} }
lbl_pcktInfo.setText("header (id:" + packets[0].headerId() + ", length:" + lbl_pcktInfo.setText("header (id:" + packets[0].headerId() + ", length:" +