diff --git a/friends.py b/friends.py index ec1b89d..ce687cd 100644 --- a/friends.py +++ b/friends.py @@ -1,7 +1,7 @@ from helpers import * friends_filename = "plugins/redstoner-utils.py.dir/files/friends.json" -friends = open_json_file(friends_filename) # {Player_UUID:[List_of_friend_uuids]} +friends = open_json_file(friends_filename, {}) # {Player_UUID:[List_of_friend_uuids]} friend_join_sound = "random.orb" diff --git a/helpers.py b/helpers.py index f46237c..25b4091 100644 --- a/helpers.py +++ b/helpers.py @@ -119,16 +119,18 @@ def played_before(player): return True -def open_json_file(filename): +def open_json_file(filename, default): """ opens the given json file and returns an object or returns None on error filename is the path + name of the file. """ + data = None try: with open(filename) as obj: - return json_loads(obj.read()) + data = json_loads(obj.read()) except Exception, e: error("Failed to read from %s: %s" % (filename, e)) + return (default if data is None else data) def save_json_file(filename, obj):