cassidy/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-04-02 19:42:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up some warnings.

Browse Source
This commit is contained in:
Filip Maj 2019-05-04 20:53:08 -04:00
parent 1e4a1cf263
commit 10017b7e8c
27 changed files with 68 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FFXIVClassic Common Class Lib/Bitfield.cs
View File

@ -60,7 +60,7 @@ namespace FFXIVClassic.Common
// Calculate a bitmask of the desired length // Calculate a bitmask of the desired length
long mask = 0; long mask = 0;
for (int i = 0; i < fieldLength; i++) for (int i = 0; i < fieldLength; i++)
mask |= 1 << i; mask |= 1L << i;
r |= ((UInt32)f.GetValue(t) & mask) << offset; r |= ((UInt32)f.GetValue(t) & mask) << offset;

22
FFXIVClassic Common Class Lib/Vector3.cs
View File

@ -1,8 +1,4 @@
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace FFXIVClassic.Common namespace FFXIVClassic.Common
{ {
@ -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 //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); 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;
}
} }
} }

2
FFXIVClassic Lobby Server/ClientConnection.cs
View File

@ -58,7 +58,7 @@ namespace FFXIVClassic_Lobby_Server
socket.Send(packetBytes); socket.Send(packetBytes);
} }
catch(Exception e) 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}"); }
} }
} }

2
FFXIVClassic Map Server/actors/Actor.cs
View File

@ -509,7 +509,7 @@ namespace FFXIVClassic_Map_Server.Actors
{ {
className = className.Substring(0, 20 - zoneName.Length); className = className.Substring(0, 20 - zoneName.Length);
} }
catch (ArgumentOutOfRangeException e) catch (ArgumentOutOfRangeException)
{ } { }
//Convert actor number to base 63 //Convert actor number to base 63

4
FFXIVClassic Map Server/actors/StaticActors.cs
View File

@ -41,7 +41,7 @@ namespace FFXIVClassic_Map_Server.Actors
byte byteOut = (Byte)(byteIn ^ 0x73); byte byteOut = (Byte)(byteIn ^ 0x73);
binWriter.Write((Byte)byteOut); binWriter.Write((Byte)byteOut);
} }
catch (EndOfStreamException e) { break; } catch (EndOfStreamException) { break; }
} }
binReader.Close(); 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.Error("Could not find staticactors file."); return false; }
Program.Log.Info("Loaded {0} static actors.", mStaticActors.Count()); Program.Log.Info("Loaded {0} static actors.", mStaticActors.Count());

7
FFXIVClassic Map Server/actors/area/Area.cs
View File

@ -2,20 +2,13 @@
using FFXIVClassic.Common; using FFXIVClassic.Common;
using FFXIVClassic_Map_Server.actors.area; using FFXIVClassic_Map_Server.actors.area;
using FFXIVClassic_Map_Server.actors.chara.npc; 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.lua;
using FFXIVClassic_Map_Server.packets.send.actor; using FFXIVClassic_Map_Server.packets.send.actor;
using MoonSharp.Interpreter;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text;
using System.Threading.Tasks;
using FFXIVClassic_Map_Server.packets.send; using FFXIVClassic_Map_Server.packets.send;
using FFXIVClassic_Map_Server.actors.group;
using FFXIVClassic_Map_Server.actors.director; using FFXIVClassic_Map_Server.actors.director;
using FFXIVClassic_Map_Server.actors.chara.ai.controllers;
namespace FFXIVClassic_Map_Server.Actors namespace FFXIVClassic_Map_Server.Actors
{ {

3
FFXIVClassic Map Server/actors/chara/ai/controllers/BattleNpcController.cs
View File

@ -1,8 +1,5 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using FFXIVClassic.Common; using FFXIVClassic.Common;
using FFXIVClassic_Map_Server.Actors; using FFXIVClassic_Map_Server.Actors;
using FFXIVClassic_Map_Server.packets.send.actor; using FFXIVClassic_Map_Server.packets.send.actor;

33
FFXIVClassic Map Server/actors/chara/player/Player.cs
View File

@ -1,33 +1,28 @@
using FFXIVClassic.Common; 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;
using System.Collections.Generic; using System.Collections.Generic;
using MoonSharp.Interpreter; using MoonSharp.Interpreter;
using FFXIVClassic_Map_Server.packets.receive.events; using FFXIVClassic_Map_Server.dataobjects;
using FFXIVClassic_Map_Server.packets.send.actor.inventory; using FFXIVClassic_Map_Server.dataobjects.chara;
using FFXIVClassic_Map_Server.actors.group; using FFXIVClassic_Map_Server.lua;
using FFXIVClassic_Map_Server.packets.send.group;
using FFXIVClassic_Map_Server.packets.WorldPackets.Send.Group; 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.npc;
using FFXIVClassic_Map_Server.actors.chara.ai; using FFXIVClassic_Map_Server.actors.chara.ai;
using FFXIVClassic_Map_Server.actors.chara.ai.controllers; 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.utils;
using FFXIVClassic_Map_Server.actors.chara.ai.state; 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.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 namespace FFXIVClassic_Map_Server.Actors
{ {

2
FFXIVClassic Map Server/actors/director/Director.cs
View File

@ -241,7 +241,7 @@ namespace FFXIVClassic_Map_Server.actors.director
{ {
className = className.Substring(0, 20 - zoneName.Length); className = className.Substring(0, 20 - zoneName.Length);
} }
catch (ArgumentOutOfRangeException e) catch (ArgumentOutOfRangeException)
{ } { }
//Convert actor number to base 63 //Convert actor number to base 63

2
FFXIVClassic Map Server/dataobjects/ZoneConnection.cs
View File

@ -41,7 +41,7 @@ namespace FFXIVClassic_Map_Server.dataobjects
socket.Send(packetBytes); socket.Send(packetBytes);
} }
catch (Exception e) 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}"); }
} }
} }

2
FFXIVClassic Map Server/packets/send/Actor/AddActorPacket.cs
View File

@ -1,7 +1,5 @@
using FFXIVClassic.Common; using FFXIVClassic.Common;
using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor namespace FFXIVClassic_Map_Server.packets.send.actor
{ {
class AddActorPacket class AddActorPacket

2
FFXIVClassic Map Server/packets/send/Actor/DeleteAllActorsPacket.cs
View File

@ -1,7 +1,5 @@
using FFXIVClassic.Common; using FFXIVClassic.Common;
using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor namespace FFXIVClassic_Map_Server.packets.send.actor
{ {
class DeleteAllActorsPacket class DeleteAllActorsPacket

3
FFXIVClassic Map Server/packets/send/Actor/PlayBGAnimation.cs
View File

@ -1,8 +1,5 @@
using FFXIVClassic.Common; using FFXIVClassic.Common;
using System;
using System.IO; using System.IO;
using FFXIVClassic.Common;
using System.Text; using System.Text;
namespace FFXIVClassic_Map_Server.packets.send.actor namespace FFXIVClassic_Map_Server.packets.send.actor

2
FFXIVClassic Map Server/packets/send/Actor/SetActorPropetyPacket.cs
View File

@ -5,8 +5,6 @@ using System.Linq;
using System.Reflection; using System.Reflection;
using System.Text; using System.Text;
using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor namespace FFXIVClassic_Map_Server.packets.send.actor
{ {
class SetActorPropetyPacket class SetActorPropetyPacket

2
FFXIVClassic Map Server/packets/send/Actor/SetActorStatusAllPacket.cs
View File

@ -2,8 +2,6 @@
using System; using System;
using System.IO; using System.IO;
using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor namespace FFXIVClassic_Map_Server.packets.send.actor
{ {
class SetActorStatusAllPacket class SetActorStatusAllPacket

2
FFXIVClassic Map Server/packets/send/Actor/SetActorStatusPacket.cs
View File

@ -2,8 +2,6 @@
using System; using System;
using System.IO; using System.IO;
using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor namespace FFXIVClassic_Map_Server.packets.send.actor
{ {
class SetActorStatusPacket class SetActorStatusPacket

1
FFXIVClassic Map Server/packets/send/Actor/_0x132Packet.cs
View File

@ -3,7 +3,6 @@ using System;
using System.IO; using System.IO;
using System.Text; using System.Text;
using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor namespace FFXIVClassic_Map_Server.packets.send.actor
{ {
class _0x132Packet class _0x132Packet

2
FFXIVClassic Map Server/packets/send/Actor/events/SetEmoteEventCondition.cs
View File

@ -4,8 +4,6 @@ using System;
using System.IO; using System.IO;
using System.Text; using System.Text;
using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor.events namespace FFXIVClassic_Map_Server.packets.send.actor.events
{ {
class SetEmoteEventCondition class SetEmoteEventCondition

2
FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX08Packet.cs
View File

@ -3,8 +3,6 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor.inventory namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
{ {
class InventoryRemoveX08Packet class InventoryRemoveX08Packet

2
FFXIVClassic Map Server/packets/send/player/SetCompletedAchievementsPacket.cs
View File

@ -1,8 +1,6 @@
using FFXIVClassic.Common; using FFXIVClassic.Common;
using System.IO; using System.IO;
using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.player namespace FFXIVClassic_Map_Server.packets.send.player
{ {
class SetCompletedAchievementsPacket class SetCompletedAchievementsPacket

2
FFXIVClassic Map Server/packets/send/player/SetCutsceneBookPacket.cs
View File

@ -3,8 +3,6 @@ using System;
using System.IO; using System.IO;
using System.Text; using System.Text;
using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.player namespace FFXIVClassic_Map_Server.packets.send.player
{ {
class SetCutsceneBookPacket class SetCutsceneBookPacket

2
FFXIVClassic Map Server/packets/send/player/SetPlayerDreamPacket.cs
View File

@ -1,8 +1,6 @@
using FFXIVClassic.Common; using FFXIVClassic.Common;
using System; using System;
using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.player namespace FFXIVClassic_Map_Server.packets.send.player
{ {
class SetPlayerDreamPacket class SetPlayerDreamPacket

3
FFXIVClassic Map Server/packets/send/player/SetPlayerItemStoragePacket.cs
View File

@ -1,7 +1,4 @@
using FFXIVClassic.Common; using FFXIVClassic.Common;
using System;
using FFXIVClassic.Common;
using System.IO; using System.IO;
namespace FFXIVClassic_Map_Server.packets.send.player namespace FFXIVClassic_Map_Server.packets.send.player

2
FFXIVClassic Map Server/packets/send/supportdesk/GMTicketSentResponsePacket.cs
View File

@ -1,7 +1,5 @@
using FFXIVClassic.Common; using FFXIVClassic.Common;
using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.supportdesk namespace FFXIVClassic_Map_Server.packets.send.supportdesk
{ {
class GMTicketSentResponsePacket class GMTicketSentResponsePacket

10
FFXIVClassic Map Server/utils/SQLGeneration.cs
View File

@ -50,7 +50,7 @@ namespace FFXIVClassic_Map_Server.utils
name = matches[2].Value.Trim(','); name = matches[2].Value.Trim(',');
} }
catch (FormatException e) catch (FormatException)
{ continue; } { continue; }
placenames.Add(id, name); placenames.Add(id, name);
@ -72,7 +72,7 @@ namespace FFXIVClassic_Map_Server.utils
id = UInt32.Parse(matches[0].Value.Trim(',')); id = UInt32.Parse(matches[0].Value.Trim(','));
pId = UInt32.Parse(matches[1].Value.Trim(',')); pId = UInt32.Parse(matches[1].Value.Trim(','));
} }
catch (FormatException e) catch (FormatException)
{ continue; } { continue; }
cmd.Parameters["@id"].Value = id; cmd.Parameters["@id"].Value = id;
@ -131,7 +131,7 @@ namespace FFXIVClassic_Map_Server.utils
nameId = UInt32.Parse(matches[6].Value.Trim(',')); nameId = UInt32.Parse(matches[6].Value.Trim(','));
} }
catch (FormatException e) catch (FormatException)
{ continue; } { continue; }
cmd.Parameters["@id"].Value = id; cmd.Parameters["@id"].Value = id;
@ -198,7 +198,7 @@ namespace FFXIVClassic_Map_Server.utils
} }
catch (FormatException e) catch (FormatException)
{ continue; } { continue; }
cmd.Parameters["@id"].Value = id; cmd.Parameters["@id"].Value = id;
@ -260,7 +260,7 @@ namespace FFXIVClassic_Map_Server.utils
name = matches2[9].Value.Trim(','); name = matches2[9].Value.Trim(',');
points = UInt32.Parse(matches[3].Value.Trim(',')); points = UInt32.Parse(matches[3].Value.Trim(','));
} }
catch (FormatException e) catch (FormatException)
{ continue; } { continue; }
if (id == 100) if (id == 100)

2
FFXIVClassic World Server/DataObjects/ClientConnection.cs
View File

@ -47,7 +47,7 @@ namespace FFXIVClassic_World_Server
socket.Send(packetBytes); socket.Send(packetBytes);
} }
catch (Exception e) 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}"); }
} }
} }

4
FFXIVClassic World Server/DataObjects/ZoneServer.cs
View File

@ -59,7 +59,7 @@ namespace FFXIVClassic_World_Server.DataObjects
throw new ApplicationException("Error occured starting listeners, check inner exception", e); throw new ApplicationException("Error occured starting listeners, check inner exception", e);
} }
} }
catch (Exception e) catch (Exception)
{ Program.Log.Error("Failed to connect"); return false; } { Program.Log.Error("Failed to connect"); return false; }
return true; return true;
@ -76,7 +76,7 @@ namespace FFXIVClassic_World_Server.DataObjects
zoneServerConnection.Send(packetBytes); zoneServerConnection.Send(packetBytes);
} }
catch (Exception e) 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 else
{ {