Merge branch 'player-report-fix-conflict' into player-report

# Conflicts: # back/src/Controller/IoSocketController.ts
2020-10-13 21:16:57 +02:00
parent 05a1ea8469 9c44d37020
commit 047fa7b594
2 changed files with 4 additions and 0 deletions
@@ -16,6 +16,7 @@ import {
    ITiledMapLayerProperty, ITiledMapObject,
    ITiledTileSet
 } from "../Map/ITiledMap";
+import {PLAYER_RESOURCES, PlayerResourceDescriptionInterface} from "../Entity/Character";
 import {AddPlayerInterface} from "./AddPlayerInterface";
 import {PlayerAnimationNames} from "../Player/Animation";
 import {PlayerMovement} from "./PlayerMovement";