warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: Cleans up core code (#1187)

Browse source 
**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:
Kamron Batman 2022-10-10 21:47:08 -07:00 • committed by GitHub
parent 0138d40bda
commit f268d5d4e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
262 changed files with 28527 additions and 28646 deletions
Download patch file Download diff file Expand all files Collapse all files

61
Projects/Server/Comparers/LocationComparer.cs
View file

@ -1,6 +1,6 @@
/*************************************************************************
* ModernUO *
* Copyright 2019-2020 - ModernUO Development Team *
* Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com *
* File: LocationComparer.cs *
* *
@ -15,42 +15,41 @@
using System.Collections.Generic;
namespace Server
namespace Server;
public class LocationComparer : IComparer<IPoint3D>
{
public class LocationComparer : IComparer<IPoint3D>
private static LocationComparer m_Instance;
public LocationComparer(IPoint3D relativeTo) => RelativeTo = relativeTo;
public IPoint3D RelativeTo { get; set; }
public int Compare(IPoint3D x, IPoint3D y) => GetDistance(x) - GetDistance(y);
public static LocationComparer GetInstance(IPoint3D relativeTo)
{
private static LocationComparer m_Instance;
public LocationComparer(IPoint3D relativeTo) => RelativeTo = relativeTo;
public IPoint3D RelativeTo { get; set; }
public int Compare(IPoint3D x, IPoint3D y) => GetDistance(x) - GetDistance(y);
public static LocationComparer GetInstance(IPoint3D relativeTo)
if (m_Instance == null)
{
if (m_Instance == null)
{
m_Instance = new LocationComparer(relativeTo);
}
else
{
m_Instance.RelativeTo = relativeTo;
}
return m_Instance;
m_Instance = new LocationComparer(relativeTo);
}
else
{
m_Instance.RelativeTo = relativeTo;
}
private int GetDistance(IPoint3D p)
{
var x = RelativeTo.X - p.X;
var y = RelativeTo.Y - p.Y;
var z = RelativeTo.Z - p.Z;
return m_Instance;
}
x *= 11;
y *= 11;
private int GetDistance(IPoint3D p)
{
var x = RelativeTo.X - p.X;
var y = RelativeTo.Y - p.Y;
var z = RelativeTo.Z - p.Z;
return x * x + y * y + z * z;
}
x *= 11;
y *= 11;
return x * x + y * y + z * z;
}
}