diff --git a/app/Game/Client/Networker.js b/app/Game/Client/Networker.js index e74cbc9..9d35cba 100755 --- a/app/Game/Client/Networker.js +++ b/app/Game/Client/Networker.js @@ -25,13 +25,25 @@ function (ProtocolHelper, GameController, User, Nc, Settings, DomController) { var self = this; this.socketLink.on('message', function (message) { var m = JSON.parse(message) - if(Settings.NETWORK_LOG_INCOMING) { - if (message.indexOf('worldUpdate') == -1 && message.indexOf('pong') == -1) { + if(Settings.NETWORK_LOG_INCOMING) { + var shouldBeFiltered = false; + var keyword; + + for (var i = 0; i < Settings.NETWORK_LOG_FILTER.length; i++) { + keyword = Settings.NETWORK_LOG_FILTER[i]; + if(message.search(keyword) != -1) { + shouldBeFiltered = true; + break; + } + }; + + if(!shouldBeFiltered) { console.log('INCOMING', message); } - } + + ProtocolHelper.applyCommand(message, self); }); @@ -117,23 +129,18 @@ function (ProtocolHelper, GameController, User, Nc, Settings, DomController) { this.socketLink.send(message); if(Settings.NETWORK_LOG_OUTGOING) { - if(Settings.NETWORK_LOG_FILTER.length > 0) { + var shouldBeFiltered = false; + var keyword; - var shouldBeFiltered = false; - var keyword; - - for (var i = 0; i < Settings.NETWORK_LOG_FILTER.length; i++) { - keyword = Settings.NETWORK_LOG_FILTER[i]; - if(message.search(keyword) != -1) { - shouldBeFiltered = true; - break; - } - }; - - if(!shouldBeFiltered) { - console.log('OUTGOING', message); + for (var i = 0; i < Settings.NETWORK_LOG_FILTER.length; i++) { + keyword = Settings.NETWORK_LOG_FILTER[i]; + if(message.search(keyword) != -1) { + shouldBeFiltered = true; + break; } - } else { + }; + + if(!shouldBeFiltered) { console.log('OUTGOING', message); } }