Merging from rust_beta/staging

CarbonCommunity · Dec 5, 2024 · 7b5b60d · 7b5b60d
2 parents 41f1ed3 + 04e0b82
commit 7b5b60d
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 10 deletions.
diff --git a/Carbon.Core/.msbuild/Protocol.props b/Carbon.Core/.msbuild/Protocol.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
-		<CarbonProtocol>2024.11.07.0</CarbonProtocol>
+		<CarbonProtocol>2024.12.05.0</CarbonProtocol>
 	</PropertyGroup>
 </Project>
diff --git a/Carbon.Core/Carbon.Components/Carbon.Bootstrap b/Carbon.Core/Carbon.Components/Carbon.Bootstrap
diff --git a/Carbon.Core/Carbon.Components/Carbon.Common b/Carbon.Core/Carbon.Components/Carbon.Common
diff --git a/Carbon.Core/Carbon.Components/Carbon.Compat b/Carbon.Core/Carbon.Components/Carbon.Compat
diff --git a/Carbon.Core/Carbon.Components/Carbon.Modules b/Carbon.Core/Carbon.Components/Carbon.Modules
diff --git a/Carbon.Core/Carbon.Components/Carbon.Preloader b/Carbon.Core/Carbon.Components/Carbon.Preloader
diff --git a/Carbon.Core/Carbon.Components/Carbon.SDK b/Carbon.Core/Carbon.Components/Carbon.SDK
diff --git a/Carbon.Core/Carbon.Hooks/Carbon.Hooks.Base b/Carbon.Core/Carbon.Hooks/Carbon.Hooks.Base
diff --git a/Carbon.Core/Carbon.Hooks/Carbon.Hooks.Community b/Carbon.Core/Carbon.Hooks/Carbon.Hooks.Community
diff --git a/Carbon.Core/Carbon.Hooks/Carbon.Hooks.Oxide b/Carbon.Core/Carbon.Hooks/Carbon.Hooks.Oxide
diff --git a/Carbon.Core/Carbon/src/Loaders/ScriptLoader.cs b/Carbon.Core/Carbon/src/Loaders/ScriptLoader.cs
@@ -421,6 +421,10 @@ public IEnumerator Compile()
 						}
 					}
 				}
+
+#if DEBUG
+				OsEx.File.Create(Path.Combine(Defines.GetScriptDebugFolder(), $"{AsyncLoader.InitialSource.ContextFileName}.Internal.cs"), AsyncLoader.InternalCallHookSource);
+#endif	
 			}
 
 			AsyncLoader.Exceptions?.Clear();
+1 −1		src/Carbon/Modules/AdminModule/AdminModule.Tabs.Entities.cs
+1 −1		src/Carbon/Modules/AdminModule/AdminModule.Tabs.Players.cs
-Original file line number
+Diff line change
@@ Expand Up / @@ -421,6 +421,10 @@ public IEnumerator Compile() @@
     						}
     					}
     				}
+    #if DEBUG
+    				OsEx.File.Create(Path.Combine(Defines.GetScriptDebugFolder(), $"{AsyncLoader.InitialSource.ContextFileName}.Internal.cs"), AsyncLoader.InternalCallHookSource);
+    #endif
     			}
     			AsyncLoader.Exceptions?.Clear();
@@ Expand Down @@