This commit is contained in:
2021-04-30 14:13:52 +02:00
parent d94fe1204f
commit 3d6c82227a
6 changed files with 56 additions and 33 deletions

View File

@ -80,7 +80,7 @@ class AsyncClient():
Data = json.dumps(obj, ensure_ascii = False, separators = (',', ':')).encode("UTF-8")
with (await self.SendLock):
async with self.SendLock:
if not self.Protocol:
return None

View File

@ -331,7 +331,7 @@ class OpenWeather(BaseCommand):
import geoip2.database
def __init__(self, torchlight):
super().__init__(torchlight)
self.GeoIP = self.geoip2.database.Reader("/usr/share/GeoIP/GeoLite2-City.mmdb")
self.GeoIP = self.geoip2.database.Reader("/var/lib/GeoIP/GeoLite2-City.mmdb")
self.Triggers = ["!w", "!vv"]
self.Level = 0
@ -713,7 +713,7 @@ class Say(BaseCommand):
asyncio.ensure_future(self.Say(player, Language, message[1]))
return 0
'''
class DECTalk(BaseCommand):
import tempfile
def __init__(self, torchlight):
@ -753,7 +753,7 @@ class DECTalk(BaseCommand):
asyncio.ensure_future(self.Say(player, message[1]))
return 0
'''
class Stop(BaseCommand):
def __init__(self, torchlight):

View File

@ -2,7 +2,6 @@
# -*- coding: utf-8 -*-
import asyncio
import logging
import numpy
from .Constants import *
class PlayerManager():
@ -10,7 +9,7 @@ class PlayerManager():
self.Logger = logging.getLogger(__class__.__name__)
self.Torchlight = master
self.Players = numpy.empty(MAXPLAYERS + 1, dtype = object)
self.Players = [None] * (MAXPLAYERS + 1)
self.Storage = self.StorageManager(self)
self.Torchlight().GameEvents.HookEx("player_connect", self.Event_PlayerConnect)
@ -68,7 +67,7 @@ class PlayerManager():
self.Storage.Reset()
for i in range(1, self.Players.size):
for i in range(1, len(self.Players)):
if self.Players[i]:
self.Players[i].OnDisconnect("mapchange")
self.Players[i].OnConnect()
@ -90,7 +89,7 @@ class PlayerManager():
def __len__(self):
Count = 0
for i in range(1, self.Players.size):
for i in range(1, len(self.Players)):
if self.Players[i]:
Count += 1
return Count
@ -104,7 +103,7 @@ class PlayerManager():
return self.Players[key]
def __iter__(self):
for i in range(1, self.Players.size):
for i in range(1, len(self.Players)):
if self.Players[i]:
yield self.Players[i]