From 056b73dd3e864075d4add9fb9a06ae324cebf8a1 Mon Sep 17 00:00:00 2001
From: brausjonas <brausjonas@gmail.com>
Date: Tue, 28 Mar 2023 21:05:27 +0200
Subject: [PATCH] Fixed Double Dice (hopefully)

---
 FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml | 2 +-
 FlufflParty/Assets/Scenes/WesternMap.unity              | 4 +++-
 FlufflParty/Assets/Scripts/Players/Player.cs            | 2 ++
 Server/.idea/workspace.xml                              | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
index 650ede0..044b626 100644
--- a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
+++ b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
@@ -136,7 +136,7 @@
       <workItem from="1678046412549" duration="3738000" />
       <workItem from="1679426348887" duration="3549000" />
       <workItem from="1679597961773" duration="4070000" />
-      <workItem from="1680022248953" duration="3842000" />
+      <workItem from="1680022248953" duration="5220000" />
     </task>
     <servers />
   </component>
diff --git a/FlufflParty/Assets/Scenes/WesternMap.unity b/FlufflParty/Assets/Scenes/WesternMap.unity
index e255d07..28dd5ff 100644
--- a/FlufflParty/Assets/Scenes/WesternMap.unity
+++ b/FlufflParty/Assets/Scenes/WesternMap.unity
@@ -568,6 +568,7 @@ MonoBehaviour:
   layout2: {fileID: 1115580907}
   items:
   - {fileID: 8043942569442897806, guid: d00b626b793557643a67184af1354f88, type: 3}
+  - {fileID: 8407720689226963387, guid: 46bb574199f4be04e92e9601f8b5e2a5, type: 3}
   itemButtons:
   - {fileID: 823630953}
   - {fileID: 1021992538}
@@ -11041,6 +11042,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   items:
   - {fileID: 1547369680}
+  - {fileID: 1261969992}
 --- !u!1 &1237875978
 GameObject:
   m_ObjectHideFlags: 0
@@ -17961,7 +17963,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &2010829641
 RectTransform:
   m_ObjectHideFlags: 0
diff --git a/FlufflParty/Assets/Scripts/Players/Player.cs b/FlufflParty/Assets/Scripts/Players/Player.cs
index 178bc29..c280c84 100644
--- a/FlufflParty/Assets/Scripts/Players/Player.cs
+++ b/FlufflParty/Assets/Scripts/Players/Player.cs
@@ -86,6 +86,8 @@ public abstract class Player : MonoBehaviour
                 break;
             }
         }
+        
+        Debug.Log(item.type);
     }
 
     public void ActivateItem(int index)
diff --git a/Server/.idea/workspace.xml b/Server/.idea/workspace.xml
index 628f125..27b1b65 100644
--- a/Server/.idea/workspace.xml
+++ b/Server/.idea/workspace.xml
@@ -90,7 +90,7 @@
       <workItem from="1677520608630" duration="13000" />
       <workItem from="1677789901008" duration="661000" />
       <workItem from="1677881295823" duration="3489000" />
-      <workItem from="1680022478274" duration="2185000" />
+      <workItem from="1680022478274" duration="2445000" />
     </task>
     <servers />
   </component>