From 088a4948d707935da1b3a5ebd791869c8c097dfc Mon Sep 17 00:00:00 2001
From: Bluzume <39113159+KuromeSan@users.noreply.github.com>
Date: Sun, 28 Nov 2021 15:23:41 -0500
Subject: [PATCH] Fix npc chat being invisible
---
HorseIsleServer/HorseIsleServer/Game/Meta.cs | 9 +++++++--
HorseIsleServer/HorseIsleServer/Server/GameServer.cs | 4 +---
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/HorseIsleServer/HorseIsleServer/Game/Meta.cs b/HorseIsleServer/HorseIsleServer/Game/Meta.cs
index e7e76e0..001c837 100644
--- a/HorseIsleServer/HorseIsleServer/Game/Meta.cs
+++ b/HorseIsleServer/HorseIsleServer/Game/Meta.cs
@@ -748,6 +748,8 @@ namespace HISP.Game
}
public static string BuildRealTimeQuiz(RealTimeQuiz.Participent participent)
{
+ // Uber Priority xD
+ participent.UserInstance.MinorPriority = true;
participent.UserInstance.MajorPriority = true;
return Messages.FormatEventRealTimeQuizMeta(participent.CorrectAnswers, participent.MistakenAnswers, participent.OnQuestion.BaseCategory.Name, participent.OnQuestion.Question);
}
@@ -2555,8 +2557,11 @@ namespace HISP.Game
Npc.SetDefaultChatpoint(user, npc, result.SetChatpoint);
if (result.GotoChatpoint != -1)
chatpoint = Npc.GetNpcChatpoint(npc, result.GotoChatpoint);
- if (result.NpcChat != null)
- chatpoint.ChatText = result.NpcChat;
+
+ if (chatpoint.ChatText.Trim() == "")
+ if (result.NpcChat != null)
+ if(result.NpcChat.Trim() != "")
+ chatpoint.ChatText = result.NpcChat;
}
else
{
diff --git a/HorseIsleServer/HorseIsleServer/Server/GameServer.cs b/HorseIsleServer/HorseIsleServer/Server/GameServer.cs
index 3a6e795..97bd9b5 100644
--- a/HorseIsleServer/HorseIsleServer/Server/GameServer.cs
+++ b/HorseIsleServer/HorseIsleServer/Server/GameServer.cs
@@ -5259,6 +5259,7 @@ namespace HISP.Server
string packetStr = Encoding.UTF8.GetString(packet);
string number = packetStr.Substring(2, packetStr.Length - 4);
int chatId = 0;
+
try
{
chatId = int.Parse(number);
@@ -5268,14 +5269,12 @@ namespace HISP.Server
Logger.ErrorPrint(sender.LoggedinUser.Username + " Tried to start talking to an NPC with id that is NaN.");
return;
}
-
if(!Npc.NpcExists(chatId))
{
Logger.ErrorPrint(sender.LoggedinUser.Username + " Tried to start talking to an NPC that doesnt exist.");
return;
}
sender.LoggedinUser.MajorPriority = true;
-
Npc.NpcEntry entry = Npc.GetNpcById(chatId);
if(entry.Chatpoints.Length <= 0)
@@ -5285,7 +5284,6 @@ namespace HISP.Server
}
int defaultChatpointId = Npc.GetDefaultChatpoint(sender.LoggedinUser, entry);
-
Npc.NpcChat startingChatpoint = Npc.GetNpcChatpoint(entry, defaultChatpointId);
string metaInfo = Meta.BuildNpcChatpoint(sender.LoggedinUser, entry, startingChatpoint);