Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fixed a bug in amp that made reloading not work.

Browse source
This commit is contained in:
Griatch 2013-09-21 22:00:46 +02:00
parent e36c7d5cc1
commit 2ba16e155e
8 changed files with 39 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/server/amp.py
View file

@ -347,7 +347,7 @@ class AMPProtocol(amp.AMP):
"""
Access method called by the Server and executed on the Server.
"""
#print "msg server->portal (server side):", sessid, msg, data
#print "msg server->portal (server side):", sessid, msg, kwargs
try:
return self.callRemote(MsgServer2Portal,
sessid=sessid,
@ -370,7 +370,7 @@ class AMPProtocol(amp.AMP):
data = loads(data)
server_sessionhandler = self.factory.server.sessions
#print "serveradmin (server side):", sessid, operation, data
#print "serveradmin (server side):", sessid, ord(operation), data
if operation == PCONN: #portal_session_connect
# create a new session and sync it
@ -395,7 +395,7 @@ class AMPProtocol(amp.AMP):
"""
Access method called by the Portal and Executed on the Portal.
"""
#print "serveradmin (portal side):", sessid, operation, data
#print "serveradmin (portal side):", sessid, ord(operation), data
data = dumps(data)
return self.callRemote(ServerAdmin,
@ -441,7 +441,7 @@ class AMPProtocol(amp.AMP):
return {}
PortalAdmin.responder(amp_portal_admin)
def call_remote_PortalAdmin(self, sessid, operation="", **kwargs):
def call_remote_PortalAdmin(self, sessid, operation="", data=""):
"""
Access method called by the server side.
"""
@ -449,7 +449,7 @@ class AMPProtocol(amp.AMP):
return self.callRemote(PortalAdmin,
sessid=sessid,
operation=operation,
data=dumps(kwargs)).addErrback(self.errback, "PortalAdmin")
data=dumps(data)).addErrback(self.errback, "PortalAdmin")
# Extra functions