From dd3ec0316cbfdb033fae9d6a52b957eb1196e20f Mon Sep 17 00:00:00 2001 From: Atsuyo-INSA Date: Wed, 6 Dec 2023 10:19:54 +0100 Subject: [PATCH 1/4] bullet Paquet Name --- js/network.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/network.js b/js/network.js index 6904ab0..4f1b0d6 100644 --- a/js/network.js +++ b/js/network.js @@ -35,7 +35,7 @@ class Network{ this.playersToRemove.push(data.data.id); break; case "newBullet": - this.bulletsToAdd.push(new Bullet(data.x,data.y,data.dx,data.dy)); + this.bulletsToAdd.push(new Bullet(data.data.x,data.data.y,data.data.dx,data.data.dy)); break; default: break; @@ -61,7 +61,7 @@ class Network{ newBullet(x_,y_,dx_,dy_) { - this.socket.send(JSON.stringify({type:"newBullet",x: x_,y: y_,dx: dx_,dy: dy_})); + this.socket.send(JSON.stringify({type:"newBullet",data:{x: x_,y: y_,dx: dx_,dy: dy_}})); } getPlayersToAdd(){ //returns the list of new players From 77460ec9bd162f6ff760b4b2b77f89ffdb69d6b6 Mon Sep 17 00:00:00 2001 From: Killian Marty Date: Wed, 6 Dec 2023 10:20:31 +0100 Subject: [PATCH 2/4] srv --- server/server.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/server.js b/server/server.js index 475151c..e65d2c5 100644 --- a/server/server.js +++ b/server/server.js @@ -113,6 +113,8 @@ wss.on('connection', (socket, req) => { } } broadcast(JSON.stringify(message), socket.id); + } else if(message.type=="newBullet"){ + broadcast(message, socket.id); } }); From d0bc585a47cba4a7c0461e0bfd2feafb2821fd9b Mon Sep 17 00:00:00 2001 From: Killian Marty Date: Wed, 6 Dec 2023 10:22:55 +0100 Subject: [PATCH 3/4] srv --- server/server.js | 1 + 1 file changed, 1 insertion(+) diff --git a/server/server.js b/server/server.js index e65d2c5..82de15c 100644 --- a/server/server.js +++ b/server/server.js @@ -114,6 +114,7 @@ wss.on('connection', (socket, req) => { } broadcast(JSON.stringify(message), socket.id); } else if(message.type=="newBullet"){ + console.log(message); broadcast(message, socket.id); } }); From 0b1b7af46f6159e64d28ee462b4c1056af2e0ad6 Mon Sep 17 00:00:00 2001 From: Killian Marty Date: Wed, 6 Dec 2023 10:25:42 +0100 Subject: [PATCH 4/4] srv --- server/server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/server.js b/server/server.js index 82de15c..01243ce 100644 --- a/server/server.js +++ b/server/server.js @@ -115,7 +115,7 @@ wss.on('connection', (socket, req) => { broadcast(JSON.stringify(message), socket.id); } else if(message.type=="newBullet"){ console.log(message); - broadcast(message, socket.id); + broadcast(JSON.stringify(message), socket.id); } });