PublicMirrors/EmuLinkerSF
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some fixes

Browse Source
This commit is contained in:
Jgunishka 2019-08-21 21:26:33 +03:00
parent 2d60d53d35
commit 47d88d5395
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/org/emulinker/kaillera/controller/v086/V086Controller.java
View File

@ -105,7 +105,6 @@ public class V086Controller implements KailleraServerController
gameEventHandlers.put(PlayerDesynchEvent.class, PlayerDesynchAction.getInstance()); gameEventHandlers.put(PlayerDesynchEvent.class, PlayerDesynchAction.getInstance());
gameEventHandlers.put(GameInfoEvent.class, GameInfoAction.getInstance()); gameEventHandlers.put(GameInfoEvent.class, GameInfoAction.getInstance());
gameEventHandlers.put(GameTimeoutEvent.class, GameTimeoutAction.getInstance()); gameEventHandlers.put(GameTimeoutEvent.class, GameTimeoutAction.getInstance());
gameEventHandlers.put(GameTimeoutEvent.class, GameTimeoutAction.getInstance());
// setup the user event handlers // setup the user event handlers
userEventHandlers.put(ConnectedEvent.class, ACKAction.getInstance()); userEventHandlers.put(ConnectedEvent.class, ACKAction.getInstance());
@ -512,15 +511,24 @@ public class V086Controller implements KailleraServerController
else{ else{
// read the bundle from back to front to process the oldest messages first // read the bundle from back to front to process the oldest messages first
for(int i = (inBundle.getNumMessages() - 1); i >= 0; i--){ for(int i = (inBundle.getNumMessages() - 1); i >= 0; i--){
/**
* already extracts messages with higher numbers when parsing, it does not need to be checked
* and this causes an error if messageNumber is 0 and lastMessageNumber is 0xFFFF
if (messages[i].getNumber() > lastMessageNumber) if (messages[i].getNumber() > lastMessageNumber)
*/
{ {
prevMessageNumber = lastMessageNumber; prevMessageNumber = lastMessageNumber;
lastMessageNumber = messages[i].getNumber(); lastMessageNumber = messages[i].getNumber();
if ((prevMessageNumber + 1) != lastMessageNumber) if ((prevMessageNumber + 1) != lastMessageNumber)
{ {
log.warn(user + " dropped a packet! (" + prevMessageNumber + " to " + lastMessageNumber + ")"); if(prevMessageNumber == 0xFFFF && lastMessageNumber == 0) {
user.droppedPacket(); //exception; do nothing
}
else {
log.warn(user + " dropped a packet! (" + prevMessageNumber + " to " + lastMessageNumber + ")");
user.droppedPacket();
}
} }
V086Action action = actions[messages[i].getID()]; V086Action action = actions[messages[i].getID()];