summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2015-10-15 11:54:00 +0200
committerFlorian Jung <flo@windfisch.org>2015-10-15 11:54:00 +0200
commit872033916df971b2e172209151d44236455011c4 (patch)
treef36b029ad18be72bf003ba5da6ec633253c6b6cd
parent9bb61ef9f591e7d87f7a6cafec95f80278cce241 (diff)
parent4638ab90d947db216c87c6bb07681088220511b3 (diff)
Merge branch 'master' into pathfindingpathfinding
m---------agarnet0
-rw-r--r--main.py2
-rw-r--r--subscriber.py3
3 files changed, 4 insertions, 1 deletions
diff --git a/agarnet b/agarnet
-Subproject fcb201a3dc6bd867caacf94bb1e31a8c9f3b43f
+Subproject 5eea6879d9c020237342c2f3e0361fc859c2bd1
diff --git a/main.py b/main.py
index 6c6cbc3..317a089 100644
--- a/main.py
+++ b/main.py
@@ -87,7 +87,7 @@ for i in range(1,10): # 10 connection attempts
# find out server and token to connect
try:
token = sys.argv[1]
- addr, *_ = utils.get_party_address(token)
+ addr = utils.get_party_address(token)
print("using party token")
except:
diff --git a/subscriber.py b/subscriber.py
index 54c03cc..27cdfd3 100644
--- a/subscriber.py
+++ b/subscriber.py
@@ -13,6 +13,9 @@ class DummySubscriber:
def on_sock_closed(self):
log("on sock closed")
+ def on_server_version(self, number, text):
+ pass
+
def on_message_error(self,s):
log("on msg err "+s)