helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2025-10-14 21:22:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix all warnings & Trim (#2226)

Browse source 
* Fix AutoFishing crash
* Fix all warnings
* Remove DotNetZip.
* Fix the usage of HttpClient.
This commit is contained in:
BruceChen 2022-10-02 18:31:08 +08:00 • committed by GitHub
parent 4aa6c1c99f
commit 1d52d1eadd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
227 changed files with 2201 additions and 43564 deletions
Download patch file Download diff file Expand all files Collapse all files

27
MinecraftClient/Mapping/Location.cs
View file

@ -1,8 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Text;
namespace MinecraftClient.Mapping
{
@ -159,7 +156,7 @@ namespace MinecraftClient.Mapping
/// <returns>New location</returns>
public Location ToFloor()
{
return new Location(Math.Floor(this.X), Math.Floor(this.Y), Math.Floor(this.Z));
return new Location(Math.Floor(X), Math.Floor(Y), Math.Floor(Z));
}
/// <summary>
@ -168,7 +165,7 @@ namespace MinecraftClient.Mapping
/// <returns>New location</returns>
public Location ToCenter()
{
return new Location(Math.Floor(this.X) + 0.5, this.Y, Math.Floor(this.Z) + 0.5);
return new Location(Math.Floor(X) + 0.5, Y, Math.Floor(Z) + 0.5);
}
/// <summary>
@ -273,15 +270,15 @@ namespace MinecraftClient.Mapping
/// </summary>
/// <param name="obj">Object to compare to</param>
/// <returns>TRUE if the locations are equals</returns>
public override bool Equals(object obj)
public override bool Equals(object? obj)
{
if (obj == null)
return false;
if (obj is Location)
if (obj is Location location)
{
return ((int)this.X) == ((int)((Location)obj).X)
&& ((int)this.Y) == ((int)((Location)obj).Y)
&& ((int)this.Z) == ((int)((Location)obj).Z);
return ((int)X) == ((int)location.X)
&& ((int)Y) == ((int)location.Y)
&& ((int)Z) == ((int)location.Z);
}
return false;
}
@ -293,6 +290,11 @@ namespace MinecraftClient.Mapping
/// <param name="loc2">Second location to compare</param>
/// <returns>TRUE if the locations are equals</returns>
public static bool operator ==(Location loc1, Location loc2)
{
return loc1.Equals(loc2);
}
public static bool operator ==(Location? loc1, Location? loc2)
{
if (loc1 == null && loc2 == null)
return true;
@ -308,6 +310,11 @@ namespace MinecraftClient.Mapping
/// <param name="loc2">Second location to compare</param>
/// <returns>TRUE if the locations are equals</returns>
public static bool operator !=(Location loc1, Location loc2)
{
return !loc1.Equals(loc2);
}
public static bool operator !=(Location? loc1, Location? loc2)
{
if (loc1 == null && loc2 == null)
return false;