Mirrored_Repos/houdini
1
0
Fork 0
mirror of https://github.com/solero/houdini.git synced 2024-11-22 05:27:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move background task calls to their respective handler modules

Browse Source
This commit is contained in:
Ben 2020-06-12 15:17:12 +01:00
parent 2ef0f457db
commit d25df447cc
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
houdini/handlers/play/music.py
View File

@ -157,6 +157,11 @@ def determine_song_length(track_pattern):
return int(track_length, 16) // 1000 return int(track_length, 16) // 1000
@handlers.boot
async def music_service_start(server):
server.music = SoundStudio(server)
@handlers.handler(XTPacket('musictrack', 'broadcastingmusictracks'), client=ClientType.Vanilla) @handlers.handler(XTPacket('musictrack', 'broadcastingmusictracks'), client=ClientType.Vanilla)
@handlers.player_in_room(SoundStudio.StudioRoomId) @handlers.player_in_room(SoundStudio.StudioRoomId)
async def handle_broadcasting_tracks(p): async def handle_broadcasting_tracks(p):

2
houdini/handlers/play/pet.py
View File

@ -231,6 +231,8 @@ async def puffles_load(server):
server.puffle_furniture_treasure = await PuffleTreasureFurniture.query.gino.all() server.puffle_furniture_treasure = await PuffleTreasureFurniture.query.gino.all()
server.puffle_clothing_treasure = await PuffleTreasureItem.query.gino.all() server.puffle_clothing_treasure = await PuffleTreasureItem.query.gino.all()
server.puffle_killer = asyncio.create_task(decrease_stats(server))
@handlers.handler(XMLPacket('login'), priority=Priority.Low) @handlers.handler(XMLPacket('login'), priority=Priority.Low)
@handlers.allow_once @handlers.allow_once

6
houdini/handlers/play/player.py
View File

@ -68,6 +68,12 @@ async def server_egg_timer(server):
await p.send_error_and_disconnect(910) await p.send_error_and_disconnect(910)
@handlers.boot
async def heartbeat_service_start(server):
server.heartbeat = asyncio.create_task(server_heartbeat(server))
server.egg_timer = asyncio.create_task(server_egg_timer(server))
MemberWarningDaysToExpiry = 14 MemberWarningDaysToExpiry = 14
MemberWarningPostcardsVanilla = [122, 123] MemberWarningPostcardsVanilla = [122, 123]
MemberWarningPostcardsLegacy = [163] MemberWarningPostcardsLegacy = [163]

11
houdini/houdini.py
View File

@ -26,11 +26,6 @@ from houdini.handlers import XTListenerManager, XMLListenerManager, DummyEventLi
from houdini.plugins import PluginManager from houdini.plugins import PluginManager
from houdini.commands import CommandManager from houdini.commands import CommandManager
from houdini.handlers.play.player import server_heartbeat, server_egg_timer
from houdini.handlers.play.pet import decrease_stats
from houdini.handlers.play.music import SoundStudio
class Houdini: class Houdini:
@ -178,12 +173,6 @@ class Houdini:
await self.plugins.setup(houdini.plugins) await self.plugins.setup(houdini.plugins)
self.heartbeat = asyncio.create_task(server_heartbeat(self))
self.egg_timer = asyncio.create_task(server_egg_timer(self))
self.puffle_killer = asyncio.create_task(decrease_stats(self))
self.music = SoundStudio(self)
async with self.server: async with self.server:
await self.server.serve_forever() await self.server.serve_forever()