Merge branch 'dev' into main

Triky313 · Jul 4, 2023 · b1fdb5c · b1fdb5c
2 parents 24cc338 + 441cf42
commit b1fdb5c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 12 deletions.
diff --git a/src/StatisticsAnalysisTool/Network/Events/PartyJoinedEvent.cs b/src/StatisticsAnalysisTool/Network/Events/PartyJoinedEvent.cs
@@ -17,7 +17,7 @@ public PartyJoinedEvent(Dictionary<byte, object> parameters)
 
         try
         {
-            if (parameters.TryGetValue(1, out object userGuid) && userGuid is Guid)
+            if (parameters.TryGetValue(0, out object userGuid))
             {
                 UserGuid = userGuid.ObjectToGuid() ?? Guid.Empty;
             }

diff --git a/src/StatisticsAnalysisTool/Network/Events/PartyPlayerJoinedEvent.cs b/src/StatisticsAnalysisTool/Network/Events/PartyPlayerJoinedEvent.cs
@@ -16,7 +16,7 @@ public PartyPlayerJoinedEvent(Dictionary<byte, object> parameters)
 
         try
         {
-            if (parameters.TryGetValue(1, out object userGuid) && userGuid is Guid)
+            if (parameters.TryGetValue(1, out object userGuid))
             {
                 UserGuid = userGuid.ObjectToGuid() ?? Guid.Empty;
             }

diff --git a/src/StatisticsAnalysisTool/Network/Handler/PartyJoinedEventHandler.cs b/src/StatisticsAnalysisTool/Network/Handler/PartyJoinedEventHandler.cs
@@ -1,5 +1,4 @@
-using StatisticsAnalysisTool.Enumerations;
-using StatisticsAnalysisTool.Network.Events;
+using StatisticsAnalysisTool.Network.Events;
 using StatisticsAnalysisTool.Network.Manager;
 using System.Threading.Tasks;
 
@@ -16,12 +15,6 @@ public PartyJoinedEventHandler(TrackingController trackingController) : base((in
 
     protected override async Task OnActionAsync(PartyJoinedEvent value)
     {
-        if (!_trackingController.EntityController.IsLocalEntity(value.UserGuid) && !_trackingController.EntityController.ExistEntity(value.UserGuid))
-        {
-            _trackingController.EntityController
-                .AddEntity(null, value.UserGuid, null, value.Username, value.GuildName, null, null, GameObjectType.Player, GameObjectSubType.Player);
-        }
-
         await Task.CompletedTask;
     }
 }
diff --git a/src/StatisticsAnalysisTool/Properties/AssemblyInfo.cs b/src/StatisticsAnalysisTool/Properties/AssemblyInfo.cs
@@ -53,5 +53,5 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.21.7.*")]
-[assembly: AssemblyFileVersion("5.21.7.0")]
+[assembly: AssemblyVersion("5.21.8.*")]
+[assembly: AssemblyFileVersion("5.21.8.0")]