mirror of
https://github.com/imayushsaini/Bombsquad-Ballistica-Modded-Server.git
synced 2026-08-15 13:04:30 +00:00
resolving conflicts
This commit is contained in:
parent
792014425c
commit
7f5da6b396
4 changed files with 4 additions and 28 deletions
2
dist/ba_root/mods/custom_hooks.py
vendored
2
dist/ba_root/mods/custom_hooks.py
vendored
|
|
@ -368,7 +368,7 @@ def on_player_request(func) -> bool:
|
|||
count = 0
|
||||
if not (player.get_account_id(
|
||||
) in serverdata.clients and
|
||||
serverdata.clients[player.get_account_id()]["verified"]):
|
||||
serverdata.clients[player.get_v1_account_id()]["verified"]):
|
||||
return False
|
||||
for current_player in args[0].sessionplayers:
|
||||
if current_player.get_account_id() == player.get_account_id():
|
||||
|
|
|
|||
13
dist/ba_root/mods/stats/stats.json
vendored
13
dist/ba_root/mods/stats/stats.json
vendored
|
|
@ -13,19 +13,6 @@
|
|||
"avg_score": 0.0,
|
||||
"aid": "pb-IF4VAk4a",
|
||||
"last_seen": "2022-04-26 17:01:13.715014"
|
||||
},
|
||||
"pb-IF5cVXEyAA==": {
|
||||
"rank": 2,
|
||||
"name": "Vishyyy",
|
||||
"scores": 639,
|
||||
"total_damage": 0.0,
|
||||
"kills": 0,
|
||||
"deaths": 3,
|
||||
"games": 8,
|
||||
"kd": 0.0,
|
||||
"avg_score": 79.875,
|
||||
"last_seen": "2026-07-16 02:33:01.093212",
|
||||
"aid": "pb-IF5cVXEyAA=="
|
||||
}
|
||||
}
|
||||
}
|
||||
13
dist/ba_root/mods/stats/stats.json.backup
vendored
13
dist/ba_root/mods/stats/stats.json.backup
vendored
|
|
@ -13,19 +13,6 @@
|
|||
"avg_score": 0.0,
|
||||
"aid": "pb-IF4VAk4a",
|
||||
"last_seen": "2022-04-26 17:01:13.715014"
|
||||
},
|
||||
"pb-IF5cVXEyAA==": {
|
||||
"rank": 2,
|
||||
"name": "Vishyyy",
|
||||
"scores": 639,
|
||||
"total_damage": 0.0,
|
||||
"kills": 0,
|
||||
"deaths": 3,
|
||||
"games": 8,
|
||||
"kd": 0.0,
|
||||
"avg_score": 79.875,
|
||||
"last_seen": "2026-07-16 02:33:01.093212",
|
||||
"aid": "pb-IF5cVXEyAA=="
|
||||
}
|
||||
}
|
||||
}
|
||||
4
dist/ba_root/mods/tools/servercheck.py
vendored
4
dist/ba_root/mods/tools/servercheck.py
vendored
|
|
@ -28,7 +28,9 @@ blacklist = pdata.get_blacklist()
|
|||
# Get settings
|
||||
settings = setting.get_settings_data()
|
||||
|
||||
ipjoin = {}
|
||||
# Track IP join statistics for rate limiting/spam protection
|
||||
ipjoin: Dict[str, IPJoin] = {}
|
||||
|
||||
|
||||
@dataclass
|
||||
class PlayerData:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue