From ca8fdb9045c20e33d9f0778463dca6f95968d630 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Tue, 12 Oct 2010 12:28:08 +0000
Subject: [PATCH] plop
git-svn-id: http://svn.net-core.org/repos/t-engine4@1505 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/engines/default/engine/PlayerProfile.lua | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/game/engines/default/engine/PlayerProfile.lua b/game/engines/default/engine/PlayerProfile.lua
index a0609e55e4..0ab1b43a46 100644
--- a/game/engines/default/engine/PlayerProfile.lua
+++ b/game/engines/default/engine/PlayerProfile.lua
@@ -202,8 +202,11 @@ function _M:rpc(data)
print("[ONLINE PROFILE] async rpc called", "http://te4.org/lua/profilesrpc.ws/"..data.action)
local body, status = http.request("http://te4.org/lua/profilesrpc.ws/"..data.action, "json="..url.escape(json.encode(data)))
- if not body then l:send("final", nil)
- else l:send("final", json.decode(body))
+ if not body then
+ l:send("final", nil)
+ else
+ local ok, ret = pcall(json.decode, body)
+ l:send("final", ok and ret or nil)
end
return true
end
@@ -215,7 +218,8 @@ function _M:rpc(data)
print("[ONLINE PROFILE] rpc called", "http://te4.org/lua/profilesrpc.ws/"..data.action)
local body, status = http.request("http://te4.org/lua/profilesrpc.ws/"..data.action, "json="..url.escape(json.encode(data)))
if not body then return end
- return json.decode(body)
+ local ok, ret = pcall(json.decode, body)
+ return ok and ret or nil
end
end
--
GitLab