Skip to content

Commit fe379a4

Browse files
committed
feat: update socket to use player identifiers
Localcache now uses the player identifier which, should be more unique than player names.
1 parent b4cc119 commit fe379a4

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

js/src/socket.js

+11-11
Original file line numberDiff line numberDiff line change
@@ -134,42 +134,42 @@ function doPlayerUpdate(players){
134134
playerCount ++;
135135
if (plr == null) return;
136136

137-
if (plr.name in localCache){
137+
if (plr.id in localCache){
138138

139139
//console.log(JSON.stringify(plr));
140140
//console.log(JSON.stringify(localCache[plr.name]));
141141

142-
if (plr.x == localCache[plr.name].player.x
143-
&& plr.y == localCache[plr.name].player.y
144-
&& plr.z == localCache[plr.name].player.z){
142+
if (plr.x == localCache[plr.id].player.x
143+
&& plr.y == localCache[plr.id].player.y
144+
&& plr.z == localCache[plr.id].player.z){
145145
//Don't update position.. Player hasn't moved
146146
console.log("Player " + plr.name + " hasn't moved");
147147
}else{
148148
console.log("updated local cache for " + plr.name);
149149
//console.log(JSON.stringify(plr));
150-
localCache[plr.name].player = plr;
150+
localCache[plr.id].player = plr;
151151

152-
if (localCache[plr.name].marker != null || localCache[plr.name].marker != undefined){
152+
if (localCache[plr.id].marker != null || localCache[plr.id].marker != undefined){
153153
//update postion
154-
_MAP_markerStore[localCache[plr.name].marker].setPosition( convertToMapGMAP(plr.x, plr.y) );
154+
_MAP_markerStore[localCache[plr.id].marker].setPosition( convertToMapGMAP(plr.x, plr.y) );
155155

156156
//update popup
157157
var html = '<div class="row info-body-row"><strong>Position:</strong>&nbsp;X {' + plr.x.toFixed(4) + "} Y {" + plr.y.toFixed(4) + "} Z {" + plr.z.toFixed(4) + "}</div>";
158158
var infoContent = '<div class="info-window"><div class="info-header-box"><div class="info-icon"></div><div class="info-header">' + plr.name + '</div></div><div class="clear"></div><div id=info-body>' + html + "</div></div>";
159159
var infoBox = new google.maps.InfoWindow({
160160
content: infoContent
161161
});
162-
_MAP_markerStore[localCache[plr.name].marker].popup.setContent(infoContent);
162+
_MAP_markerStore[localCache[plr.id].marker].popup.setContent(infoContent);
163163
}
164164
}
165165

166166
}else{
167-
localCache[plr.name] = {};
168-
localCache[plr.name].player = plr;
167+
localCache[plr.id] = {};
168+
localCache[plr.id].player = plr;
169169
var obj = new MarkerObject(plr.name, new Coordinates(plr.x, plr.y, plr.z), MarkerTypes.normal, "A player", "", "");
170170
createMarker(false, false, obj, plr.name);
171171

172-
localCache[plr.name].marker = _MAP_markerStore.length - 1;
172+
localCache[plr.id].marker = _MAP_markerStore.length - 1;
173173
}
174174
});
175175

0 commit comments

Comments
 (0)