From 98aa813f65dc10ddda270ade19a9462abd6d44e0 Mon Sep 17 00:00:00 2001
From: Timothy Schenk <admin@rainote.dev>
Date: Mon, 13 Nov 2023 21:14:38 +0100
Subject: [PATCH] fix: remove non working guild name

---
 Server/PacketHandlers/ChannelSelectionHandler.cs  | 15 ++++-----------
 Server/Server.csproj                              |  2 +-
 .../Outgoing/ChannelSelectionResponsePacket.cs    |  1 -
 Wonderking/Wonderking.csproj                      |  2 +-
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/Server/PacketHandlers/ChannelSelectionHandler.cs b/Server/PacketHandlers/ChannelSelectionHandler.cs
index 74364d5..e1592cf 100644
--- a/Server/PacketHandlers/ChannelSelectionHandler.cs
+++ b/Server/PacketHandlers/ChannelSelectionHandler.cs
@@ -1,11 +1,3 @@
-
-/* Nicht gemergte Änderung aus Projekt "Server(net7.0)"
-Vor:
-using System.Net;
-using Microsoft.EntityFrameworkCore;
-Nach:
-using Microsoft.EntityFrameworkCore;
-*/
 using Microsoft.EntityFrameworkCore;
 using Server.DB.Documents;
 using Wonderking.Game.Data.Character;
@@ -46,7 +38,8 @@ public class ChannelSelectionHandler : IPacketHandler<ChannelSelectionPacket>
             ?.Characters;
         ChannelSelectionResponsePacket responsePacket;
 
-        if (charactersOfAccount != null && false)
+        var testingChars = true;
+        if (charactersOfAccount != null && testingChars)
         {
             responsePacket = new ChannelSelectionResponsePacket
             {
@@ -103,8 +96,8 @@ public class ChannelSelectionHandler : IPacketHandler<ChannelSelectionPacket>
                         },
                         Health = int.MaxValue - 1,
                         Mana = int.MaxValue - 1,
-                        EquippedItems = Enumerable.Repeat((ushort)25,20).ToArray(),
-                        EquippedCashItems = Enumerable.Repeat((ushort)25,20).ToArray()
+                        EquippedItems = Enumerable.Repeat((ushort)25, 20).ToArray(),
+                        EquippedCashItems = Enumerable.Repeat((ushort)25, 20).ToArray()
                     },
                 },
             };
diff --git a/Server/Server.csproj b/Server/Server.csproj
index a4a8d6a..854ccf5 100644
--- a/Server/Server.csproj
+++ b/Server/Server.csproj
@@ -8,7 +8,6 @@
     <RootNamespace>Server</RootNamespace>
     <LangVersion>12</LangVersion>
     <ServerGarbageCollection>true</ServerGarbageCollection>
-    <TargetFrameworks>net8.0;net7.0</TargetFrameworks>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <Features>strict</Features>
     <Authors>Timothy (RaiNote) Schenk</Authors>
@@ -20,6 +19,7 @@
     <ProduceReferenceAssembly>True</ProduceReferenceAssembly>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <AnalysisLevel>latest-recommended</AnalysisLevel>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0|AnyCPU'">
diff --git a/Wonderking/Packets/Outgoing/ChannelSelectionResponsePacket.cs b/Wonderking/Packets/Outgoing/ChannelSelectionResponsePacket.cs
index 1293949..7e4d135 100644
--- a/Wonderking/Packets/Outgoing/ChannelSelectionResponsePacket.cs
+++ b/Wonderking/Packets/Outgoing/ChannelSelectionResponsePacket.cs
@@ -10,7 +10,6 @@ public class ChannelSelectionResponsePacket : IPacket
     public required string Endpoint { get; set; }
     public required ushort Port { get; set; }
     public required CharacterData[] Characters { get; set; }
-    public required string GuildName { get; set; }
 
     public void Deserialize(byte[] data)
     {
diff --git a/Wonderking/Wonderking.csproj b/Wonderking/Wonderking.csproj
index f5b8158..c54168d 100644
--- a/Wonderking/Wonderking.csproj
+++ b/Wonderking/Wonderking.csproj
@@ -3,9 +3,9 @@
     <PropertyGroup>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <TargetFrameworks>net8.0;net7.0</TargetFrameworks>
         <Features>strict</Features>
         <LangVersion>12</LangVersion>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>