public/traque
1
0
Fork 0
mirror of https://git.rezel.net/LudoTech/traque.git synced 2026-02-09 10:20:16 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:quentinrsl/traque

Browse Source
This commit is contained in:
Quentin Roussel
2024-05-01 10:46:20 +02:00
parent a6d18fb60f 1896e3ce00
commit 9615d4fecd
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
traque-back/team_socket.js
View File

@@ -99,6 +99,10 @@ export function initTeamSocket() {
return; return;
} }
let team = game.getTeam(teamId) let team = game.getTeam(teamId)
if(team == undefined) {
logoutPlayer(socket.id);
return;
}
if (team.sockets.indexOf(socket.id) == 0) { if (team.sockets.indexOf(socket.id) == 0) {
game.updateLocation(teamId, position); game.updateLocation(teamId, position);
teamBroadcast(teamId, "update_team", { currentLocation: team.currentLocation, ready: team.ready }); teamBroadcast(teamId, "update_team", { currentLocation: team.currentLocation, ready: team.ready });
@@ -120,8 +124,8 @@ export function initTeamSocket() {
}); });
socket.on('capture', (captureCode) => { socket.on('capture', (captureCode) => {
let capturedTeam = game.getTeam(teamId).chasing let capturedTeam = game.getTeam(teamId)?.chasing
if (game.requestCapture(teamId, captureCode)) { if (capturedTeam !== undefined && game.requestCapture(teamId, captureCode)) {
sendUpdatedTeamInformations(teamId) sendUpdatedTeamInformations(teamId)
sendUpdatedTeamInformations(capturedTeam) sendUpdatedTeamInformations(capturedTeam)
secureAdminBroadcast("teams", game.teams); secureAdminBroadcast("teams", game.teams);

2
traque-front/context/teamContext.jsx
View File

@@ -14,7 +14,7 @@ function TeamProvider({children}) {
const [gameSettings, setGameSettings] = useState(null); const [gameSettings, setGameSettings] = useState(null);
const [zone, setZone] = useState(null); const [zone, setZone] = useState(null);
const [zoneExtremities, setZoneExtremities] = useState(null); const [zoneExtremities, setZoneExtremities] = useState(null);
const measuredLocation = useLocation(10000); const measuredLocation = useLocation(5000);
const {teamSocket} = useSocket(); const {teamSocket} = useSocket();
const {loggedIn} = useTeamConnexion(); const {loggedIn} = useTeamConnexion();
const teamInfosRef = useRef(); const teamInfosRef = useRef();