fix: Cleans up core code (#1187)
**Only one functional change** * Fixes a bug in LogFactory where `Warning` is being logged as `Information` Non-functional changes: * Updates/Fixes copyright headers * Removes namespace scopes for core files. View with [whitespace off](https://github.com/modernuo/ModernUO/pull/1187/files?w=1).
This commit is contained in:
parent
0138d40bda
commit
f268d5d4e2
262 changed files with 28527 additions and 28646 deletions
|
|
@ -1,6 +1,6 @@
|
|||
/*************************************************************************
|
||||
* ModernUO *
|
||||
* Copyright 2019-2020 - ModernUO Development Team *
|
||||
* Copyright 2019-2022 - ModernUO Development Team *
|
||||
* Email: hi@modernuo.com *
|
||||
* File: EntityActivatorExtensions.cs *
|
||||
* *
|
||||
|
|
@ -16,31 +16,30 @@
|
|||
using System;
|
||||
using System.Reflection;
|
||||
|
||||
namespace Server.Utilities
|
||||
namespace Server.Utilities;
|
||||
|
||||
public static class EntityActivatorExtensions
|
||||
{
|
||||
public static class EntityActivatorExtensions
|
||||
public static T CreateEntityInstance<T>(
|
||||
this Type type,
|
||||
params object[] args
|
||||
) where T : IEntity => type.CreateEntityInstance<T>(null, args);
|
||||
|
||||
public static T CreateEntityInstance<T>(
|
||||
this Type type,
|
||||
Predicate<ConstructorInfo> predicate,
|
||||
object[] args = null
|
||||
) where T : IEntity
|
||||
{
|
||||
public static T CreateEntityInstance<T>(
|
||||
this Type type,
|
||||
params object[] args
|
||||
) where T : IEntity => type.CreateEntityInstance<T>(null, args);
|
||||
var entity = type.CreateInstance<IEntity>(predicate, args);
|
||||
|
||||
public static T CreateEntityInstance<T>(
|
||||
this Type type,
|
||||
Predicate<ConstructorInfo> predicate,
|
||||
object[] args = null
|
||||
) where T : IEntity
|
||||
if (entity is T t)
|
||||
{
|
||||
var entity = type.CreateInstance<IEntity>(predicate, args);
|
||||
|
||||
if (entity is T t)
|
||||
{
|
||||
return t;
|
||||
}
|
||||
|
||||
// Handles memory leaks by deleting the offending entity
|
||||
entity?.Delete();
|
||||
return default;
|
||||
return t;
|
||||
}
|
||||
|
||||
// Handles memory leaks by deleting the offending entity
|
||||
entity?.Delete();
|
||||
return default;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue