mascully/wingbase
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix game crashing on ship destruction

Browse source
This commit is contained in:
Asraelite 2016-04-02 18:43:11 +01:00
parent 7bd1935723
commit f138654ccb
3 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/static/js/wingbase/world/world.js
View file

@ -66,6 +66,8 @@ class World {
body.update(data.slice(i, i + body.interface.size)); body.update(data.slice(i, i + body.interface.size));
} else if (discharge) { } else if (discharge) {
discharge.update(data.slice(i, i + 2)); discharge.update(data.slice(i, i + 2));
} else {
return;
} }
i += body.interface.size; i += body.interface.size;

2
server/game/room/index.js
View file

@ -13,7 +13,7 @@ class Room {
this.teamB = new Set(); this.teamB = new Set();
this.world = new World(this); this.world = new World(this);
this.name = (Math.random() * 100000 | 0).toString(36); this.name = (Math.random() * 100000 | 0).toString(36);
this.tps = wingbase.args.development ? 5 : 60; this.tps = wingbase.args.development ? 60 : 60;
this.idGenerator = (function*() { this.idGenerator = (function*() {
let i = 0; let i = 0;

3
server/game/room/world/index.js
View file

@ -89,6 +89,8 @@ class World {
applyDelta(data, bodyPos) { applyDelta(data, bodyPos) {
data = data.map(v => +(v.toFixed(3))); data = data.map(v => +(v.toFixed(3)));
this.players.forEach(player => { this.players.forEach(player => {
if (!player.ship)
return;
let dx = player.ship.pos.x - bodyPos.x; let dx = player.ship.pos.x - bodyPos.x;
let dy = player.ship.pos.y - bodyPos.y; let dy = player.ship.pos.y - bodyPos.y;
if (dx * dx + dy * dy < 900) if (dx * dx + dy * dy < 900)
@ -132,6 +134,7 @@ class World {
} }
removeBody(body) { removeBody(body) {
if(!body) return;
body.destruct(); body.destruct();
this.bodies.delete(body); this.bodies.delete(body);
this.asteroids.delete(body); this.asteroids.delete(body);