Fixed chat hooks not firing in single player.

k0rd · Oct 4, 2013 · eb7c019 · eb7c019
1 parent 69e4291
commit eb7c019
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/Terraria/Terraria.il b/Terraria/Terraria.il
@@ -104301,17 +104301,23 @@
                                                        int32,
                                                        int32)
     IL_16fb:  ldsfld     bool Terraria.Main::inputTextEnter
-    IL_1700:  brfalse.s  IL_177f
+    IL_1700:  brfalse  IL_177f
 
     IL_1702:  ldsfld     bool Terraria.Main::chatRelease
-    IL_1707:  brfalse.s  IL_177f
+    IL_1707:  brfalse  IL_177f
 
     IL_1709:  ldsfld     string Terraria.Main::chatText
     IL_170e:  ldstr      ""
     IL_1713:  call       bool [mscorlib]System.String::op_Inequality(string,
                                                                      string)
     IL_1718:  brfalse.s  IL_173d
 
+//ADD ClientHooks - OnChat
+	ldsflda     string Terraria.Main::chatText
+	call bool [TerrariaAPI]TerrariaAPI.Hooks.ClientHooks::OnChat(string&)
+	brtrue IL_173d
+//-ADD-
+
     IL_171a:  ldc.i4.s   25
     IL_171c:  ldc.i4.m1
     IL_171d:  ldc.i4.m1

diff --git a/TerrariaAPI/Program.cs b/TerrariaAPI/Program.cs
@@ -274,9 +274,6 @@ private static Assembly Compile(string name, string data, bool addfail = true)
 
         private static void ClientHooks_Chat(ref string msg, HandledEventArgs e)
         {
-            if (Main.netMode != 1)
-                return;
-
             if (!msg.StartsWith("/preload"))
                 return;
-Original file line number
+Diff line change
@@ Expand Up @@
             private static void ClientHooks_Chat(ref string msg, HandledEventArgs e)
             {
-                if (Main.netMode != 1)
-                    return;
                 if (!msg.StartsWith("/preload"))
                     return;
@@ Expand Down @@