diff --git a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
index 57381c1..161ef46 100644
--- a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
+++ b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
@@ -6,8 +6,6 @@
-
-
diff --git a/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs b/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs
index b15f75a..f933166 100644
--- a/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs
+++ b/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs
@@ -51,6 +51,8 @@ public class PlayablePlayer : Player
instance = this;
AddItem(client.items[1]);
+ AddItem(client.items[0]);
+ AddItem(client.items[2]);
}
public static PlayablePlayer GetCurrentInstance()
diff --git a/Server/.idea/workspace.xml b/Server/.idea/workspace.xml
index f5a4d82..adfbec4 100644
--- a/Server/.idea/workspace.xml
+++ b/Server/.idea/workspace.xml
@@ -10,8 +10,7 @@
-
-
+
@@ -36,22 +35,22 @@
- {
+ "keyToString": {
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "WebServerToolWindowFactoryState": "false",
+ "last_opened_file_path": "/media/jonas/Data/Unity/flufflparty/Server",
+ "node.js.detected.package.eslint": "true",
+ "node.js.detected.package.tslint": "true",
+ "node.js.selected.package.eslint": "(autodetect)",
+ "node.js.selected.package.tslint": "(autodetect)",
+ "project.structure.last.edited": "Artifacts",
+ "project.structure.proportion": "0.0",
+ "project.structure.side.proportion": "0.2",
+ "vue.rearranger.settings.migration": "true"
}
-}]]>
+}
@@ -103,6 +102,7 @@
+
diff --git a/Server/out/artifacts/Server_jar/Server.jar b/Server/out/artifacts/Server_jar/Server.jar
index 05a4c3a..21706a9 100644
Binary files a/Server/out/artifacts/Server_jar/Server.jar and b/Server/out/artifacts/Server_jar/Server.jar differ
diff --git a/Server/out/production/Server/Room$1.class b/Server/out/production/Server/Room$1.class
index 05559d2..306a8b0 100644
Binary files a/Server/out/production/Server/Room$1.class and b/Server/out/production/Server/Room$1.class differ
diff --git a/Server/out/production/Server/Room.class b/Server/out/production/Server/Room.class
index d365057..d91fe1e 100644
Binary files a/Server/out/production/Server/Room.class and b/Server/out/production/Server/Room.class differ