Skip to content

Commit

Permalink
Merge branch 'hotfix/0.18.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
Kruptein committed Dec 5, 2019
2 parents 3c6b419 + f8e17d4 commit 0cead7c
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 11 deletions.
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,13 @@ All notable changes to this project will be documented in this file.

## Unreleased

## [0.18.0] - 2019-09-11
## [0.18.1] - 2019-12-05

### Fixed

- Shapes not syncing on mouse move.

## [0.18.0] - 2019-11-09

### Added

Expand Down
2 changes: 1 addition & 1 deletion client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "planarally-client",
"version": "0.18.0",
"version": "0.18.1",
"description": "A companion tool for when you travel into the planes.",
"scripts": {
"serve": "vue-cli-service serve",
Expand Down
2 changes: 1 addition & 1 deletion server/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.18.0
0.18.1
17 changes: 10 additions & 7 deletions server/api/socket/shape.py
Original file line number Diff line number Diff line change
Expand Up @@ -389,13 +389,16 @@ async def sync_shape_update(layer, room, data, sid, shape):
if psid == sid:
continue
pdata = { el: data[el] for el in data if el != "shape" }
if data["temporary"] and player.name not in data["shape"]["owners"]:
pdata["shape"] = deepcopy(data["shape"])
# Although we have no guarantees that the message is faked, we still would like to verify data as if it were legitimate.
for element in ["auras", "labels", "trackers"]:
pdata["shape"][element] = [el for el in pdata["shape"][element] if el["visible"]]
if not pdata["shape"]["name_visible"]:
pdata["shape"]["name"] = "?"
if data["temporary"]:
if player.name not in data["shape"]["owners"]:
pdata["shape"] = deepcopy(data["shape"])
# Although we have no guarantees that the message is faked, we still would like to verify data as if it were legitimate.
for element in ["auras", "labels", "trackers"]:
pdata["shape"][element] = [el for el in pdata["shape"][element] if el["visible"]]
if not pdata["shape"]["name_visible"]:
pdata["shape"]["name"] = "?"
else:
pdata["shape"] = shape
else:
pdata["shape"] = shape.as_dict(player, False)
await sio.emit("Shape.Update", pdata, room=psid, namespace="/planarally")
Expand Down

0 comments on commit 0cead7c

Please sign in to comment.