Fix Bug #134 - Issue with Limiting Fire in Hunger Baubles

SBA_Serv/World/Messaging.py

@@ -92,22 +92,26 @@ def __repr__(self):
 class OneTimeCommand(Command):
     def __init__(self, obj, msg, executefirst=False, ttl=4, required=0):
         super(OneTimeCommand, self).__init__(obj, msg, ttl, block=True, required=required)
+        self.__pre_execute = executefirst
         self.__executed = False
         self.__done = False
-        if executefirst:
-            self.__executed = True
-            self.onetime()
 
     def isComplete(self):
         return self.__done and self.__executed
 
     def isExpired(self):
         self.__done = super(OneTimeCommand, self).isExpired()
-        if not self.__executed:
+        # execute when expiring if tail end
+        if self.__done and not self.__executed:
             self.__executed = True
             self.onetime()
 
     def execute(self, t):
+        # check if execute now if front end
+        if not self.__executed and self.__pre_execute:
+            self.__executed = True
+            self.onetime()
+
         self.isExpired()
 
     def onetime(self):