Skip to content

Commit db268ad

Browse files
use broadcast_ooc instead of send_command for area movement messages
1 parent c079264 commit db268ad

File tree

2 files changed

+14
-21
lines changed

2 files changed

+14
-21
lines changed

server/area.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -996,12 +996,15 @@ def send_timer_set_time(self, timer_id=None, new_time=None, start=False):
996996
for c in self.clients:
997997
c.send_timer_set_time(timer_id, new_time, start)
998998

999-
def broadcast_ooc(self, msg):
999+
def broadcast_ooc(self, msg, exclude_list = []):
10001000
"""
10011001
Broadcast an OOC message to all clients in the area.
10021002
:param msg: message
10031003
"""
1004-
self.send_command("CT", self.server.config["hostname"], msg, "1")
1004+
for c in self.clients:
1005+
if c in exclude_list:
1006+
continue
1007+
c.send_command("CT", self.server.config["hostname"], msg, "1")
10051008
self.send_owner_command(
10061009
"CT", f"[{self.id}]" + self.server.config["hostname"], msg, "1"
10071010
)

server/client_manager.py

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1307,22 +1307,18 @@ def change_area(self, area, password=""):
13071307
msg=f'~~{"}}}"}{self.showname}º leaves to º{area.name}º.]',
13081308
emote_mod=1,
13091309
)
1310+
exclude_list = []
13101311
for c in old_area.clients:
13111312
# Check if the GMs should really see this msg
13121313
if c in old_area.owners and c.remote_listen in [2, 3]:
1313-
continue
1314-
c.send_command(
1315-
"CT",
1316-
self.server.config["hostname"],
1317-
f"[{self.id}] {self.showname} leaves to [{self.area.id}] {self.area.name}.",
1318-
"1",
1319-
)
1314+
exclude_list.append[c]
1315+
old_area.broadcast_ooc(
1316+
f"[{self.id}] {self.showname} leaves to [{self.area.id}] {self.area.name}.",
1317+
exclude_list
1318+
)
13201319
else:
1321-
old_area.send_command(
1322-
"CT",
1323-
self.server.config["hostname"],
1320+
old_area.broadcast_ooc(
13241321
f"[{self.id}] {self.showname} leaves to Hub [{self.area.area_manager.id}] {self.area.area_manager.name}.",
1325-
"1",
13261322
)
13271323
old_area.send_owner_command(
13281324
"CT",
@@ -1342,23 +1338,17 @@ def change_area(self, area, password=""):
13421338
if len(self.desc) > 64:
13431339
desc += f"... Use /chardesc {self.id} to read the rest."
13441340
if old_area.area_manager == self.area.area_manager:
1345-
self.area.send_command(
1346-
"CT",
1347-
self.server.config["hostname"],
1341+
self.area.broadcast_ooc(
13481342
f"[{self.id}] {self.showname} enters from [{old_area.id}] {old_area.name}{desc}",
1349-
"1",
13501343
)
13511344
if self.area.area_manager.passing_msg is True:
13521345
self.area.send_ic(
13531346
msg=f'~~{"}}}"}{self.showname}º enters from º{old_area.name}º.]',
13541347
emote_mod=1,
13551348
)
13561349
else:
1357-
self.area.send_command(
1358-
"CT",
1359-
self.server.config["hostname"],
1350+
self.area.broadcast_ooc(
13601351
f"[{self.id}] {self.showname} enters from Hub [{old_area.area_manager.id}] {old_area.area_manager.name}{desc}",
1361-
"1",
13621352
)
13631353
self.area.send_owner_command(
13641354
"CT",

0 commit comments

Comments
 (0)