Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

To prevent funkage, added some checks to make sure IMC2 is enabled before messing with IMC stuff on @cemit.

Browse source
This commit is contained in:
Greg Taylor 2009-04-17 14:26:01 +00:00
parent 4121b54e4c
commit 829b91dcce
1 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/commands/comsys.py
View file

@ -259,19 +259,20 @@ def cmd_cemit(command):
source_object.emit_to("Sent - %s" % (name_matches[0],)) source_object.emit_to("Sent - %s" % (name_matches[0],))
src.comsys.send_cmessage(cname_parsed, final_cmessage) src.comsys.send_cmessage(cname_parsed, final_cmessage)
# Look for IMC2 channel maps. If one is found, send an ice-msg-b if settings.IMC2_ENABLED:
# packet to the network. # Look for IMC2 channel maps. If one is found, send an ice-msg-b
try: # packet to the network.
from src.imc2.connection import IMC2_PROTOCOL_INSTANCE try:
map = IMC2ChannelMapping.objects.get(channel__name=cname_parsed) from src.imc2.connection import IMC2_PROTOCOL_INSTANCE
packet = IMC2PacketIceMsgBroadcasted(map.imc2_server_name, map = IMC2ChannelMapping.objects.get(channel__name=cname_parsed)
map.imc2_channel_name, packet = IMC2PacketIceMsgBroadcasted(map.imc2_server_name,
source_object, map.imc2_channel_name,
cmessage) source_object,
IMC2_PROTOCOL_INSTANCE.send_packet(packet) cmessage)
except IMC2ChannelMapping.DoesNotExist: IMC2_PROTOCOL_INSTANCE.send_packet(packet)
# No map found, do nothing. except IMC2ChannelMapping.DoesNotExist:
pass # No map found, do nothing.
pass
GLOBAL_CMD_TABLE.add_command("@cemit", cmd_cemit), GLOBAL_CMD_TABLE.add_command("@cemit", cmd_cemit),
def cmd_cwho(command): def cmd_cwho(command):