From 829b91dcce56a9bd14668cbf0fc8c40e5c1479e6 Mon Sep 17 00:00:00 2001 From: Greg Taylor Date: Fri, 17 Apr 2009 14:26:01 +0000 Subject: [PATCH] To prevent funkage, added some checks to make sure IMC2 is enabled before messing with IMC stuff on @cemit. --- src/commands/comsys.py | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/commands/comsys.py b/src/commands/comsys.py index d95d370741..53d4c43093 100644 --- a/src/commands/comsys.py +++ b/src/commands/comsys.py @@ -259,19 +259,20 @@ def cmd_cemit(command): source_object.emit_to("Sent - %s" % (name_matches[0],)) src.comsys.send_cmessage(cname_parsed, final_cmessage) - # Look for IMC2 channel maps. If one is found, send an ice-msg-b - # packet to the network. - try: - from src.imc2.connection import IMC2_PROTOCOL_INSTANCE - map = IMC2ChannelMapping.objects.get(channel__name=cname_parsed) - packet = IMC2PacketIceMsgBroadcasted(map.imc2_server_name, - map.imc2_channel_name, - source_object, - cmessage) - IMC2_PROTOCOL_INSTANCE.send_packet(packet) - except IMC2ChannelMapping.DoesNotExist: - # No map found, do nothing. - pass + if settings.IMC2_ENABLED: + # Look for IMC2 channel maps. If one is found, send an ice-msg-b + # packet to the network. + try: + from src.imc2.connection import IMC2_PROTOCOL_INSTANCE + map = IMC2ChannelMapping.objects.get(channel__name=cname_parsed) + packet = IMC2PacketIceMsgBroadcasted(map.imc2_server_name, + map.imc2_channel_name, + source_object, + cmessage) + IMC2_PROTOCOL_INSTANCE.send_packet(packet) + except IMC2ChannelMapping.DoesNotExist: + # No map found, do nothing. + pass GLOBAL_CMD_TABLE.add_command("@cemit", cmd_cemit), def cmd_cwho(command):