Update to 0.0.2

This commit is contained in:
Captain ALM 2023-06-11 15:18:11 +01:00
parent a99c3fba70
commit 886cd1d321
Signed by: alfred
GPG Key ID: 4E4ADD02609997B1
2 changed files with 19 additions and 16 deletions

View File

@ -1,5 +1,5 @@
Manifest-Version: 1.0 Manifest-Version: 1.0
Main-Class: com.captainalm.test.calmnet.Main Main-Class: com.captainalm.test.calmnet.Main
Class-Path: calmnetlib-0.0.1.jar calmstdcrypt-0.0.1.jar calmnetlib.jar c Class-Path: calmnetlib-0.1.0.jar calmnetlib-0.0.1.jar calmstdcrypt-0.0.1
almstdcrypt.jar .jar calmnetlib.jar calmstdcrypt.jar

View File

@ -298,6 +298,7 @@ public final class Main {
if (!packet.isValid()) continue; if (!packet.isValid()) continue;
if (packet instanceof AKNPacket) { if (packet instanceof AKNPacket) {
synchronized (slockAckned) { synchronized (slockAckned) {
//System.out.println(Thread.currentThread().getName() + " : AKN");
ackn = true; ackn = true;
slockAckned.notifyAll(); slockAckned.notifyAll();
} }
@ -428,23 +429,25 @@ public final class Main {
private static void doAKNWait(IPacket packet) { private static void doAKNWait(IPacket packet) {
ackn = false; ackn = false;
int i = 0; int i = 0;
while (++i <= sendLoopsRemainingSetting && !ackn) { try {
try { synchronized (slockAckned) {
if (server != null) { while (++i <= sendLoopsRemainingSetting && !ackn) {
server.broadcastPacket(packet, false); try {
} if (server != null) {
if (client != null) { server.broadcastPacket(packet, false);
client.sendPacket(packet, false); }
} if (client != null) {
} catch (IOException | PacketException e) { client.sendPacket(packet, false);
e.printStackTrace(); }
} } catch (IOException | PacketException e) {
try { e.printStackTrace();
synchronized (slockAckned) { }
if (ackn) break;
//System.out.println(Thread.currentThread().getName() + " : " + (i - 1));
slockAckned.wait(sendLoopWaitTime); slockAckned.wait(sendLoopWaitTime);
} }
} catch (InterruptedException e) {
} }
} catch (InterruptedException e) {
} }
} }