Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Make gametime use timezone-aware datetimes"

Browse source 
This reverts commit 1716944875.
This commit is contained in:
Tim Chaplin 2021-01-18 15:53:50 -05:00
parent 1716944875
commit 5cfdfe95a6
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
evennia/utils/gametime.py
View file

@ -8,7 +8,7 @@ total runtime of the server and the current uptime.
import time import time
from calendar import monthrange from calendar import monthrange
from datetime import datetime, timedelta, timezone from datetime import datetime, timedelta
from django.conf import settings from django.conf import settings
from evennia import DefaultScript from evennia import DefaultScript
@ -180,14 +180,14 @@ def real_seconds_until(sec=None, min=None, hour=None, day=None, month=None, year
""" """
current = datetime.fromtimestamp(gametime(absolute=True), timezone.utc) current = datetime.fromtimestamp(gametime(absolute=True))
s_sec = sec if sec is not None else current.second s_sec = sec if sec is not None else current.second
s_min = min if min is not None else current.minute s_min = min if min is not None else current.minute
s_hour = hour if hour is not None else current.hour s_hour = hour if hour is not None else current.hour
s_day = day if day is not None else current.day s_day = day if day is not None else current.day
s_month = month if month is not None else current.month s_month = month if month is not None else current.month
s_year = year if year is not None else current.year s_year = year if year is not None else current.year
projected = datetime(s_year, s_month, s_day, s_hour, s_min, s_sec, tzinfo=timezone.utc) projected = datetime(s_year, s_month, s_day, s_hour, s_min, s_sec)
if projected <= current: if projected <= current:
# We increase one unit of time depending on parameters # We increase one unit of time depending on parameters