Skip to content

Commit 04aab76

Browse files
fix bug that would cause johnsons to forget you before a run ended
1 parent a89223a commit 04aab76

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

src/quest.cpp

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1721,10 +1721,8 @@ SPECIAL(johnson)
17211721
send_to_char(ch, "[OOC: This Johnson caps out at %d reputation, so you won't get any further work from them.]\r\n", johnson_max_rep);
17221722

17231723
GET_SPARE1(johnson) = -1;
1724-
if (memory(johnson, ch)) {
1725-
if (PLR_FLAGGED(ch, PLR_DOING_FAVOUR)) {
1726-
PLR_FLAGS(ch).RemoveBit(PLR_DOING_FAVOUR);
1727-
}
1724+
//We need to ensure that trying to start a job when you are already doing a favour won't get you blanked
1725+
if (memory(johnson, ch) && !PLR_FLAGGED(ch, PLR_DOING_FAVOUR)) {
17281726
forget(johnson, ch);
17291727
}
17301728
return TRUE;
@@ -1828,9 +1826,6 @@ SPECIAL(johnson)
18281826

18291827
GET_SPARE1(johnson) = -1;
18301828
if (memory(johnson, ch)) {
1831-
if (PLR_FLAGGED(ch, PLR_DOING_FAVOUR)) {
1832-
PLR_FLAGS(ch).RemoveBit(PLR_DOING_FAVOUR);
1833-
}
18341829
forget(johnson, ch);
18351830
}
18361831
return TRUE;

0 commit comments

Comments
 (0)