diff --git a/dist/ba_root/mods/custom_hooks.py b/dist/ba_root/mods/custom_hooks.py index d26da6f..d06a40c 100644 --- a/dist/ba_root/mods/custom_hooks.py +++ b/dist/ba_root/mods/custom_hooks.py @@ -53,7 +53,7 @@ class modSetup(ba.Plugin): if settings["afk_remover"]['enable']: afk_check.checkIdle().start() - playlist.flush_playlists() + ba.timer(60,playlist.flush_playlists) def on_app_shutdown(self): pass @@ -105,7 +105,7 @@ def bootstraping(): if settings["StumbledScoreScreen"]: from features import StumbledScoreScreen if settings["colorfullMap"]: - from plugins import colorfulmaps + from plugins import colorfulmaps2 # import features if settings["whitelist"]: diff --git a/dist/ba_root/mods/features/fire_flies.py b/dist/ba_root/mods/features/fire_flies.py index d4bb06c..0c094ba 100644 --- a/dist/ba_root/mods/features/fire_flies.py +++ b/dist/ba_root/mods/features/fire_flies.py @@ -3,6 +3,7 @@ import ba import _ba from bastd.gameutils import SharedObjects import random +import weakref from ba._messages import DieMessage, DeathType, OutOfBoundsMessage, UNHANDLED on_begin_original = ba._activity.Activity.on_begin @@ -65,6 +66,7 @@ class FireFly(ba.Actor): )) self.node = ba.newnode( 'prop', + delegate=self, attrs={ 'model': ba.getmodel('bomb'), 'position': (2,4,2), @@ -124,10 +126,11 @@ class FireFly(ba.Actor): def handlemessage(self, msg): if isinstance(msg, ba.DieMessage): self.off() - elif isinstance(msg, OutOfBoundMessage): - self.handlemessage(ba.DieMessage(how=OutOfBoundMessage)) - else: - return super().handlemessage(msg) + return None + elif isinstance(msg, OutOfBoundsMessage): + return self.handlemessage(ba.DieMessage(how=DeathType.OUT_OF_BOUNDS)) + + return super().handlemessage(msg) def generate_keys(self,m): keys = {} diff --git a/dist/ba_root/mods/plugins/colorfulmaps.py b/dist/ba_root/mods/plugins/colorfulmaps2.py similarity index 95% rename from dist/ba_root/mods/plugins/colorfulmaps.py rename to dist/ba_root/mods/plugins/colorfulmaps2.py index 98847f8..ccd292e 100644 --- a/dist/ba_root/mods/plugins/colorfulmaps.py +++ b/dist/ba_root/mods/plugins/colorfulmaps2.py @@ -2,12 +2,9 @@ # Just edit Config before starting server # by: Lirik # Further edited/Fixed by:Freak -# ba_meta require api 7 - import ba import random from random import choice - CONFIGS = { "Radius": 2.0, "Blinking": False, @@ -121,7 +118,5 @@ def Map___init__(func): return wrapper -# ba_meta export plugin -class MapColor(ba.Plugin): - def on_app_running(self): - ba.Map.__init__ = Map___init__(ba.Map.__init__) + +ba.Map.__init__ = Map___init__(ba.Map.__init__)