fix: load guild for rank information

AscensionGameDev · Jan 16, 2025 · baaa0cb · baaa0cb
1 parent c5e2bce
commit baaa0cb
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 5 deletions.
diff --git a/Intersect.Server.Core/Entities/Player.Database.cs b/Intersect.Server.Core/Entities/Player.Database.cs
@@ -495,11 +495,12 @@ SortDirection sortDirection
                 .Skip(offset)
                 .Take(count)
                 .Include(p => p.Bank)
+                .Include(p => p.Guild)
                 .Include(p => p.Hotbar)
-                .Include(p => p.Quests)
-                .Include(p => p.Variables)
                 .Include(p => p.Items)
+                .Include(p => p.Quests)
                 .Include(p => p.Spells)
+                .Include(p => p.Variables)
                 .AsSplitQuery()
         ) ??
         throw new InvalidOperationException();
@@ -512,11 +513,12 @@ SortDirection sortDirection
                 .Skip(offset)
                 .Take(count)
                 .Include(p => p.Bank)
+                .Include(p => p.Guild)
                 .Include(p => p.Hotbar)
-                .Include(p => p.Quests)
-                .Include(p => p.Variables)
                 .Include(p => p.Items)
+                .Include(p => p.Quests)
                 .Include(p => p.Spells)
+                .Include(p => p.Variables)
                 .AsSplitQuery()
         ) ??
         throw new InvalidOperationException();

diff --git a/Intersect.Server/Web/Pages/Shared/Players/_PlayerCard.cshtml b/Intersect.Server/Web/Pages/Shared/Players/_PlayerCard.cshtml
@@ -49,7 +49,7 @@
                     @WebResources.XofYExp.Format(player.Exp, player.ExperienceToNextLevel)
                 </span>
                 <span class="row">
-                    @(player.Guild?.Name ?? WebResources.NoGuild)
+                    @(string.IsNullOrWhiteSpace(player.Guild?.Name) ? WebResources.NoGuild : WebResources.GuildX.Format(player.Guild.Name))
                 </span>
             </span>
         </section>

diff --git a/Intersect.Server/Web/WebResources.Designer.cs b/Intersect.Server/Web/WebResources.Designer.cs
diff --git a/Intersect.Server/Web/WebResources.es.resx b/Intersect.Server/Web/WebResources.es.resx
@@ -50,4 +50,7 @@
   <data name="UserNotFound" xml:space="preserve">
     <value>No encontrado</value>
   </data>
+  <data name="GuildX" xml:space="preserve">
+    <value>Clan: {0}</value>
+  </data>
 </root>
diff --git a/Intersect.Server/Web/WebResources.fr.resx b/Intersect.Server/Web/WebResources.fr.resx
@@ -44,4 +44,7 @@
   <data name="NoGuild" xml:space="preserve">
     <value>Pas en guilde</value>
   </data>
+  <data name="GuildX" xml:space="preserve">
+    <value>Guilde: {0}</value>
+  </data>
 </root>
diff --git a/Intersect.Server/Web/WebResources.it.resx b/Intersect.Server/Web/WebResources.it.resx
@@ -56,4 +56,7 @@
   <data name="Home" xml:space="preserve">
     <value>Inizio</value>
   </data>
+  <data name="GuildX" xml:space="preserve">
+    <value>Gilda: {0}</value>
+  </data>
 </root>
diff --git a/Intersect.Server/Web/WebResources.pt-br.resx b/Intersect.Server/Web/WebResources.pt-br.resx
@@ -59,4 +59,7 @@
   <data name="Home" xml:space="preserve">
     <value>Início</value>
   </data>
+  <data name="GuildX" xml:space="preserve">
+    <value>Guilda: {0}</value>
+  </data>
 </root>
diff --git a/Intersect.Server/Web/WebResources.resx b/Intersect.Server/Web/WebResources.resx
@@ -71,4 +71,7 @@
   <data name="XsPlayers" xml:space="preserve">
     <value>{0}'s Characters</value>
   </data>
+  <data name="GuildX" xml:space="preserve">
+    <value>Guild: {0}</value>
+  </data>
 </root>