mirror of
https://github.com/imayushsaini/Bombsquad-Ballistica-Modded-Server.git
synced 2026-08-15 13:04:30 +00:00
conflict fixing
This commit is contained in:
parent
4d6361e0db
commit
bccf0fc62f
1 changed files with 2 additions and 3 deletions
5
dist/ba_root/mods/tools/servercheck.py
vendored
5
dist/ba_root/mods/tools/servercheck.py
vendored
|
|
@ -14,7 +14,7 @@ import _babase
|
|||
import _bascenev1
|
||||
import babase
|
||||
import bascenev1 as bs
|
||||
from babase._general import CallPartial
|
||||
from babase._general import Call
|
||||
from features import profanity
|
||||
from playersdata import pdata
|
||||
from repository import profiles
|
||||
|
|
@ -443,8 +443,7 @@ class LoadProfile(threading.Thread):
|
|||
def run(self) -> None:
|
||||
player_data = pdata.get_info(self.pbid)
|
||||
_babase.pushcall(
|
||||
CallPartial(on_player_join_server, self.pbid,
|
||||
player_data, self.ip, self.device_id),
|
||||
Call(_on_profile_loaded, self.pbid, player_data, self.ip, self.device_id, self.client_id, self.display_string),
|
||||
from_other_thread=True,
|
||||
)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue