From 89eea25e5f018458eb27d616ee247f68b8c45534 Mon Sep 17 00:00:00 2001 From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com> Date: Fri, 14 Sep 2018 15:55:45 -0700 Subject: [PATCH] A little bit of code cleanup --- Server/Network/PacketHandlers.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Server/Network/PacketHandlers.cs b/Server/Network/PacketHandlers.cs index 590054e36..2b27156f4 100644 --- a/Server/Network/PacketHandlers.cs +++ b/Server/Network/PacketHandlers.cs @@ -1830,7 +1830,7 @@ namespace Server.Network from.ContextMenu = null; - if ( menu != null && from != null && from == menu.From ) + if ( menu != null && from == menu.From ) { IEntity entity = World.FindEntity( pvSrc.ReadInt32() ); @@ -2026,11 +2026,11 @@ namespace Server.Network if ( razorFeatures == (ulong)FeatureProtection.DisabledFeatures ) { - bool match = true; - for ( int i=0; match && i < m_ThirdPartyAuthKey.Length; i++ ) - match = match && pvSrc.ReadByte() == m_ThirdPartyAuthKey[i]; + bool doesNotMatch; + for ( int i = 0; !doesNotMatch && i < m_ThirdPartyAuthKey.Length; i++ ) + doesNotMatch = pvSrc.ReadByte() != m_ThirdPartyAuthKey[i]; - if ( match ) + if ( !doesNotMatch ) authOK = true; } else @@ -2248,7 +2248,7 @@ namespace Server.Network bool female = ((genderRace % 2) != 0); - Race race = null; + Race race; if ( state.StygianAbyss ) { byte raceID = (byte)(genderRace < 4 ? 0 : ((genderRace / 2) - 1));