Skip to content

Commit

Permalink
cross-server introduction system fix.
Browse files Browse the repository at this point in the history
git-svn-id: svn://192.168.1.10/public/CoffeeMud@17159 0d6f1817-ed0e-0410-87c9-987e46238f29
  • Loading branch information
bozimmerman committed Aug 29, 2018
1 parent 5ca105e commit fa2d24c
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions com/planet_ink/coffee_mud/MOBS/StdMOB.java
Original file line number Diff line number Diff line change
Expand Up @@ -3361,7 +3361,9 @@ public final void apply(final ScriptingEngine S)
break;
case CMMsg.TYP_SPEAK:
{
if ((CMProps.getBoolVar(CMProps.Bool.INTRODUCTIONSYSTEM)) && (!asleep) && (canhearsrc))
if ((CMProps.getBoolVar(CMProps.Bool.INTRODUCTIONSYSTEM)
|| CMProps.get(mySession).getBool(CMProps.Bool.INTRODUCTIONSYSTEM))
&& (!asleep) && (canhearsrc))
CMLib.commands().handleIntroductions(srcM, this, msg.targetMessage());
CMLib.commands().handleBeingSpokenTo(srcM, this, msg.targetMessage());
break;
Expand Down Expand Up @@ -3493,8 +3495,9 @@ public final void apply(final ScriptingEngine S)
else
if ((CMath.bset(othersMajor, CMMsg.MASK_SOUND)) && (!asleep) && (canhearsrc))
{
if ((CMProps.getBoolVar(CMProps.Bool.INTRODUCTIONSYSTEM))
&& (msg.othersMinor() == CMMsg.TYP_SPEAK))
if((msg.othersMinor() == CMMsg.TYP_SPEAK)
&& (CMProps.getBoolVar(CMProps.Bool.INTRODUCTIONSYSTEM)
|| CMProps.get(mySession).getBool(CMProps.Bool.INTRODUCTIONSYSTEM)))
CMLib.commands().handleIntroductions(srcM, this, msg.othersMessage());
tell(srcM, msg.target(), msg.tool(), msg.othersMessage());
}
Expand Down

0 comments on commit fa2d24c

Please sign in to comment.