From cc4a4ccda10797fa50a990c1f1f00cc94dc163e1 Mon Sep 17 00:00:00 2001 From: Patrick Henninger Date: Mon, 23 May 2022 16:59:30 +0200 Subject: [PATCH] Fix last commit as tested locally Signed-off-by: Patrick Henninger --- src/GameQ/Protocols/Sevendaystodie.php | 6 ++---- .../Providers/Sevendaystodie/1_response.txt | Bin 470 -> 337 bytes .../Providers/Sevendaystodie/1_result.json | 2 +- .../Providers/Sevendaystodie/2_response.txt | Bin 386 -> 356 bytes .../Providers/Sevendaystodie/2_result.json | 2 +- .../Providers/Sevendaystodie/3_response.txt | Bin 327 -> 440 bytes .../Providers/Sevendaystodie/3_result.json | 2 +- 7 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/GameQ/Protocols/Sevendaystodie.php b/src/GameQ/Protocols/Sevendaystodie.php index 410e7dc8..8919b97f 100644 --- a/src/GameQ/Protocols/Sevendaystodie.php +++ b/src/GameQ/Protocols/Sevendaystodie.php @@ -41,11 +41,9 @@ class Sevendaystodie extends Source protected $name_long = "7 Days to Die"; /** - * query_port = client_port - 2 - * - * ATTENTION: client_port is the game port and NOT base port. + * query_port = client_port + 0 * * @type int */ - protected $port_diff = -2; + protected $port_diff = 0; } diff --git a/tests/Protocols/Providers/Sevendaystodie/1_response.txt b/tests/Protocols/Providers/Sevendaystodie/1_response.txt index 367e65cd5048e2771197d3b6a356b42e76acec68..c038d42e3f935413aaff42a9cf713c743a57f05e 100644 GIT binary patch literal 337 zcmezW|Nnna!RUZ6*Vt%RzgUHkj8p}W{G_DJl8pSEREB^cS9e!Gi);pSmk<{Qa|M^g z%3_6(dEzkXDe literal 470 zcmezW|NnnaLBIU`Bwe?n%+$P;oJxg&GFOEN9|dKj8U+&r1673@1yg+^Lk5td@E{)- zBL;Jq5Elk>1((FiVug@=1((cJ1_lOc8-|o}1_lEIJtG4>15<{LVwtQ{wzgIJJ1{y{ zl{*4~r=z2DYKEIZu%lCEpi{bgpkrWgkYkVuSkl|e(cLlK)!8xKJJ6}fz$rJ~J=-xb z+0ohAz|qAtI2&k&MVY>ZM`5|EEyJd3%s?9%7`SR`xPTt`?;;K6GCWKZbc3)?Klk6a*bshDsY$`b3I2W4rTn+RpqY?%OM30~=gvU-16Kv``{ bdQeu<4PhuN%(%}PVzSWJHYjWET^?rum#lB5 diff --git a/tests/Protocols/Providers/Sevendaystodie/1_result.json b/tests/Protocols/Providers/Sevendaystodie/1_result.json index 5936485c..36387ef0 100644 --- a/tests/Protocols/Providers/Sevendaystodie/1_result.json +++ b/tests/Protocols/Providers/Sevendaystodie/1_result.json @@ -1 +1 @@ -{"68.56.142.226:26902":{"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:26902\/","gq_name":"7 Days to Die","gq_online":true,"gq_port_client":26902,"gq_port_query":26900,"gq_protocol":"source","gq_transport":"udp","gq_type":"sevendaystodie","hostname":"Noob-Friendly PvE XL #2| 400% | 5\/21","keywords":"AzwAAAAIAACehF0SABiQBgGQAQSRAR4wAAAAKJAGAgECAgKQBr0BmgGkAQcACC0AD5SkAzw8v\/8HqwE=","map":"NoobWRLD2","max_players":60,"num_bots":0,"num_players":27,"os":"w","password":0,"players":[{"id":0,"name":"","score":0,"time":9305.7197265625},{"id":0,"name":"","score":0,"time":8124.34912109375},{"id":0,"name":"","score":0,"time":6898.40087890625},{"id":0,"name":"","score":0,"time":6440.8447265625},{"id":0,"name":"","score":0,"time":5492.34326171875},{"id":0,"name":"","score":0,"time":5395.81591796875},{"id":0,"name":"","score":0,"time":5360.57763671875},{"id":0,"name":"","score":0,"time":5104.57666015625},{"id":0,"name":"","score":0,"time":4915.77392578125},{"id":0,"name":"","score":0,"time":4532.431640625},{"id":0,"name":"","score":0,"time":4441.19287109375},{"id":0,"name":"","score":0,"time":4181.00732421875},{"id":0,"name":"","score":0,"time":3705.708740234375},{"id":0,"name":"","score":0,"time":3030.544921875},{"id":0,"name":"","score":0,"time":2318.93408203125},{"id":0,"name":"","score":0,"time":1812.587890625},{"id":0,"name":"","score":0,"time":1628.5146484375},{"id":0,"name":"","score":0,"time":1268.346435546875},{"id":0,"name":"","score":0,"time":1166.4423828125},{"id":0,"name":"","score":0,"time":1157.64013671875},{"id":0,"name":"","score":0,"time":1142.6270751953125},{"id":0,"name":"","score":0,"time":739.9148559570312},{"id":0,"name":"","score":0,"time":696.5394287109375},{"id":0,"name":"","score":0,"time":591.3809814453125},{"id":0,"name":"","score":0,"time":284.40106201171875},{"id":0,"name":"","score":0,"time":269.91461181640625},{"id":0,"name":"","score":0,"time":140.8656768798828}],"port":26902,"protocol":17,"secure":0,"steam_id":90159375917093893,"steamappid":0,"version":"00.20.05"}} \ No newline at end of file +{"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"}} \ No newline at end of file diff --git a/tests/Protocols/Providers/Sevendaystodie/2_response.txt b/tests/Protocols/Providers/Sevendaystodie/2_response.txt index 95520c68af1c2ccc821ba7b013883a52853160dc..2fa3a52d0955ea3e3b065463a93abc9db6ae3c87 100644 GIT binary patch delta 197 zcmZo-e!?`thEZ^$tr|;4q-D~?baTe2iSwoE1sTBLy@RS7gtg$?Ggk@q0p>9ZwJ)~!bsFji{@Ewlgt diff --git a/tests/Protocols/Providers/Sevendaystodie/2_result.json b/tests/Protocols/Providers/Sevendaystodie/2_result.json index 2c0aadbc..964f59c1 100644 --- a/tests/Protocols/Providers/Sevendaystodie/2_result.json +++ b/tests/Protocols/Providers/Sevendaystodie/2_result.json @@ -1 +1 @@ -{"134.255.235.50:26902":{"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:26902\/","gq_name":"7 Days to Die","gq_online":true,"gq_port_client":26902,"gq_port_query":26900,"gq_protocol":"source","gq_transport":"udp","gq_type":"sevendaystodie","hostname":"DirtyLoot.NET PvP - 20\/5","keywords":"BLgBQQMAKgACkuVaEkEqpAEFgAGJDCkACQAKKjK6AwAAAQMDrASkAaQBpAEFAAgqBQaUpAMWKoBgKwE=","map":"Season2","max_players":42,"num_bots":0,"num_players":20,"os":"w","password":0,"players":[{"id":0,"name":"","score":0,"time":9982.9208984375},{"id":0,"name":"","score":0,"time":9456.9892578125},{"id":0,"name":"","score":0,"time":9277.609375},{"id":0,"name":"","score":0,"time":8862.4306640625},{"id":0,"name":"","score":0,"time":6271.58447265625},{"id":0,"name":"","score":0,"time":5315.69482421875},{"id":0,"name":"","score":0,"time":5276.86181640625},{"id":0,"name":"","score":0,"time":3982.17822265625},{"id":0,"name":"","score":0,"time":3592.36572265625},{"id":0,"name":"","score":0,"time":3219.107177734375},{"id":0,"name":"","score":0,"time":2519.276123046875},{"id":0,"name":"","score":0,"time":2340.359375},{"id":0,"name":"","score":0,"time":2280.397216796875},{"id":0,"name":"","score":0,"time":2171.531005859375},{"id":0,"name":"","score":0,"time":2042.4344482421875},{"id":0,"name":"","score":0,"time":1740.115234375},{"id":0,"name":"","score":0,"time":1435.2598876953125},{"id":0,"name":"","score":0,"time":1426.962646484375},{"id":0,"name":"","score":0,"time":554.5950927734375},{"id":0,"name":"","score":0,"time":411.4229736328125}],"port":26902,"protocol":17,"secure":0,"steam_id":90159377290908676,"steamappid":0,"version":"00.20.05"}} \ No newline at end of file +{"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"}} \ No newline at end of file diff --git a/tests/Protocols/Providers/Sevendaystodie/3_response.txt b/tests/Protocols/Providers/Sevendaystodie/3_response.txt index a137eadb958a589f8f1d2ad5f1cc4b4553022777..100f6bbb9ee8dd8a470310f96360aa18e9b7a629 100644 GIT binary patch literal 440 zcmezW|NnnaLBIU`Bwe?n%+$P;oJxg&GFOEN9|dKj8U+&r1673@1yg+^Lk5td@E{)- zBL;Jq5Elk>1((FiVug@=1((cJ1_lNR8-|o}1_lEIJtG4>15<{LVwtQ{wzgIJJ1{y{ zl{*4~r=z2@qh**uu%lCEpi{bgpkrWgkYkVuSkl|e(cLlK)!8xKJJ6}fz$rJ~J=-xb z+0ohAz|qAtI2&k&MVY>ZM`5|EEyJd3%s?9%7`SR`xPTt`?;-)_GW?5Cc7w2*o(n)( zdG)_tA!5Ic-a=Uiy3RmZHwsQeS=R~!L(7l$F5X L24y+*Ik^A;0rY6Y literal 327 zcmezW|Nnna!RUZ6*Vt%RzgUHkj8p}W{G_DJl8pSEREB^cS9e!Gi);pSmk<{Qa|M^g z%3_6(dGE8NPaD%dT1w&bpFW8~1ETzY; z5ZU87$DyouKUP3l7pF-