serverwatcher 3.7__tar.gz → 3.7.1__tar.gz

{serverwatcher-3.7/src/serverwatcher.egg-info → serverwatcher-3.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: serverwatcher
-Version: 3.7
+Version: 3.7.1
 Summary: A HungerLib-powered Minecraft server automation engine.
 Author: iFamished
 License: GPL-3.0

{serverwatcher-3.7 → serverwatcher-3.7.1}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "serverwatcher"
-version = "3.7"
+version = "3.7.1"
 description = "A HungerLib-powered Minecraft server automation engine."
 readme = "README.md"
 requires-python = ">=3.10"

{serverwatcher-3.7 → serverwatcher-3.7.1}/src/serverwatcher/watcher.py

@@ -142,33 +142,40 @@ class ServerWatcher:
         local_time = scheduled.astimezone(self.tz)
         time_str = local_time.strftime("%I:%M %p")
 
+        # Broadcast the scheduled restart time
         self.server.sendBroadcast(
             self.fmt(self.messages.broadcast_restart_at, time=time_str)
         )
 
-        minute_callbacks = {
-            m: (lambda msg=self.fmt(self.messages.broadcast_minute[m]):
-                self.server.sendBroadcast(msg))
-            minute_keys = [k for k in vars(self.messages) if k.startswith("minute_")]
-            minute_callbacks = {
-                k: (lambda msg=self.fmt(getattr(self.messages, k)):
-                    self.server.sendBroadcast(msg))
-                for k in minute_keys
-            }
+        # Collect all minute_* keys
+        minute_keys = [
+            k for k in vars(self.messages)
+            if k.startswith("minute_")
+        ]
 
+        minute_callbacks = {
+            int(k.split("_")[1]): (
+                lambda msg=self.fmt(getattr(self.messages, k)):
+                    self.server.sendBroadcast(msg)
+            )
+            for k in minute_keys
         }
 
+        # Collect all second_* keys
+        second_keys = [
+            k for k in vars(self.messages)
+            if k.startswith("second_")
+        ]
+
         second_callbacks = {
-            s: (lambda msg=self.fmt(self.messages.broadcast_second[s]):
-                self.server.sendBroadcast(msg))
-            second_keys = [k for k in vars(self.messages) if k.startswith("second_")]
-            second_callbacks = {
-                k: (lambda msg=self.fmt(getattr(self.messages, k)):
-                    self.server.sendBroadcast(msg))
-                for k in second_keys
-            }
+            int(k.split("_")[1]): (
+                lambda msg=self.fmt(getattr(self.messages, k)):
+                    self.server.sendBroadcast(msg)
+            )
+            for k in second_keys
         }
 
+
         runCountdownEvents(
             target_time=scheduled,
             minute_callbacks=minute_callbacks,

{serverwatcher-3.7 → serverwatcher-3.7.1/src/serverwatcher.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: serverwatcher
-Version: 3.7
+Version: 3.7.1
 Summary: A HungerLib-powered Minecraft server automation engine.
 Author: iFamished
 License: GPL-3.0