Merge pull request #114 from dapucita/draft

v0.4.1
dapucita · Feb 5, 2021 · f222e34 · f222e34
2 parents f48a0e8 + 07fc09e
commit f222e34
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git a/core/game/controller/events/onPlayerActivity.ts b/core/game/controller/events/onPlayerActivity.ts
@@ -8,8 +8,8 @@ export function onPlayerActivityListener(player : PlayerObject): void {
 
         // reflect position in the field
         window.gameRoom.playerList.get(player.id)!.position = {
-            x: player.position.x
-            ,y: player.position.y
+            x: player.position?.x || null
+            ,y: player.position?.y || null
         }
     } else {
         window.gameRoom.logger.e('onPlayerActivity', `Error on onPlayerActivityListener: Cannot access to afktrace.count. ${player.name}#${player.id}(team ${player.team}, conn ${player.conn}) is not registered in playerList.`)

diff --git a/core/game/model/GameObject/PlayerObject.ts b/core/game/model/GameObject/PlayerObject.ts
@@ -54,8 +54,8 @@ export interface PlayerStats {
 }
 
 export interface PlayerPosition {
-    x: number;
-    y: number;
+    x: number | null;
+    y: number | null;
 }
 
 export interface PlayerPermissions {

diff --git a/core/package.json b/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "haxbotron-core",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Haxbotron is a headless host server application for Haxball.",
   "main": "out/app.js",
   "scripts": {

diff --git a/core/react/component/Admin/Dashboard.tsx b/core/react/component/Admin/Dashboard.tsx
@@ -16,6 +16,7 @@ import PowerSettingsNewIcon from '@material-ui/icons/PowerSettingsNew';
 import SettingsIcon from '@material-ui/icons/Settings';
 import NotificationsIcon from '@material-ui/icons/Notifications';
 import { makeStyles } from '@material-ui/core/styles';
+import HelpOutlineIcon from '@material-ui/icons/HelpOutline';
 import Mainboard from './Mainboard';
 import { Route, RouteComponentProps, Switch } from 'react-router-dom';
 import NotFound from '../NotFound';
@@ -167,6 +168,11 @@ function Dashboard({ match }: RouteComponentProps) {
                     <Typography component="h1" variant="h6" color="inherit" noWrap className={classes.title}>
                         Haxbotron Administrative Dashboard
                     </Typography>
+                    <IconButton color="inherit">
+                        <Badge color="secondary">
+                            <HelpOutlineIcon onClick={() => window.open('https://github.com/dapucita/haxbotron/wiki', '_blank')} />
+                        </Badge>
+                    </IconButton>
                     <IconButton color="inherit">
                         <Badge badgeContent={noti} color="secondary">
                             <NotificationsIcon />

diff --git a/db/package.json b/db/package.json
@@ -1,6 +1,6 @@
 {
     "name": "haxbotron-db",
-    "version": "0.4.0",
+    "version": "0.4.1",
     "description": "Haxbotron is a headless host server application for Haxball.",
     "main": "out/app.js",
     "author": "dapucita",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "haxbotron",
-    "version": "0.4.0",
+    "version": "0.4.1",
     "description": "Haxbotron is a headless host server application for Haxball.",
     "main": "out/index.js",
     "author": "dapucita",