remove player from state

client/src/components/info.component.jsx

@@ -12,9 +12,11 @@ function Info(args) {
 
         combiner,
         instance,
-        player,
+        account,
     } = args;
 
+    const player = instance.players.find(p => p.id === account.id);
+
     function Info() {
         if (!info) return false;
         const fullInfo = itemInfo.items.find(i => i.item === info) || INFO[info];
@@ -93,6 +95,7 @@ function Info(args) {
 
     function Combos() {
         if (!player) return false;
+        if (combiner.every(c => !c)) return false;
 
         if (!(combiner.every(u => u === null))) {
             const filteredCombos = itemInfo.combos

client/src/components/info.container.jsx

@@ -11,7 +11,7 @@ const addState = connect(
             info,
             itemInfo,
             instance,
-            player,
+            account,
         } = state;
 
         return {
@@ -20,7 +20,7 @@ const addState = connect(
             info,
             itemInfo,
             instance,
-            player,
+            account,
         };
     },
 );

client/src/components/instance.component.jsx

@@ -10,13 +10,14 @@ const actions = require('../actions');
 
 const addState = connect(
     function receiveState(state) {
-        const { ws, instance, player } = state;
+        const { ws, instance, account } = state;
+        const player = instance.players.find(p => p.id === account.id);
 
         function sendInstanceReady() {
             return ws.sendInstanceReady(instance.id);
         }
 
-        return { instance, player, sendInstanceReady };
+        return { player, instance, sendInstanceReady };
     },
 
     function receiveDispatch(dispatch) {

client/src/components/instance.cryps.jsx

@@ -8,7 +8,8 @@ const actions = require('../actions');
 
 const addState = connect(
     function receiveState(state) {
-        const { ws, instance, player, account, itemInfo, itemEquip, activeCryp } = state;
+        const { ws, instance, account, itemInfo, itemEquip, activeCryp } = state;
+        const player = instance.players.find(p => p.id === account.id);
 
         function sendInstanceReady() {
             return ws.sendInstanceReady(instance.id);
@@ -128,6 +129,7 @@ function Cryp(props) {
         return (
             <button
                 key={i}
+                disabled={!skill && !itemEquip}
                 className={classes}
                 onClick={skillClick}
                 onDblClick={skillDblClick}

client/src/components/instance.equip.jsx

@@ -8,7 +8,8 @@ const { convertItem, SPECS } = require('./../utils');
 
 const addState = connect(
     function receiveState(state) {
-        const { player, activeCryp, itemInfo, info, ws, instance, itemUnequip } = state;
+        const { account, activeCryp, itemInfo, info, ws, instance, itemUnequip } = state;
+        const player = instance.players.find(p => p.id === account.id);
 
         function sendUnequip(crypId, item) {
             return ws.sendVboxUnequip(instance.id, crypId, item);

client/src/components/nav.jsx

@@ -17,8 +17,6 @@ const addState = connect(
         } = state;
 
         function sendInstanceState(instance) {
-            ws.clearGameStateTimeout();
-            ws.clearInstanceStateTimeout();
             return ws.sendInstanceState(instance.id);
         }
 

client/src/components/vbox.component.jsx

@@ -10,14 +10,16 @@ const addState = connect(
     function receiveState(state) {
         const {
             ws,
+            account,
             instance,
-            player,
             combiner,
             reclaiming,
             vboxHighlight,
             itemInfo,
         } = state;
 
+        const player = instance.players.find(p => p.id === account.id);
+
         function sendVboxDiscard() {
             return ws.sendVboxDiscard(instance.id);
         }
@@ -34,7 +36,6 @@ const addState = connect(
             return ws.sendVboxReclaim(instance.id, i);
         }
 
-
         return {
             combiner,
             instance,