Merge pull request #623 from Austinb/7daytodie-port

Fix 7 Days to die query port

src/GameQ/Protocols/Sevendaystodie.php

@@ -41,9 +41,9 @@ class Sevendaystodie extends Source
     protected $name_long = "7 Days to Die";
 
     /**
-     * query_port = client_port + 1
+     * query_port = client_port + 0
      *
      * @type int
      */
-    protected $port_diff = 1;
+    protected $port_diff = 0;
 }

tests/Protocols/Providers/Sevendaystodie/1_result.json

@@ -1 +1 @@
-{"64.94.95.106:25341":{"AirDropFrequency":"72","AirDropMarker":"False","Architecture64":"True","BlockDurabilityModifier":"100","BuildCreate":"False","CompatibilityVersion":"Alpha 15","CountryCode":"XX","CurrentPlayers":"10","CurrentServerTime":"31540904","DayCount":"3","DayLightLength":"18","DayNightLength":"50","DropOnDeath":"0","DropOnQuit":"0","EACEnabled":"True","EnemyDifficulty":"1","EnemySenseMemory":"60","EnemySpawnMode":"3","GameDifficulty":"4","GameHost":"All Night Gamers (A) | Admins | USA | PvE Only |","GameMode":"SurvivalMP","GameName":"ziotlen3","GameType":"7DTD","IP":"64.94.95.106","IsDedicated":"True","IsPasswordProtected":"False","LandClaimDeadZone":"15","LandClaimDecayMode":"2","LandClaimExpiryTime":"7","LandClaimOfflineDurabilityModifier":"0","LandClaimOnlineDurabilityModifier":"0","LandClaimSize":"21","LevelName":"Random Gen","LootAbundance":"100","LootRespawnDays":"30","MaxPlayers":"50","MaxSpawnedAnimals":"75","MaxSpawnedZombies":"75","Ping":"-1","Platform":"WindowsPlayer","PlayerKillingMode":"0","Port":"25341","RequiresMod":"False","ServerDescription":"Friendly PvE players wanted.","ServerWebsiteURL":"","ShowFriendPlayerOnMap":"True","SteamID":"90105371493633028","StockFiles":"True","StockSettings":"True","Version":"Alpha 15","ZombiesRun":"0","dedicated":"d","game_descr":"7 Days To Die","game_dir":"7DTD","game_id":251570,"gq_address":"64.94.95.106","gq_joinlink":"steam:\/\/connect\/64.94.95.106:25341\/","gq_name":"7 Days to Die","gq_online":true,"gq_port_client":25341,"gq_port_query":25342,"gq_protocol":"source","gq_transport":"udp","gq_type":"sevendaystodie","hostname":"All Night Gamers (A) | Admins | USA | PvE Only |","keywords":"1;1;1;1;0;0;4;1;","map":"Random Gen","max_players":50,"num_bots":0,"num_players":11,"num_rules":51,"os":"w","password":0,"players":[{"id":0,"name":"","score":0,"time":6938.0610351562},{"id":0,"name":"","score":0,"time":6886.0043945312},{"id":0,"name":"","score":0,"time":6547.015625},{"id":0,"name":"","score":0,"time":6281.1879882812},{"id":0,"name":"","score":0,"time":5972.138671875},{"id":0,"name":"","score":0,"time":5514.2905273438},{"id":0,"name":"","score":0,"time":2185.7521972656},{"id":0,"name":"","score":0,"time":1913.5505371094},{"id":0,"name":"","score":0,"time":974.35504150391},{"id":0,"name":"","score":0,"time":113.64181518555},{"id":0,"name":"","score":0,"time":9.2815980911255}],"port":25341,"protocol":17,"secure":0,"steam_id":90105371493633028,"steamappid":0,"version":"00.15.00"}}
+{"185.125.207.144:26900":{"dedicated":"d","game_descr":"7 Days To Die","game_dir":"7DTD","game_id":251570,"gq_address":"185.125.207.144","gq_joinlink":"steam:\/\/connect\/185.125.207.144:26900\/","gq_name":"7 Days to Die","gq_online":true,"gq_port_client":26900,"gq_port_query":26900,"gq_protocol":"source","gq_transport":"udp","gq_type":"sevendaystodie","hostname":"[PVE][EN] The Hobbithole","keywords":"A7gBQQAADgAAlvqyARJBiAGkAQc8BD0eBwAAACioDwAAAwMDlgKkAaQBpAEHAAgtAA+UpAMPD4CAAasB","map":"PREGEN8k","max_players":15,"num_bots":0,"num_players":15,"os":"w","password":0,"players":[{"id":0,"name":"","score":0,"time":14905.5751953125},{"id":0,"name":"","score":0,"time":14631.57421875},{"id":0,"name":"","score":0,"time":9779.015625},{"id":0,"name":"","score":0,"time":6488.04541015625},{"id":0,"name":"","score":0,"time":3554.355224609375},{"id":0,"name":"","score":0,"time":3151.943603515625},{"id":0,"name":"","score":0,"time":2294.048095703125},{"id":0,"name":"","score":0,"time":2235.045654296875},{"id":0,"name":"","score":0,"time":2198.7138671875},{"id":0,"name":"","score":0,"time":1893.3685302734375},{"id":0,"name":"","score":0,"time":1712.12353515625},{"id":0,"name":"","score":0,"time":1299.911376953125},{"id":0,"name":"","score":0,"time":843.92578125},{"id":0,"name":"","score":0,"time":370.82208251953125},{"id":0,"name":"","score":0,"time":28.828920364379883}],"port":26902,"protocol":17,"secure":0,"steam_id":90159371887982594,"steamappid":0,"version":"00.20.05"}}

tests/Protocols/Providers/Sevendaystodie/2_result.json

@@ -1 +1 @@
-{"173.234.30.74:22814":{"AirDropFrequency":"72","AirDropMarker":"False","Architecture64":"True","BlockDurabilityModifier":"100","BuildCreate":"False","CompatibilityVersion":"Alpha 15","CountryCode":"XX","CurrentPlayers":"13","CurrentServerTime":"31744145","DayCount":"3","DayLightLength":"18","DayNightLength":"50","DropOnDeath":"0","DropOnQuit":"0","EACEnabled":"True","EnemyDifficulty":"1","EnemySenseMemory":"60","EnemySpawnMode":"3","GameDifficulty":"4","GameHost":"All Night Gamers (B) | Admins | USA | PvE Only |","GameMode":"SurvivalMP","GameName":"pion34","GameType":"7DTD","IP":"173.234.30.74","IsDedicated":"True","IsPasswordProtected":"False","LandClaimDeadZone":"15","LandClaimDecayMode":"2","LandClaimExpiryTime":"7","LandClaimOfflineDurabilityModifier":"0","LandClaimOnlineDurabilityModifier":"0","LandClaimSize":"21","LevelName":"Random Gen","LootAbundance":"100","LootRespawnDays":"30","MaxPlayers":"50","MaxSpawnedAnimals":"50","MaxSpawnedZombies":"75","Ping":"-1","Platform":"WindowsPlayer","PlayerKillingMode":"0","Port":"22814","RequiresMod":"False","ServerDescription":"Friendly PvE players wanted","ServerWebsiteURL":"","ShowFriendPlayerOnMap":"True","SteamID":"90105371909004295","StockFiles":"True","StockSettings":"True","Version":"Alpha 15","ZombiesRun":"0","dedicated":"d","game_descr":"7 Days To Die","game_dir":"7DTD","game_id":251570,"gq_address":"173.234.30.74","gq_joinlink":"steam:\/\/connect\/173.234.30.74:22814\/","gq_name":"7 Days to Die","gq_online":true,"gq_port_client":22814,"gq_port_query":22815,"gq_protocol":"source","gq_transport":"udp","gq_type":"sevendaystodie","hostname":"All Night Gamers (B) | Admins | USA | PvE Only |","keywords":"1;1;1;1;0;0;4;1;","map":"Random Gen","max_players":50,"num_bots":0,"num_players":13,"num_rules":51,"os":"w","password":0,"players":[{"id":0,"name":"","score":0,"time":4929.2446289062},{"id":0,"name":"","score":0,"time":4928.4418945312},{"id":0,"name":"","score":0,"time":4926.47265625},{"id":0,"name":"","score":0,"time":4206.7333984375},{"id":0,"name":"","score":0,"time":3436.2412109375},{"id":0,"name":"","score":0,"time":2710.3879394531},{"id":0,"name":"","score":0,"time":2329.5681152344},{"id":0,"name":"","score":0,"time":1564.7233886719},{"id":0,"name":"","score":0,"time":1412.8809814453},{"id":0,"name":"","score":0,"time":1029.9963378906},{"id":0,"name":"","score":0,"time":752.91870117188},{"id":0,"name":"","score":0,"time":715.45239257812},{"id":0,"name":"","score":0,"time":489.68960571289}],"port":22814,"protocol":17,"secure":0,"steam_id":90105371909004295,"steamappid":0,"version":"00.15.00"}}
+{"134.255.235.50:26900":{"dedicated":"d","game_descr":"7 Days To Die","game_dir":"7DTD","game_id":251570,"gq_address":"134.255.235.50","gq_joinlink":"steam:\/\/connect\/134.255.235.50:26900\/","gq_name":"7 Days to Die","gq_online":true,"gq_port_client":26900,"gq_port_query":26900,"gq_protocol":"source","gq_transport":"udp","gq_type":"sevendaystodie","hostname":"DirtyLoot.NET PvP - 20\/5","keywords":"BLgBQQMAKgAChY9bEkEqpAEFgAGJDCkACQAKKjK6AwAAAQMDrASkAaQBpAEFAAgqBQaUpAMZKoBgKwE=","map":"Season2","max_players":42,"num_bots":0,"num_players":17,"os":"w","password":0,"players":[{"id":0,"name":"","score":0,"time":10576.2333984375},{"id":0,"name":"","score":0,"time":7390.828125},{"id":0,"name":"","score":0,"time":6434.9384765625},{"id":0,"name":"","score":0,"time":5101.421875},{"id":0,"name":"","score":0,"time":4711.609375},{"id":0,"name":"","score":0,"time":4338.3505859375},{"id":0,"name":"","score":0,"time":3638.519775390625},{"id":0,"name":"","score":0,"time":3459.602783203125},{"id":0,"name":"","score":0,"time":3399.640869140625},{"id":0,"name":"","score":0,"time":3290.774658203125},{"id":0,"name":"","score":0,"time":2859.35888671875},{"id":0,"name":"","score":0,"time":2546.206298828125},{"id":0,"name":"","score":0,"time":1673.8387451171875},{"id":0,"name":"","score":0,"time":1530.6666259765625},{"id":0,"name":"","score":0,"time":1037.6016845703125},{"id":0,"name":"","score":0,"time":590.7295532226562},{"id":0,"name":"","score":0,"time":232.0925750732422}],"port":26902,"protocol":17,"secure":0,"steam_id":90159377290908676,"steamappid":0,"version":"00.20.05"}}

tests/Protocols/Providers/Sevendaystodie/3_result.json

@@ -0,0 +1 @@
+{"68.56.142.226:26900":{"dedicated":"d","game_descr":"7 Days To Die","game_dir":"7DTD","game_id":251570,"gq_address":"68.56.142.226","gq_joinlink":"steam:\/\/connect\/68.56.142.226:26900\/","gq_name":"7 Days to Die","gq_online":true,"gq_port_client":26900,"gq_port_query":26900,"gq_protocol":"source","gq_transport":"udp","gq_type":"sevendaystodie","hostname":"Noob-Friendly PvE XL #2| 400% | 5\/21","keywords":"AzwAAAAIAACA9V0SABiQBgGQAQSRAR4wAAAAKJAGAgECAgKQBr0BmgGkAQcACC0AD5SkAzw8v\/8HqwE=","map":"NoobWRLD2","max_players":60,"num_bots":0,"num_players":24,"os":"w","password":0,"players":[{"id":0,"name":"","score":0,"time":10455.248046875},{"id":0,"name":"","score":0,"time":9273.876953125},{"id":0,"name":"","score":0,"time":8047.9287109375},{"id":0,"name":"","score":0,"time":7590.37255859375},{"id":0,"name":"","score":0,"time":6545.34375},{"id":0,"name":"","score":0,"time":6510.10546875},{"id":0,"name":"","score":0,"time":6254.1044921875},{"id":0,"name":"","score":0,"time":5681.95947265625},{"id":0,"name":"","score":0,"time":5590.720703125},{"id":0,"name":"","score":0,"time":2962.11572265625},{"id":0,"name":"","score":0,"time":2778.04248046875},{"id":0,"name":"","score":0,"time":2417.874267578125},{"id":0,"name":"","score":0,"time":2315.97021484375},{"id":0,"name":"","score":0,"time":2292.155029296875},{"id":0,"name":"","score":0,"time":1889.4427490234375},{"id":0,"name":"","score":0,"time":1846.0673828125},{"id":0,"name":"","score":0,"time":1740.9088134765625},{"id":0,"name":"","score":0,"time":1433.928955078125},{"id":0,"name":"","score":0,"time":1093.339111328125},{"id":0,"name":"","score":0,"time":1032.1168212890625},{"id":0,"name":"","score":0,"time":927.450439453125},{"id":0,"name":"","score":0,"time":876.3877563476562},{"id":0,"name":"","score":0,"time":792.005859375},{"id":0,"name":"","score":0,"time":778.2227783203125}],"port":26902,"protocol":17,"secure":0,"steam_id":90159375917093893,"steamappid":0,"version":"00.20.05"}}