From 311f141febcbcdc4b1588894fe13b9d1d6b6e53b Mon Sep 17 00:00:00 2001
From: AliIbnAbiTalib <a.fistik14@gmail.com>
Date: Mon, 20 Feb 2023 21:51:15 +0100
Subject: [PATCH] Server Sync

Player move on sync
---
 .idea/misc.xml                                |   2 +-
 .idea/vcs.xml                                 |   6 ++++
 .idea/workspace.xml                           |  32 ++++++++++++++++--
 .../.idea.FlufflParty/.idea/workspace.xml     |  10 +++++-
 FlufflParty/Assets/Scripts/Client.cs          |   2 +-
 FlufflParty/Assets/Scripts/ItemShop.cs        |  15 ++++----
 .../Scripts/Players/NoPlayablePlayer.cs       |   5 ---
 .../Assets/Scripts/Players/PlayablePlayer.cs  |   5 +--
 FlufflParty/Assets/Scripts/Players/Player.cs  |   5 +++
 FlufflParty/Packages/packages-lock.json       |   6 ++--
 Server/out/artifacts/Server_jar/Server.jar    | Bin 10627 -> 10621 bytes
 Server/out/production/Server/Room$2.class     | Bin 2545 -> 2532 bytes
 Server/out/production/Server/Room.class       | Bin 5390 -> 5390 bytes
 Server/src/Room.java                          |   3 --
 14 files changed, 66 insertions(+), 25 deletions(-)
 create mode 100644 .idea/vcs.xml

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 639900d..93cd0af 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_19" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ad3b8ac..263d08d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,16 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="e1ac5a43-1258-486e-9afa-562e60808847" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/FlufflParty/Assets/Scripts/Client.cs" beforeDir="false" afterPath="$PROJECT_DIR$/FlufflParty/Assets/Scripts/Client.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlufflParty/Packages/manifest.json" beforeDir="false" afterPath="$PROJECT_DIR$/FlufflParty/Packages/manifest.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/FlufflParty/Assets/Scripts/ItemShop.cs" beforeDir="false" afterPath="$PROJECT_DIR$/FlufflParty/Assets/Scripts/ItemShop.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs" beforeDir="false" afterPath="$PROJECT_DIR$/FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs" beforeDir="false" afterPath="$PROJECT_DIR$/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/FlufflParty/Assets/Scripts/Players/Player.cs" beforeDir="false" afterPath="$PROJECT_DIR$/FlufflParty/Assets/Scripts/Players/Player.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/FlufflParty/Packages/packages-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/FlufflParty/Packages/packages-lock.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlufflParty/ProjectSettings/ProjectVersion.txt" beforeDir="false" afterPath="$PROJECT_DIR$/FlufflParty/ProjectSettings/ProjectVersion.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Server/src/Room.java" beforeDir="false" afterPath="$PROJECT_DIR$/Server/src/Room.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -28,9 +34,28 @@
     "RunOnceActivity.OpenProjectViewOnStart": "true",
     "RunOnceActivity.ShowReadmeOnStart": "true",
     "WebServerToolWindowFactoryState": "false",
-    "last_opened_file_path": "C:/flufflparty"
+    "last_opened_file_path": "C:/flufflparty/Server",
+    "project.structure.last.edited": "Project",
+    "project.structure.proportion": "0.15",
+    "project.structure.side.proportion": "0.0",
+    "settings.editor.selected.configurable": "preferences.lookFeel"
   }
 }]]></component>
+  <component name="RunManager">
+    <configuration default="true" type="JetRunConfigurationType">
+      <module name="flufflparty" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration default="true" type="KotlinStandaloneScriptRunConfigurationType">
+      <module name="flufflparty" />
+      <option name="filePath" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+  </component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
@@ -40,6 +65,7 @@
       <option name="presentableId" value="Default" />
       <updated>1676488026665</updated>
       <workItem from="1676488028412" duration="3783000" />
+      <workItem from="1676925887035" duration="132000" />
     </task>
     <servers />
   </component>
diff --git a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
index 9832234..e2af4a2 100644
--- a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
+++ b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="f0abe486-ee58-49bd-ad63-04a8b3fc78ec" name="Changes" comment="" />
+    <list default="true" id="f0abe486-ee58-49bd-ad63-04a8b3fc78ec" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.FlufflParty/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.FlufflParty/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Scripts/Client.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Client.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Scripts/ItemShop.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/ItemShop.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Scripts/Players/NoPlayablePlayer.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Players/NoPlayablePlayer.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Scripts/Players/PlayablePlayer.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Players/PlayablePlayer.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Scripts/Players/Player.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Players/Player.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Packages/packages-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/Packages/packages-lock.json" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
diff --git a/FlufflParty/Assets/Scripts/Client.cs b/FlufflParty/Assets/Scripts/Client.cs
index 7fa74c9..b98c26b 100644
--- a/FlufflParty/Assets/Scripts/Client.cs
+++ b/FlufflParty/Assets/Scripts/Client.cs
@@ -130,7 +130,7 @@ public class Client : MonoBehaviour
                     ((NoPlayablePlayer)players[job.data[1]]).CoinFieldAction(job.data[2]);
                     break;
                 case 7:
-                    ((NoPlayablePlayer)players[job.data[1]]).EventStopFinished();
+                    (players[job.data[1]]).EventStopFinished();
                     break;
                 case 126:
                     stream.Write(new byte[]{126, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 0, 10);
diff --git a/FlufflParty/Assets/Scripts/ItemShop.cs b/FlufflParty/Assets/Scripts/ItemShop.cs
index 9b315f6..b632217 100644
--- a/FlufflParty/Assets/Scripts/ItemShop.cs
+++ b/FlufflParty/Assets/Scripts/ItemShop.cs
@@ -4,15 +4,18 @@ using UnityEngine;
 
 public class ItemShop : MonoBehaviour
 {
-    // Start is called before the first frame update
-    void Start()
+    [SerializeField] private GameObject Layout2;
+    [SerializeField] private GameObject LayoutItemShop;
+    [SerializeField] private Client client;
+    public void buttonMoveOn()
     {
-        
+        Layout2.SetActive(false);
+        client.EventStopFinished();
     }
 
-    // Update is called once per frame
-    void Update()
+    public void buttonEnter()
     {
-        
+        Layout2.SetActive(false);
+        LayoutItemShop.SetActive(true);
     }
 }
diff --git a/FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs b/FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs
index 180dae0..a344ccf 100644
--- a/FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs
+++ b/FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs
@@ -152,9 +152,4 @@ public class NoPlayablePlayer : Player
         }
     }
 
-    public void EventStopFinished()
-    {
-        eventstop = false;
-    }
-    
 }
diff --git a/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs b/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs
index da6e8c5..979c781 100644
--- a/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs
+++ b/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs
@@ -37,12 +37,13 @@ public class PlayablePlayer : Player
 
     private void Update()
     {
-        if (Input.GetMouseButtonDown(0))
+        /*
+         if (Input.GetMouseButtonDown(0))
         {
             eventstop = false;
             client.EventStopFinished();
         }
-
+        */
         if (activated && !name.Equals(""))
         {
             //Generiere Würfelzahl von 1-6 wenn gerade gewürfelt werden darf
diff --git a/FlufflParty/Assets/Scripts/Players/Player.cs b/FlufflParty/Assets/Scripts/Players/Player.cs
index 62abaeb..b88583a 100644
--- a/FlufflParty/Assets/Scripts/Players/Player.cs
+++ b/FlufflParty/Assets/Scripts/Players/Player.cs
@@ -70,4 +70,9 @@ public abstract class Player : MonoBehaviour
         eventstop = true;
         Layout2.SetActive(true);
     }
+    
+    public void EventStopFinished()
+    {
+        eventstop = false;
+    }
 }
diff --git a/FlufflParty/Packages/packages-lock.json b/FlufflParty/Packages/packages-lock.json
index f612085..8aa26df 100644
--- a/FlufflParty/Packages/packages-lock.json
+++ b/FlufflParty/Packages/packages-lock.json
@@ -47,8 +47,8 @@
       "depth": 0,
       "source": "builtin",
       "dependencies": {
-        "com.unity.ide.visualstudio": "2.0.16",
-        "com.unity.ide.rider": "3.0.16",
+        "com.unity.ide.visualstudio": "2.0.17",
+        "com.unity.ide.rider": "3.0.18",
         "com.unity.ide.vscode": "1.2.5",
         "com.unity.editorcoroutines": "1.0.0",
         "com.unity.performance.profile-analyzer": "1.1.1",
@@ -112,7 +112,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.services.core": {
-      "version": "1.6.0",
+      "version": "1.7.0",
       "depth": 1,
       "source": "registry",
       "dependencies": {
diff --git a/Server/out/artifacts/Server_jar/Server.jar b/Server/out/artifacts/Server_jar/Server.jar
index 3c3c92c40699962d4faefd82eabb6b8cd2dd9702..13b7c62351550afd8e94b5d29d61091e97ed0a27 100644
GIT binary patch
delta 4473
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
Nw%}p`GI0E{{Rhw_N}T`z

delta 4476
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
al%|6Dnf}fs|NHkg)s&x&ke&BW!T$hoKTZJv

diff --git a/Server/out/production/Server/Room$2.class b/Server/out/production/Server/Room$2.class
index 4569b959957dc69f16804a1c80879c38675c1f2c..183b34c375232057fa0f3362610dd6371a71aaee 100644
GIT binary patch
delta 263
zcmXYsy-EX76okKf_9t11MT}7)ji{&_V-gg_M$pDB6jQ7|fLd7DYv&ILsc*BOl}NUU
zvWN+r#x8}OzJo7ds|36dt2umUm|?yPUxnn{@d8{NkVIcO4b{+}&Z^qdr>?K7?uP1^
z>qv$A-Mv;HdM|UFKeN{DqFsJPr8sX7?CO3d2%clc{#j`yWwgV1Jc#y(s5q2~E|c-#
z1|i2R^LW%Hk~^ao(?APfhuLQ7lD6EENRt<d=ov>>?n&i|p8m~lZXe=P#%4`USfYYu
qzIhf{G&yDmGt8N^5oxh(e2SbrQl(~k>xPF+=?ibi`r$zLy~-b=;yw)k

delta 276
zcmXYsJxfAi9L0an|GwxA8_I4H4n;-f%}k1-r6DL?dLghNnrexrhL)Cw8iF7QdUhih
zLmUKCZYVW3w)6@50<MM712&z*IfrvN-|<eocHwvhTpW<5zH)Zdp8j+eRZgF{DV=dw
zRLig<b)Y}oYxSi!BgctzYuWbg-~|=pyp`DX?c^gH`aP1*KbIN&cajSs{SAi7-G}X-
z<o95>Nuu1nM2IoL6dqYA%9BBhF`z=Ax1zVB>(u0is@zeRdm2)tZBnmNq9t|Ox)WVp
zJ0wMb&61olOB&0#157hxy38ZSnKX@kQf1EM6fvogVcu+KjlR!_KJ#+!FNGf*9eU|M
D76Cz<

diff --git a/Server/out/production/Server/Room.class b/Server/out/production/Server/Room.class
index d708e49856a7378d0f0c3bd2979775e6465b5fe8..147c9819157a870a387064cd4c39345f832d6e1a 100644
GIT binary patch
delta 274
zcmWO0&nv@m9LMqJ>z!f;KbqtqOA_lVMe?JRpEb5Au|nbCB7cCB%dSe+ikomzenhDq
z<;O*9P7a2aU*+J(Bt^OUoSr>y&xDuoj`m98C#-YI7H8~p&LQKZxNu5yNro&}<hWKF
zSq*ceF>W=%oo2{so_j60F7l)$UbM`!R$P<3DbKqZA67)(iuts1zAV7Ed9Ka;ST}#x
z$FB_p$XJ-PjR>2Q*{18Z3T;OPwkuyMRC-{uW%%SLq)Ni7AfhT_swSygR#n5A>e*1x
uoiy>FMjq9|t6Ej3PBo}qL3OD^JsMQMBI;GtdDLmrX-Y$yRx}m!AKO3a%|t)|

delta 274
zcmWNL%PYij97WIlNFI5VNy*}uLKvl4cqBE&WHjRyQz$HK<PWf#jjfVtik+}g9#LwR
z7G4`ovy(7FQ7pzIDay*XyEymkPQst?AMTbdoUq0zo1C%7IR}i9;(}w+ZW*q)B+Iqh
zxX}Q&8YQc7?ljH4=6KY+W1J@~@}ec4wd|NAryOr)yjvk3R?4UO_%e@g^E(Fku^@le
z&98+#G8Q3i!^*Q+<=ckimWpj#1-7G-RJeTKW_%Q>lCY|YsEVjOVyYpjdRA1+s+w3=
wvnva@nid|^%B$K{r!F<9Q;iC$Lp|zKuc8X6-}#7p6B^W{vndUwViiaB4^GHM00000

diff --git a/Server/src/Room.java b/Server/src/Room.java
index 2870362..881b813 100644
--- a/Server/src/Room.java
+++ b/Server/src/Room.java
@@ -171,10 +171,7 @@ public class Room
                                     case 7:
                                         for (int i = 0; i < players.length; i++)
                                         {
-                                            if (i != player)
-                                            {
                                                 players[i].output.write(new byte[]{7, (byte)player, 0, 0, 0, 0, 0, 0, 0, 0});
-                                            }
                                         }
                                         break;
                                     case 126: