Skip to content

Commit 79dd3fd

Browse files
author
minecraft server
committed
Fixed some name issues, ops have control over other's zones.
1 parent ef152f4 commit 79dd3fd

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

helpers.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
def ops():
1010
"""Get list of op usernames."""
1111
ret = open(os.path.join(SERVER_DIR, 'ops.txt')).read().strip().split('\n')
12-
ret = [unicode(name) for name in ret]
12+
ret = [unicode(name.lower()) for name in ret]
1313
return ret
1414

1515
def server_cmd(command):
@@ -54,7 +54,7 @@ def color(name):
5454

5555
def all_users():
5656
"""Returns list of users who ever played on the server"""
57-
return [name[:-4] for name in os.listdir(os.path.join(WORLD_DIR, 'players'))]
57+
return [unicode(name[:-4]).lower() for name in os.listdir(os.path.join(WORLD_DIR, 'players'))]
5858

5959

6060
def tell(user, message, prefix=''):

plugins/zone_cmds.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def zoneinfo(message, user, name):
6969
except KeyError:
7070
tell(user, "That zone doesn't exist!")
7171
return
72-
if not controls_zone(user.username, zone):
72+
if not controls_zone(user.username, zone) and not user.username in ops():
7373
tell(user, "That isn't your zone.")
7474
return
7575

@@ -209,7 +209,7 @@ def zonedestroy(message, user, name):
209209
except KeyError:
210210
tell(user, "That zone doesn't exist!")
211211
return
212-
if not controls_zone(user.username, zone):
212+
if not controls_zone(user.username, zone) and not user.username in ops():
213213
tell(user, "That isn't your zone.")
214214
get_zones().pop(name)
215215
tell(user, "Zone deleted.")

0 commit comments

Comments
 (0)