Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Forbade spectators from interacting IC.

Browse Source
This commit is contained in:
Cerapter 2018-09-15 15:00:41 +02:00
parent 29c91e63ea
commit f3e9d691af
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/aoprotocol.py
View File

@ -577,6 +577,9 @@ class AOProtocol(asyncio.Protocol):
if not self.client.is_dj: if not self.client.is_dj:
self.client.send_host_message('You were blockdj\'d by a moderator.') self.client.send_host_message('You were blockdj\'d by a moderator.')
return return
if area.cannot_ic_interact(self.client):
self.client.send_host_message("You are not on the area's invite list, and thus, you cannot change music!")
return
if not self.validate_net_cmd(args, self.ArgType.STR, self.ArgType.INT) and not self.validate_net_cmd(args, self.ArgType.STR, self.ArgType.INT, self.ArgType.STR): if not self.validate_net_cmd(args, self.ArgType.STR, self.ArgType.INT) and not self.validate_net_cmd(args, self.ArgType.STR, self.ArgType.INT, self.ArgType.STR):
return return
if args[1] != self.client.char_id: if args[1] != self.client.char_id:
@ -629,6 +632,9 @@ class AOProtocol(asyncio.Protocol):
if not self.client.can_wtce: if not self.client.can_wtce:
self.client.send_host_message('You were blocked from using judge signs by a moderator.') self.client.send_host_message('You were blocked from using judge signs by a moderator.')
return return
if self.client.area.cannot_ic_interact(self.client):
self.client.send_host_message("You are not on the area's invite list, and thus, you cannot use the WTCE buttons!")
return
if not self.validate_net_cmd(args, self.ArgType.STR) and not self.validate_net_cmd(args, self.ArgType.STR, self.ArgType.INT): if not self.validate_net_cmd(args, self.ArgType.STR) and not self.validate_net_cmd(args, self.ArgType.STR, self.ArgType.INT):
return return
if args[0] == 'testimony1': if args[0] == 'testimony1':
@ -658,6 +664,9 @@ class AOProtocol(asyncio.Protocol):
if self.client.is_muted: # Checks to see if the client has been muted by a mod if self.client.is_muted: # Checks to see if the client has been muted by a mod
self.client.send_host_message("You have been muted by a moderator") self.client.send_host_message("You have been muted by a moderator")
return return
if self.client.area.cannot_ic_interact(self.client):
self.client.send_host_message("You are not on the area's invite list, and thus, you cannot change the Confidence bars!")
return
if not self.validate_net_cmd(args, self.ArgType.INT, self.ArgType.INT): if not self.validate_net_cmd(args, self.ArgType.INT, self.ArgType.INT):
return return
try: try:

5
server/area_manager.py
View File

@ -237,11 +237,14 @@ class AreaManager:
def can_send_message(self, client): def can_send_message(self, client):
if self.is_locked != self.Locked.FREE and not client.is_mod and not client.id in self.invite_list: if self.cannot_ic_interact(client):
client.send_host_message('This is a locked area - ask the CM to speak.') client.send_host_message('This is a locked area - ask the CM to speak.')
return False return False
return (time.time() * 1000.0 - self.next_message_time) > 0 return (time.time() * 1000.0 - self.next_message_time) > 0
def cannot_ic_interact(self, client):
return self.is_locked != self.Locked.FREE and not client.is_mod and not client.id in self.invite_list
def change_hp(self, side, val): def change_hp(self, side, val):
if not 0 <= val <= 10: if not 0 <= val <= 10:
raise AreaError('Invalid penalty value.') raise AreaError('Invalid penalty value.')