carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity

fix this https://rdrama.net/h/meta/post/157653/i-lost-my-house-vampire-founding

master
Aevann 2023-03-24 17:22:17 +02:00
parent 02a7f5081c
commit d956431765
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
files/helpers/awards.py
View File

@ -68,15 +68,16 @@ def award_timers(v, bot=False):
badge = v.has_badge(167) badge = v.has_badge(167)
if v.bite and v.bite < now: if v.bite and v.bite < now:
v.bite = None v.bite = None
notif_text = "Your vampire status has ended." notif_text = "Your vampire status has ended."
if v.old_house:
house = v.old_house.replace(' Founder', '') if "Vampire" not in v.old_house:
notif_text += f" You're now back in House {house}!" notif_text += f" You're now back in House {v.old_house.replace(' Founder', '')}!"
v.house = v.old_house
v.old_house = ''
notify_if_not_bot(notif_text) notify_if_not_bot(notif_text)
v.house = v.old_house
v.old_house = ''
badge = v.has_badge(168) badge = v.has_badge(168)
if badge: g.db.delete(badge) if badge: g.db.delete(badge)
if v.earlylife and v.earlylife < now: if v.earlylife and v.earlylife < now:

1
files/routes/awards.py
View File

@ -406,7 +406,6 @@ def award_thing(v, thing_type, id):
if 'Vampire' not in author.house: if 'Vampire' not in author.house:
if not author.old_house: if not author.old_house:
author.old_house = author.house author.old_house = author.house
author.house = 'Vampire' author.house = 'Vampire'
badge_grant(user=author, badge_id=168) badge_grant(user=author, badge_id=168)