Mirrored_Repos/houdini
1
0
Fork 0
mirror of https://github.com/solero/houdini.git synced 2024-11-25 06:57:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
rsakeys 2020-04-07 19:38:49 +01:00
commit 30d36157eb
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
houdini/handlers/__init__.py
View File

@ -166,7 +166,7 @@ class _ListenerManager(_AbstractManager):
if listener_object.before is not None: if listener_object.before is not None:
index_of_before = self[listener_object.packet].index(listener_object.before) index_of_before = self[listener_object.packet].index(listener_object.before)
old_index = self[listener_object.packet].index(listener_object) old_index = self[listener_object.packet].index(listener_object)
self[listener_object.packet].insert(index_of_before, self[listener_object.packet].pop(old_index)) self[listener_object.packet].insert(index_of_before - 1, self[listener_object.packet].pop(old_index))
if listener_object.after is not None: if listener_object.after is not None:
index_of_after = self[listener_object.packet].index(listener_object.after) index_of_after = self[listener_object.packet].index(listener_object.after)
old_index = self[listener_object.packet].index(listener_object) old_index = self[listener_object.packet].index(listener_object)

3
houdini/handlers/play/rainbow.py
View File

@ -51,7 +51,8 @@ async def handle_rainbow_quest_cookie(p):
if task_completion: if task_completion:
quest_wait = RainbowQuestWaitMember if p.is_member else RainbowQuestWait quest_wait = RainbowQuestWaitMember if p.is_member else RainbowQuestWait
task_availability = datetime.utcfromtimestamp(int(task_completion)) + quest_wait task_availability = datetime.fromtimestamp(int(task_completion)) + quest_wait
minutes_remaining = int((task_availability - current_datetime).total_seconds() // 60) minutes_remaining = int((task_availability - current_datetime).total_seconds() // 60)
task_availability_unix = task_availability.timestamp() task_availability_unix = task_availability.timestamp()
else: else: