monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Server: optimize send_multiple

This commit is contained in:
Fabian Dill 2022-01-31 19:05:00 +01:00
parent 00bf9c569a
commit 6333cc3bea
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
MultiServer.py
View File

@ -1186,7 +1186,7 @@ class ClientMessageProcessor(CommonCommandProcessor):
if hint_name in world.hint_blacklist: if hint_name in world.hint_blacklist:
self.output(f"Sorry, \"{hint_name}\" is marked as non-hintable.") self.output(f"Sorry, \"{hint_name}\" is marked as non-hintable.")
hints = [] hints = []
elif not for_location and hint_name in world.item_name_groups: # item group name elif not for_location and hint_name in world.item_name_groups: # item group name
hints = [] hints = []
for item in world.item_name_groups[hint_name]: for item in world.item_name_groups[hint_name]:
hints.extend(collect_hints(self.ctx, self.client.team, self.client.slot, item)) hints.extend(collect_hints(self.ctx, self.client.team, self.client.slot, item))
@ -1600,7 +1600,7 @@ class ServerCommandProcessor(CommonCommandProcessor):
self.output(f"Could not find player {player_name} to forbid the !forfeit command for.") self.output(f"Could not find player {player_name} to forbid the !forfeit command for.")
return False return False
def _cmd_send_multiple(self, amount: str, player_name: str, *item_name: str) -> bool: def _cmd_send_multiple(self, amount: typing.Union[int, str], player_name: str, *item_name: str) -> bool:
"""Sends multiples of an item to the specified player""" """Sends multiples of an item to the specified player"""
seeked_player, usable, response = get_intended_text(player_name, self.ctx.player_names.values()) seeked_player, usable, response = get_intended_text(player_name, self.ctx.player_names.values())
if usable: if usable:
@ -1609,13 +1609,15 @@ class ServerCommandProcessor(CommonCommandProcessor):
world = proxy_worlds[self.ctx.games[slot]] world = proxy_worlds[self.ctx.games[slot]]
item, usable, response = get_intended_text(item, world.item_names) item, usable, response = get_intended_text(item, world.item_names)
if usable: if usable:
for i in range(0,int(amount)): amount: int = int(amount)
new_item = NetworkItem(world.item_name_to_id[item], -1, 0) new_items = [NetworkItem(world.item_name_to_id[item], -1, 0) for i in range(int(amount))]
get_received_items(self.ctx, team, slot, True).append(new_item)
get_received_items(self.ctx, team, slot, False).append(new_item) get_received_items(self.ctx, team, slot, True).extend(new_items)
send_new_items(self.ctx) get_received_items(self.ctx, team, slot, False).extend(new_items)
self.ctx.notify_all('Cheat console: sending ' + ('' if amount == 1 else amount + ' of ') + '"' + item + '" to ' + send_new_items(self.ctx)
self.ctx.get_aliased_name(team, slot)) self.ctx.notify_all(
'Cheat console: sending ' + ('' if amount == 1 else f'{amount} of ') +
f'"{item}" to {self.ctx.get_aliased_name(team, slot)}')
return True return True
else: else:
self.output(response) self.output(response)
@ -1626,7 +1628,7 @@ class ServerCommandProcessor(CommonCommandProcessor):
def _cmd_send(self, player_name: str, *item_name: str) -> bool: def _cmd_send(self, player_name: str, *item_name: str) -> bool:
"""Sends an item to the specified player""" """Sends an item to the specified player"""
self._cmd_send_multiple(1,player_name,*item_name) return self._cmd_send_multiple(1, player_name, *item_name)
def _cmd_hint(self, player_name: str, *item: str) -> bool: def _cmd_hint(self, player_name: str, *item: str) -> bool:
"""Send out a hint for a player's item to their team""" """Send out a hint for a player's item to their team"""