From 10017b7e8c351af642e46c2ab19a0b5a39e0795d Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Sat, 4 May 2019 20:53:08 -0400 Subject: [PATCH] Cleaned up some warnings. --- FFXIVClassic Common Class Lib/Bitfield.cs | 2 +- FFXIVClassic Common Class Lib/Vector3.cs | 24 +++++++++++--- FFXIVClassic Lobby Server/ClientConnection.cs | 2 +- FFXIVClassic Map Server/actors/Actor.cs | 18 +++++----- .../actors/StaticActors.cs | 4 +-- FFXIVClassic Map Server/actors/area/Area.cs | 31 +++++++---------- .../ai/controllers/BattleNpcController.cs | 3 -- .../actors/chara/player/Player.cs | 33 ++++++++----------- .../actors/director/Director.cs | 2 +- .../dataobjects/ZoneConnection.cs | 2 +- .../packets/send/Actor/AddActorPacket.cs | 2 -- .../send/Actor/DeleteAllActorsPacket.cs | 2 -- .../packets/send/Actor/PlayBGAnimation.cs | 3 -- .../send/Actor/SetActorPropetyPacket.cs | 2 -- .../send/Actor/SetActorStatusAllPacket.cs | 2 -- .../send/Actor/SetActorStatusPacket.cs | 2 -- .../packets/send/Actor/_0x132Packet.cs | 1 - .../Actor/events/SetEmoteEventCondition.cs | 2 -- .../inventory/InventoryRemoveX08Packet.cs | 2 -- .../player/SetCompletedAchievementsPacket.cs | 2 -- .../send/player/SetCutsceneBookPacket.cs | 2 -- .../send/player/SetPlayerDreamPacket.cs | 2 -- .../send/player/SetPlayerItemStoragePacket.cs | 3 -- .../supportdesk/GMTicketSentResponsePacket.cs | 2 -- .../utils/SQLGeneration.cs | 10 +++--- .../DataObjects/ClientConnection.cs | 2 +- .../DataObjects/ZoneServer.cs | 4 +-- 27 files changed, 68 insertions(+), 98 deletions(-) diff --git a/FFXIVClassic Common Class Lib/Bitfield.cs b/FFXIVClassic Common Class Lib/Bitfield.cs index 8a54eec3..3ef5e7b5 100644 --- a/FFXIVClassic Common Class Lib/Bitfield.cs +++ b/FFXIVClassic Common Class Lib/Bitfield.cs @@ -60,7 +60,7 @@ namespace FFXIVClassic.Common // Calculate a bitmask of the desired length long mask = 0; for (int i = 0; i < fieldLength; i++) - mask |= 1 << i; + mask |= 1L << i; r |= ((UInt32)f.GetValue(t) & mask) << offset; diff --git a/FFXIVClassic Common Class Lib/Vector3.cs b/FFXIVClassic Common Class Lib/Vector3.cs index 40285a4b..a938c8cb 100644 --- a/FFXIVClassic Common Class Lib/Vector3.cs +++ b/FFXIVClassic Common Class Lib/Vector3.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace FFXIVClassic.Common { @@ -64,7 +60,7 @@ namespace FFXIVClassic.Common public static bool operator ==(Vector3 lhs, Vector3 rhs) { return (lhs?.X == rhs?.X && lhs?.Y == rhs?.Y && lhs?.Z == rhs?.Z); - } + } public float Length() { @@ -141,5 +137,23 @@ namespace FFXIVClassic.Common //If the relative angle is less than the total angle of the cone, the target is inside the cone return angleToTarget >= 0 && angleToTarget <= (coneAngle * Math.PI); } + + public override bool Equals(object obj) + { + var vector = obj as Vector3; + return vector != null && + X == vector.X && + Y == vector.Y && + Z == vector.Z; + } + + public override int GetHashCode() + { + var hashCode = -307843816; + hashCode = hashCode * -1521134295 + X.GetHashCode(); + hashCode = hashCode * -1521134295 + Y.GetHashCode(); + hashCode = hashCode * -1521134295 + Z.GetHashCode(); + return hashCode; + } } } diff --git a/FFXIVClassic Lobby Server/ClientConnection.cs b/FFXIVClassic Lobby Server/ClientConnection.cs index 1bc1208b..91be70d6 100644 --- a/FFXIVClassic Lobby Server/ClientConnection.cs +++ b/FFXIVClassic Lobby Server/ClientConnection.cs @@ -58,7 +58,7 @@ namespace FFXIVClassic_Lobby_Server socket.Send(packetBytes); } catch(Exception e) - { Program.Log.Error("Weird case, socket was d/ced: {0}", e); } + { Program.Log.Error(e, "Weird case, socket was d/ced: {0}"); } } } diff --git a/FFXIVClassic Map Server/actors/Actor.cs b/FFXIVClassic Map Server/actors/Actor.cs index d5640417..d9a41d1c 100644 --- a/FFXIVClassic Map Server/actors/Actor.cs +++ b/FFXIVClassic Map Server/actors/Actor.cs @@ -110,7 +110,7 @@ namespace FFXIVClassic_Map_Server.Actors } } } - + public virtual void ResetMoveSpeeds() { this.moveSpeeds[0] = SetActorSpeedPacket.DEFAULT_STOP; @@ -121,12 +121,12 @@ namespace FFXIVClassic_Map_Server.Actors this.moveState = this.oldMoveState; this.updateFlags |= ActorUpdateFlags.Speed; } - - public SubPacket CreateAddActorPacket(byte val) + + public SubPacket CreateAddActorPacket(byte val) { return AddActorPacket.BuildPacket(actorId, val); } - + public SubPacket CreateNamePacket() { return SetActorNamePacket.BuildPacket(actorId, customDisplayName != null ? 0 : displayNameId, displayNameId == 0xFFFFFFFF | displayNameId == 0x0 | customDisplayName != null ? customDisplayName : ""); @@ -284,7 +284,7 @@ namespace FFXIVClassic_Map_Server.Actors public SubPacket CreateIsZoneingPacket() { - return SetActorIsZoningPacket.BuildPacket(actorId, false); + return SetActorIsZoningPacket.BuildPacket(actorId, false); } public virtual SubPacket CreateScriptBindPacket(Player player) @@ -292,13 +292,13 @@ namespace FFXIVClassic_Map_Server.Actors return ActorInstantiatePacket.BuildPacket(actorId, actorName, className, classParams); } - public virtual SubPacket CreateScriptBindPacket() + public virtual SubPacket CreateScriptBindPacket() { return ActorInstantiatePacket.BuildPacket(actorId, actorName, className, classParams); } - + public virtual List GetSpawnPackets(Player player, ushort spawnType) - { + { List subpackets = new List(); subpackets.Add(CreateAddActorPacket(8)); subpackets.AddRange(GetEventConditionPackets()); @@ -509,7 +509,7 @@ namespace FFXIVClassic_Map_Server.Actors { className = className.Substring(0, 20 - zoneName.Length); } - catch (ArgumentOutOfRangeException e) + catch (ArgumentOutOfRangeException) { } //Convert actor number to base 63 diff --git a/FFXIVClassic Map Server/actors/StaticActors.cs b/FFXIVClassic Map Server/actors/StaticActors.cs index 998cdb06..153b3092 100644 --- a/FFXIVClassic Map Server/actors/StaticActors.cs +++ b/FFXIVClassic Map Server/actors/StaticActors.cs @@ -41,7 +41,7 @@ namespace FFXIVClassic_Map_Server.Actors byte byteOut = (Byte)(byteIn ^ 0x73); binWriter.Write((Byte)byteOut); } - catch (EndOfStreamException e) { break; } + catch (EndOfStreamException) { break; } } binReader.Close(); @@ -88,7 +88,7 @@ namespace FFXIVClassic_Map_Server.Actors } } } - catch(FileNotFoundException e) + catch(FileNotFoundException) { Program.Log.Error("Could not find staticactors file."); return false; } Program.Log.Info("Loaded {0} static actors.", mStaticActors.Count()); diff --git a/FFXIVClassic Map Server/actors/area/Area.cs b/FFXIVClassic Map Server/actors/area/Area.cs index 1e3b5693..1c16b1f5 100644 --- a/FFXIVClassic Map Server/actors/area/Area.cs +++ b/FFXIVClassic Map Server/actors/area/Area.cs @@ -2,20 +2,13 @@ using FFXIVClassic.Common; using FFXIVClassic_Map_Server.actors.area; using FFXIVClassic_Map_Server.actors.chara.npc; -using FFXIVClassic_Map_Server.dataobjects; -using FFXIVClassic_Map_Server.dataobjects.chara; using FFXIVClassic_Map_Server.lua; using FFXIVClassic_Map_Server.packets.send.actor; -using MoonSharp.Interpreter; using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; using FFXIVClassic_Map_Server.packets.send; -using FFXIVClassic_Map_Server.actors.group; using FFXIVClassic_Map_Server.actors.director; -using FFXIVClassic_Map_Server.actors.chara.ai.controllers; namespace FFXIVClassic_Map_Server.Actors { @@ -388,35 +381,35 @@ namespace FFXIVClassic_Map_Server.Actors } } - // todo: for zones override this to search contentareas (assuming flag is passed) + // todo: for zones override this to search contentareas (assuming flag is passed) public virtual List GetAllActors() where T : Actor { lock (mActorList) { List actorList = new List(mActorList.Count); - actorList.AddRange(mActorList.Values.OfType()); + actorList.AddRange(mActorList.Values.OfType()); return actorList; } } - + public int GetActorCount() { lock (mActorList) { return mActorList.Count; } - } + } public virtual List GetAllActors() { return GetAllActors(); } - + public virtual List GetPlayers() { return GetAllActors(); - } - + } + public virtual List GetMonsters() { return GetAllActors(); @@ -425,8 +418,8 @@ namespace FFXIVClassic_Map_Server.Actors public virtual List GetAllies() { return GetAllActors(); - } - + } + public void BroadcastPacketsAroundActor(Actor actor, List packets) { foreach (SubPacket packet in packets) @@ -669,13 +662,13 @@ namespace FFXIVClassic_Map_Server.Actors lock (mActorList) { foreach (Actor a in mActorList.Values.ToList()) - a.Update(tick); - + a.Update(tick); + if ((tick - lastUpdateScript).TotalMilliseconds > 1500) { //LuaEngine.GetInstance().CallLuaFunctionForReturn(LuaEngine.GetScriptPath(this), "onUpdate", true, this, tick); lastUpdateScript = tick; - } + } } } diff --git a/FFXIVClassic Map Server/actors/chara/ai/controllers/BattleNpcController.cs b/FFXIVClassic Map Server/actors/chara/ai/controllers/BattleNpcController.cs index a2ebeb87..7edf4dac 100644 --- a/FFXIVClassic Map Server/actors/chara/ai/controllers/BattleNpcController.cs +++ b/FFXIVClassic Map Server/actors/chara/ai/controllers/BattleNpcController.cs @@ -1,8 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using FFXIVClassic.Common; using FFXIVClassic_Map_Server.Actors; using FFXIVClassic_Map_Server.packets.send.actor; diff --git a/FFXIVClassic Map Server/actors/chara/player/Player.cs b/FFXIVClassic Map Server/actors/chara/player/Player.cs index 3b1691e8..8701ca01 100644 --- a/FFXIVClassic Map Server/actors/chara/player/Player.cs +++ b/FFXIVClassic Map Server/actors/chara/player/Player.cs @@ -1,33 +1,28 @@ using FFXIVClassic.Common; -using FFXIVClassic_Map_Server.actors.chara.player; -using FFXIVClassic_Map_Server.actors.director; -using FFXIVClassic_Map_Server.dataobjects; -using FFXIVClassic_Map_Server.dataobjects.chara; -using FFXIVClassic_Map_Server.lua; -using FFXIVClassic_Map_Server.packets.send; -using FFXIVClassic_Map_Server.packets.send.actor; -using FFXIVClassic_Map_Server.packets.send.events; -using FFXIVClassic_Map_Server.packets.send.actor.events; -using FFXIVClassic_Map_Server.packets.send.actor.inventory; -using FFXIVClassic_Map_Server.packets.send.events; -using FFXIVClassic_Map_Server.packets.send.player; -using FFXIVClassic_Map_Server.utils; using System; using System.Collections.Generic; using MoonSharp.Interpreter; -using FFXIVClassic_Map_Server.packets.receive.events; -using FFXIVClassic_Map_Server.packets.send.actor.inventory; -using FFXIVClassic_Map_Server.actors.group; -using FFXIVClassic_Map_Server.packets.send.group; +using FFXIVClassic_Map_Server.dataobjects; +using FFXIVClassic_Map_Server.dataobjects.chara; +using FFXIVClassic_Map_Server.lua; using FFXIVClassic_Map_Server.packets.WorldPackets.Send.Group; +using FFXIVClassic_Map_Server.utils; +using FFXIVClassic_Map_Server.actors.group; +using FFXIVClassic_Map_Server.actors.chara.player; +using FFXIVClassic_Map_Server.actors.director; using FFXIVClassic_Map_Server.actors.chara.npc; using FFXIVClassic_Map_Server.actors.chara.ai; using FFXIVClassic_Map_Server.actors.chara.ai.controllers; -using FFXIVClassic_Map_Server.packets.send.actor.battle; using FFXIVClassic_Map_Server.actors.chara.ai.utils; using FFXIVClassic_Map_Server.actors.chara.ai.state; -using FFXIVClassic_Map_Server.actors.chara.npc; using FFXIVClassic_Map_Server.actors.chara; +using FFXIVClassic_Map_Server.packets.send; +using FFXIVClassic_Map_Server.packets.send.actor; +using FFXIVClassic_Map_Server.packets.send.events; +using FFXIVClassic_Map_Server.packets.send.actor.inventory; +using FFXIVClassic_Map_Server.packets.send.player; +using FFXIVClassic_Map_Server.packets.send.actor.battle; +using FFXIVClassic_Map_Server.packets.receive.events; namespace FFXIVClassic_Map_Server.Actors { diff --git a/FFXIVClassic Map Server/actors/director/Director.cs b/FFXIVClassic Map Server/actors/director/Director.cs index e2a566a6..db46a3cd 100644 --- a/FFXIVClassic Map Server/actors/director/Director.cs +++ b/FFXIVClassic Map Server/actors/director/Director.cs @@ -241,7 +241,7 @@ namespace FFXIVClassic_Map_Server.actors.director { className = className.Substring(0, 20 - zoneName.Length); } - catch (ArgumentOutOfRangeException e) + catch (ArgumentOutOfRangeException) { } //Convert actor number to base 63 diff --git a/FFXIVClassic Map Server/dataobjects/ZoneConnection.cs b/FFXIVClassic Map Server/dataobjects/ZoneConnection.cs index f4a377e9..ef4ab7bf 100644 --- a/FFXIVClassic Map Server/dataobjects/ZoneConnection.cs +++ b/FFXIVClassic Map Server/dataobjects/ZoneConnection.cs @@ -41,7 +41,7 @@ namespace FFXIVClassic_Map_Server.dataobjects socket.Send(packetBytes); } catch (Exception e) - { Program.Log.Error("Weird case, socket was d/ced: {0}", e); } + { Program.Log.Error(e, "Weird case, socket was d/ced: {0}"); } } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/AddActorPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/AddActorPacket.cs index 6cf7d5f9..33aec37c 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/AddActorPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/AddActorPacket.cs @@ -1,7 +1,5 @@ using FFXIVClassic.Common; -using FFXIVClassic.Common; - namespace FFXIVClassic_Map_Server.packets.send.actor { class AddActorPacket diff --git a/FFXIVClassic Map Server/packets/send/Actor/DeleteAllActorsPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/DeleteAllActorsPacket.cs index b413eb7d..c2234468 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/DeleteAllActorsPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/DeleteAllActorsPacket.cs @@ -1,7 +1,5 @@ using FFXIVClassic.Common; -using FFXIVClassic.Common; - namespace FFXIVClassic_Map_Server.packets.send.actor { class DeleteAllActorsPacket diff --git a/FFXIVClassic Map Server/packets/send/Actor/PlayBGAnimation.cs b/FFXIVClassic Map Server/packets/send/Actor/PlayBGAnimation.cs index 597b8373..0e8a4e59 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/PlayBGAnimation.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/PlayBGAnimation.cs @@ -1,8 +1,5 @@ using FFXIVClassic.Common; -using System; using System.IO; - -using FFXIVClassic.Common; using System.Text; namespace FFXIVClassic_Map_Server.packets.send.actor diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorPropetyPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorPropetyPacket.cs index eec4278b..1d9d1fe0 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorPropetyPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorPropetyPacket.cs @@ -5,8 +5,6 @@ using System.Linq; using System.Reflection; using System.Text; -using FFXIVClassic.Common; - namespace FFXIVClassic_Map_Server.packets.send.actor { class SetActorPropetyPacket diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusAllPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusAllPacket.cs index 04d0d7f4..79bbbf90 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusAllPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusAllPacket.cs @@ -2,8 +2,6 @@ using System; using System.IO; -using FFXIVClassic.Common; - namespace FFXIVClassic_Map_Server.packets.send.actor { class SetActorStatusAllPacket diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusPacket.cs index 32c98f5b..2cdaf82e 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusPacket.cs @@ -2,8 +2,6 @@ using System; using System.IO; -using FFXIVClassic.Common; - namespace FFXIVClassic_Map_Server.packets.send.actor { class SetActorStatusPacket diff --git a/FFXIVClassic Map Server/packets/send/Actor/_0x132Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/_0x132Packet.cs index 1b6561ae..0bcd6b15 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/_0x132Packet.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/_0x132Packet.cs @@ -3,7 +3,6 @@ using System; using System.IO; using System.Text; -using FFXIVClassic.Common; namespace FFXIVClassic_Map_Server.packets.send.actor { class _0x132Packet diff --git a/FFXIVClassic Map Server/packets/send/Actor/events/SetEmoteEventCondition.cs b/FFXIVClassic Map Server/packets/send/Actor/events/SetEmoteEventCondition.cs index 49814e28..688fbcf1 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/events/SetEmoteEventCondition.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/events/SetEmoteEventCondition.cs @@ -4,8 +4,6 @@ using System; using System.IO; using System.Text; -using FFXIVClassic.Common; - namespace FFXIVClassic_Map_Server.packets.send.actor.events { class SetEmoteEventCondition diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX08Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX08Packet.cs index c886caeb..270d749f 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX08Packet.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX08Packet.cs @@ -3,8 +3,6 @@ using System; using System.Collections.Generic; using System.IO; -using FFXIVClassic.Common; - namespace FFXIVClassic_Map_Server.packets.send.actor.inventory { class InventoryRemoveX08Packet diff --git a/FFXIVClassic Map Server/packets/send/player/SetCompletedAchievementsPacket.cs b/FFXIVClassic Map Server/packets/send/player/SetCompletedAchievementsPacket.cs index a873d9e4..657ffadc 100644 --- a/FFXIVClassic Map Server/packets/send/player/SetCompletedAchievementsPacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/SetCompletedAchievementsPacket.cs @@ -1,8 +1,6 @@ using FFXIVClassic.Common; using System.IO; -using FFXIVClassic.Common; - namespace FFXIVClassic_Map_Server.packets.send.player { class SetCompletedAchievementsPacket diff --git a/FFXIVClassic Map Server/packets/send/player/SetCutsceneBookPacket.cs b/FFXIVClassic Map Server/packets/send/player/SetCutsceneBookPacket.cs index 56aad084..4f8c4b0a 100644 --- a/FFXIVClassic Map Server/packets/send/player/SetCutsceneBookPacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/SetCutsceneBookPacket.cs @@ -3,8 +3,6 @@ using System; using System.IO; using System.Text; -using FFXIVClassic.Common; - namespace FFXIVClassic_Map_Server.packets.send.player { class SetCutsceneBookPacket diff --git a/FFXIVClassic Map Server/packets/send/player/SetPlayerDreamPacket.cs b/FFXIVClassic Map Server/packets/send/player/SetPlayerDreamPacket.cs index 3f2c4897..82493e6b 100644 --- a/FFXIVClassic Map Server/packets/send/player/SetPlayerDreamPacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/SetPlayerDreamPacket.cs @@ -1,8 +1,6 @@ using FFXIVClassic.Common; using System; -using FFXIVClassic.Common; - namespace FFXIVClassic_Map_Server.packets.send.player { class SetPlayerDreamPacket diff --git a/FFXIVClassic Map Server/packets/send/player/SetPlayerItemStoragePacket.cs b/FFXIVClassic Map Server/packets/send/player/SetPlayerItemStoragePacket.cs index 0bda349f..1094ed31 100644 --- a/FFXIVClassic Map Server/packets/send/player/SetPlayerItemStoragePacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/SetPlayerItemStoragePacket.cs @@ -1,7 +1,4 @@ using FFXIVClassic.Common; -using System; - -using FFXIVClassic.Common; using System.IO; namespace FFXIVClassic_Map_Server.packets.send.player diff --git a/FFXIVClassic Map Server/packets/send/supportdesk/GMTicketSentResponsePacket.cs b/FFXIVClassic Map Server/packets/send/supportdesk/GMTicketSentResponsePacket.cs index 2974d7b8..e466a941 100644 --- a/FFXIVClassic Map Server/packets/send/supportdesk/GMTicketSentResponsePacket.cs +++ b/FFXIVClassic Map Server/packets/send/supportdesk/GMTicketSentResponsePacket.cs @@ -1,7 +1,5 @@ using FFXIVClassic.Common; -using FFXIVClassic.Common; - namespace FFXIVClassic_Map_Server.packets.send.supportdesk { class GMTicketSentResponsePacket diff --git a/FFXIVClassic Map Server/utils/SQLGeneration.cs b/FFXIVClassic Map Server/utils/SQLGeneration.cs index 26e5dea3..93e626ed 100644 --- a/FFXIVClassic Map Server/utils/SQLGeneration.cs +++ b/FFXIVClassic Map Server/utils/SQLGeneration.cs @@ -50,7 +50,7 @@ namespace FFXIVClassic_Map_Server.utils name = matches[2].Value.Trim(','); } - catch (FormatException e) + catch (FormatException) { continue; } placenames.Add(id, name); @@ -72,7 +72,7 @@ namespace FFXIVClassic_Map_Server.utils id = UInt32.Parse(matches[0].Value.Trim(',')); pId = UInt32.Parse(matches[1].Value.Trim(',')); } - catch (FormatException e) + catch (FormatException) { continue; } cmd.Parameters["@id"].Value = id; @@ -131,7 +131,7 @@ namespace FFXIVClassic_Map_Server.utils nameId = UInt32.Parse(matches[6].Value.Trim(',')); } - catch (FormatException e) + catch (FormatException) { continue; } cmd.Parameters["@id"].Value = id; @@ -198,7 +198,7 @@ namespace FFXIVClassic_Map_Server.utils } - catch (FormatException e) + catch (FormatException) { continue; } cmd.Parameters["@id"].Value = id; @@ -260,7 +260,7 @@ namespace FFXIVClassic_Map_Server.utils name = matches2[9].Value.Trim(','); points = UInt32.Parse(matches[3].Value.Trim(',')); } - catch (FormatException e) + catch (FormatException) { continue; } if (id == 100) diff --git a/FFXIVClassic World Server/DataObjects/ClientConnection.cs b/FFXIVClassic World Server/DataObjects/ClientConnection.cs index 928506b6..7c3427a8 100644 --- a/FFXIVClassic World Server/DataObjects/ClientConnection.cs +++ b/FFXIVClassic World Server/DataObjects/ClientConnection.cs @@ -47,7 +47,7 @@ namespace FFXIVClassic_World_Server socket.Send(packetBytes); } catch (Exception e) - { Program.Log.Error("Weird case, socket was d/ced: {0}", e); } + { Program.Log.Error(e, "Weird case, socket was d/ced: {0}"); } } } diff --git a/FFXIVClassic World Server/DataObjects/ZoneServer.cs b/FFXIVClassic World Server/DataObjects/ZoneServer.cs index 8b957bb0..da665001 100644 --- a/FFXIVClassic World Server/DataObjects/ZoneServer.cs +++ b/FFXIVClassic World Server/DataObjects/ZoneServer.cs @@ -59,7 +59,7 @@ namespace FFXIVClassic_World_Server.DataObjects throw new ApplicationException("Error occured starting listeners, check inner exception", e); } } - catch (Exception e) + catch (Exception) { Program.Log.Error("Failed to connect"); return false; } return true; @@ -76,7 +76,7 @@ namespace FFXIVClassic_World_Server.DataObjects zoneServerConnection.Send(packetBytes); } catch (Exception e) - { Program.Log.Error("Weird case, socket was d/ced: {0}", e); } + { Program.Log.Error(e, "Weird case, socket was d/ced: {0}"); } } else {