File tree Expand file tree Collapse file tree 3 files changed +20
-20
lines changed
Expand file tree Collapse file tree 3 files changed +20
-20
lines changed Original file line number Diff line number Diff line change 2222 <NoWarn >NU1701</NoWarn >
2323 <GitBranch ></GitBranch >
2424 <ReferencesOverride >regex:Managed/(.*).dll</ReferencesOverride >
25+ <LangVersion >Latest</LangVersion >
26+ <Nullable >enable</Nullable >
2527 </PropertyGroup >
2628 <ItemGroup >
27- <PackageReference Include =" Oxide.References" Version =" 2.0.*" />
28- <PackageReference Include =" Oxide.Core" Version =" 2.0.*" />
29- <PackageReference Include =" Oxide.CSharp" Version =" 2.0.*" />
30- <PackageReference Include =" Oxide.MySql" Version =" 2.0.*" />
31- <PackageReference Include =" Oxide.SQLite" Version =" 2.0.*" />
32- <PackageReference Include =" Oxide.Unity" Version =" 2.0.*" />
29+ <PackageReference Include =" Oxide.References" Version =" 2.0.3810-develop" />
30+ <PackageReference Include =" Oxide.Common" Version =" 2.0.47-develop" />
31+ <PackageReference Include =" Oxide.Core" Version =" 2.0.4152-develop" />
32+ <PackageReference Include =" Oxide.CSharp" Version =" 2.0.4161-develop" />
33+ <PackageReference Include =" Oxide.MySql" Version =" 2.0.3787-develop" />
34+ <PackageReference Include =" Oxide.SQLite" Version =" 2.0.3810-develop" />
35+ <PackageReference Include =" Oxide.Unity" Version =" 2.0.3781-develop" />
3336 <Reference Include =" Assembly-CSharp" />
3437 <Reference Include =" Assembly-CSharp-firstpass" />
3538 <Reference Include =" BoomlagoonJSON" />
Original file line number Diff line number Diff line change 1+ using System ;
12using System . Collections . Generic ;
23using System . Globalization ;
34using System . Linq ;
@@ -304,7 +305,14 @@ private void PluginsCommand(IPlayer player)
304305 {
305306 foreach ( string name in loader . ScanDirectory ( Interface . Oxide . PluginDirectory ) . Except ( loadedPluginNames ) )
306307 {
307- unloadedPluginErrors [ name ] = loader . PluginErrors . TryGetValue ( name , out string msg ) ? msg : "Unloaded" ; // TODO: Localization
308+ if ( loader . PluginErrors . TryGetValue ( name , out HashSet < string > errors ) )
309+ {
310+ unloadedPluginErrors [ name ] = errors . JoinValues ( Environment . NewLine ) ; // TODO: Localization
311+ }
312+ else
313+ {
314+ unloadedPluginErrors [ name ] = "Unloaded" ; // TODO: Localization
315+ }
308316 }
309317 }
310318
Original file line number Diff line number Diff line change 1515
1616namespace Oxide . Game . Rust . Cui
1717{
18- public sealed class JsonArrayPool < T > : IArrayPool < T >
18+ internal sealed class JsonArrayPool < T > : References :: Newtonsoft . Json . IArrayPool < T >
1919 {
2020 public static readonly JsonArrayPool < T > Shared = new JsonArrayPool < T > ( ) ;
21- private static readonly IArrayPoolProvider < T > Provider = GetOrCreateProvider ( ) ;
22-
23- private static IArrayPoolProvider < T > GetOrCreateProvider ( )
24- {
25- if ( Interface . Oxide . PoolFactory . IsHandledType < T [ ] > ( ) )
26- {
27- return Interface . Oxide . PoolFactory . GetArrayProvider < T > ( ) ;
28- }
29-
30- Interface . Oxide . PoolFactory . RegisterProvider < BaseArrayPoolProvider < T > > ( out var provider , 1000 , 16384 ) ;
31- return provider ;
32- }
21+ private static readonly Pooling . IArrayPool < T > Provider = ArrayPool < T > . Custom ( arrayMaxLength : 16384 , arrayMaxPerPool : 1000 ) ;
3322
3423 public T [ ] Rent ( int minimumLength ) => Provider . Take ( minimumLength ) ;
3524 public void Return ( T [ ] array ) => Provider . Return ( array ) ;
You can’t perform that action at this time.
0 commit comments