Upstream/pyCraft
1
0
Fork 0
mirror of https://github.com/ammaraskar/pyCraft.git synced 2025-01-25 00:51:26 +01:00
Code Issues Projects Releases Wiki Activity

fix sendDouble and remove window from NetworkManager

Browse Source
This commit is contained in:
Ammar Askar 2012-12-04 20:47:29 +05:00
parent 6ccbc8a553
commit 43f86d09f5
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
networking/DataUtil.py
View File

@ -64,7 +64,7 @@ def sendLong(socket, value):
socket.send(struct.pack('>q', value))
def sendDouble(socket, value):
socket.send(struct.pack('>d'), value)
socket.send(struct.pack('>d', value))
def sendString(socket, value):
if (type(value) is not types.StringType):

14
networking/NetworkManager.py
View File

@ -18,7 +18,7 @@ EntityID = 0
class ServerConnection(threading.Thread):
def __init__(self, window, username, sessionID, server, port, options=None):
def __init__(self, username, sessionID, server, port, options=None):
threading.Thread.__init__(self)
self.options = options
self.isConnected = False
@ -26,11 +26,6 @@ class ServerConnection(threading.Thread):
self.sessionID = sessionID
self.server = server
self.port = port
if(window == None):
self.NoGUI = True
else:
self.NoGUI = False
self.window = window
def disconnect(self, reason="Disconnected by user"):
PacketSenderManager.sendFF(self.socket, reason)
@ -89,7 +84,7 @@ class ServerConnection(threading.Thread):
#Success \o/ We can now begin sending our serverAddress to the server
#Instantiate our main packet listener
self.listener = PacketListener(self, self.window, self.socket, self.FileObject)
self.listener = PacketListener(self, self.socket, self.FileObject)
self.listener.start()
#Encrypt the verification token from earlier along with our shared secret with the server's rsa key
@ -105,7 +100,7 @@ class ServerConnection(threading.Thread):
else:
print "Server is in offline mode"
#Instantiate our main packet listener
self.listener = PacketListener(self, self.window, self.socket, self.FileObject)
self.listener = PacketListener(self, self.socket, self.FileObject)
self.listener.start()
#Encrypt the verification token from earlier along with our shared secret with the server's rsa key
@ -151,12 +146,11 @@ class EncryptedSocketObjectHandler():
class PacketListener(threading.Thread):
def __init__(self, connection, window, socket, FileObject):
def __init__(self, connection, socket, FileObject):
threading.Thread.__init__(self)
self.connection = connection
self.socket = socket
self.FileObject = FileObject
self.window = window
self.encryptedConnection = False
self.kill = False

2
start.py
View File

@ -64,7 +64,7 @@ if __name__ == "__main__":
else:
host = serverAddress
port = 25565
connection = NetworkManager.ServerConnection(None, user, sessionid, host, port, options)
connection = NetworkManager.ServerConnection(user, sessionid, host, port, options)
connection.start()
while True:
try: