mirrors/project-meteor-server
1
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-04-23 21:27:46 +00:00
Code Activity

Fix spelling

Browse source
This commit is contained in:
TheManii 2016-04-06 15:34:04 -07:00
parent ea1e16aea7
commit 26f5e1be28
4 changed files with 671 additions and 671 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
FFXIVClassic Map Server/CommandProcessor.cs
View file

@ -264,36 +264,36 @@ namespace FFXIVClassic_Lobby_Server
} }
} }
private void giveCurrancy(ConnectedPlayer client, uint itemId, int quantity) private void giveCurrency(ConnectedPlayer client, uint itemId, int quantity)
{ {
if (client != null) if (client != null)
{ {
Player p = client.getActor(); Player p = client.getActor();
p.getInventory(Inventory.CURRANCY).addItem(itemId, quantity); p.getInventory(Inventory.CURRENCY).addItem(itemId, quantity);
} }
else else
{ {
foreach (KeyValuePair<uint, ConnectedPlayer> entry in mConnectedPlayerList) foreach (KeyValuePair<uint, ConnectedPlayer> entry in mConnectedPlayerList)
{ {
Player p = entry.Value.getActor(); Player p = entry.Value.getActor();
p.getInventory(Inventory.CURRANCY).addItem(itemId, quantity); p.getInventory(Inventory.CURRENCY).addItem(itemId, quantity);
} }
} }
} }
private void removeCurrancy(ConnectedPlayer client, uint itemId, int quantity) private void removeCurrency(ConnectedPlayer client, uint itemId, int quantity)
{ {
if (client != null) if (client != null)
{ {
Player p = client.getActor(); Player p = client.getActor();
p.getInventory(Inventory.CURRANCY).removeItem(itemId, quantity); p.getInventory(Inventory.CURRENCY).removeItem(itemId, quantity);
} }
else else
{ {
foreach (KeyValuePair<uint, ConnectedPlayer> entry in mConnectedPlayerList) foreach (KeyValuePair<uint, ConnectedPlayer> entry in mConnectedPlayerList)
{ {
Player p = entry.Value.getActor(); Player p = entry.Value.getActor();
p.getInventory(Inventory.CURRANCY).removeItem(itemId, quantity); p.getInventory(Inventory.CURRENCY).removeItem(itemId, quantity);
} }
} }
} }
@ -606,9 +606,9 @@ namespace FFXIVClassic_Lobby_Server
try try
{ {
if (split.Length == 2) if (split.Length == 2)
giveCurrancy(client, UInt32.Parse(split[1]), 1); giveCurrency(client, UInt32.Parse(split[1]), 1);
else if (split.Length == 3) else if (split.Length == 3)
giveCurrancy(client, UInt32.Parse(split[1]), Int32.Parse(split[2])); giveCurrency(client, UInt32.Parse(split[1]), Int32.Parse(split[2]));
} }
catch (Exception e) catch (Exception e)
{ {
@ -623,9 +623,9 @@ namespace FFXIVClassic_Lobby_Server
try try
{ {
if (split.Length == 2) if (split.Length == 2)
removeCurrancy(client, UInt32.Parse(split[1]), 1); removeCurrency(client, UInt32.Parse(split[1]), 1);
else if (split.Length == 3) else if (split.Length == 3)
removeCurrancy(client, UInt32.Parse(split[1]), Int32.Parse(split[2])); removeCurrency(client, UInt32.Parse(split[1]), Int32.Parse(split[2]));
return true; return true;
} }
catch (Exception e) catch (Exception e)

2
FFXIVClassic Map Server/Database.cs
View file

@ -708,7 +708,7 @@ namespace FFXIVClassic_Lobby_Server
player.getInventory(Inventory.NORMAL).initList(getInventory(player, 0, Inventory.NORMAL)); player.getInventory(Inventory.NORMAL).initList(getInventory(player, 0, Inventory.NORMAL));
player.getInventory(Inventory.KEYITEMS).initList(getInventory(player, 0, Inventory.KEYITEMS)); player.getInventory(Inventory.KEYITEMS).initList(getInventory(player, 0, Inventory.KEYITEMS));
player.getInventory(Inventory.CURRANCY).initList(getInventory(player, 0, Inventory.CURRANCY)); player.getInventory(Inventory.CURRENCY).initList(getInventory(player, 0, Inventory.CURRENCY));
player.getInventory(Inventory.BAZAAR).initList(getInventory(player, 0, Inventory.BAZAAR)); player.getInventory(Inventory.BAZAAR).initList(getInventory(player, 0, Inventory.BAZAAR));
player.getInventory(Inventory.MELDREQUEST).initList(getInventory(player, 0, Inventory.MELDREQUEST)); player.getInventory(Inventory.MELDREQUEST).initList(getInventory(player, 0, Inventory.MELDREQUEST));
player.getInventory(Inventory.LOOT).initList(getInventory(player, 0, Inventory.LOOT)); player.getInventory(Inventory.LOOT).initList(getInventory(player, 0, Inventory.LOOT));

8
FFXIVClassic Map Server/actors/chara/player/Inventory.cs
View file

@ -18,7 +18,7 @@ namespace FFXIVClassic_Map_Server.actors.chara.player
public const ushort LOOT = 0x0004; //Max 0xA public const ushort LOOT = 0x0004; //Max 0xA
public const ushort MELDREQUEST = 0x0005; //Max 0x04 public const ushort MELDREQUEST = 0x0005; //Max 0x04
public const ushort BAZAAR = 0x0007; //Max 0x0A public const ushort BAZAAR = 0x0007; //Max 0x0A
public const ushort CURRANCY = 0x0063; //Max 0x140 public const ushort CURRENCY = 0x0063; //Max 0x140
public const ushort KEYITEMS = 0x0064; //Max 0x500 public const ushort KEYITEMS = 0x0064; //Max 0x500
public const ushort EQUIPMENT = 0x00FE; //Max 0x23 public const ushort EQUIPMENT = 0x00FE; //Max 0x23
public const ushort EQUIPMENT_OTHERPLAYER = 0x00F9; //Max 0x23 public const ushort EQUIPMENT_OTHERPLAYER = 0x00F9; //Max 0x23
@ -132,7 +132,7 @@ namespace FFXIVClassic_Map_Server.actors.chara.player
{ {
Database.setQuantity(owner, slot, inventoryCode, list[slot].quantity); Database.setQuantity(owner, slot, inventoryCode, list[slot].quantity);
if (inventoryCode != CURRANCY && inventoryCode != KEYITEMS) if (inventoryCode != CURRENCY && inventoryCode != KEYITEMS)
sendInventoryPackets(list[slot]); sendInventoryPackets(list[slot]);
} }
@ -144,13 +144,13 @@ namespace FFXIVClassic_Map_Server.actors.chara.player
list.Add(addedItem); list.Add(addedItem);
if (inventoryCode != CURRANCY && inventoryCode != KEYITEMS) if (inventoryCode != CURRENCY && inventoryCode != KEYITEMS)
sendInventoryPackets(addedItem); sendInventoryPackets(addedItem);
quantityCount -= gItem.maxStack; quantityCount -= gItem.maxStack;
} }
if (inventoryCode == CURRANCY || inventoryCode == KEYITEMS) if (inventoryCode == CURRENCY || inventoryCode == KEYITEMS)
sendFullInventory(); sendFullInventory();
owner.queuePacket(InventorySetEndPacket.buildPacket(owner.actorId)); owner.queuePacket(InventorySetEndPacket.buildPacket(owner.actorId));

4
FFXIVClassic Map Server/actors/chara/player/Player.cs
View file

@ -140,7 +140,7 @@ namespace FFXIVClassic_Map_Server.Actors
inventories[Inventory.NORMAL] = new Inventory(this, MAXSIZE_INVENTORY_NORMAL, Inventory.NORMAL); inventories[Inventory.NORMAL] = new Inventory(this, MAXSIZE_INVENTORY_NORMAL, Inventory.NORMAL);
inventories[Inventory.KEYITEMS] = new Inventory(this, MAXSIZE_INVENTORY_KEYITEMS, Inventory.KEYITEMS); inventories[Inventory.KEYITEMS] = new Inventory(this, MAXSIZE_INVENTORY_KEYITEMS, Inventory.KEYITEMS);
inventories[Inventory.CURRANCY] = new Inventory(this, MAXSIZE_INVENTORY_CURRANCY, Inventory.CURRANCY); inventories[Inventory.CURRENCY] = new Inventory(this, MAXSIZE_INVENTORY_CURRANCY, Inventory.CURRENCY);
inventories[Inventory.MELDREQUEST] = new Inventory(this, MAXSIZE_INVENTORY_MELDREQUEST, Inventory.MELDREQUEST); inventories[Inventory.MELDREQUEST] = new Inventory(this, MAXSIZE_INVENTORY_MELDREQUEST, Inventory.MELDREQUEST);
inventories[Inventory.BAZAAR] = new Inventory(this, MAXSIZE_INVENTORY_BAZAAR, Inventory.BAZAAR); inventories[Inventory.BAZAAR] = new Inventory(this, MAXSIZE_INVENTORY_BAZAAR, Inventory.BAZAAR);
inventories[Inventory.LOOT] = new Inventory(this, MAXSIZE_INVENTORY_LOOT, Inventory.LOOT); inventories[Inventory.LOOT] = new Inventory(this, MAXSIZE_INVENTORY_LOOT, Inventory.LOOT);
@ -500,7 +500,7 @@ namespace FFXIVClassic_Map_Server.Actors
#region Inventory & Equipment #region Inventory & Equipment
queuePacket(InventoryBeginChangePacket.buildPacket(actorId)); queuePacket(InventoryBeginChangePacket.buildPacket(actorId));
inventories[Inventory.NORMAL].sendFullInventory(); inventories[Inventory.NORMAL].sendFullInventory();
inventories[Inventory.CURRANCY].sendFullInventory(); inventories[Inventory.CURRENCY].sendFullInventory();
inventories[Inventory.KEYITEMS].sendFullInventory(); inventories[Inventory.KEYITEMS].sendFullInventory();
inventories[Inventory.BAZAAR].sendFullInventory(); inventories[Inventory.BAZAAR].sendFullInventory();
inventories[Inventory.MELDREQUEST].sendFullInventory(); inventories[Inventory.MELDREQUEST].sendFullInventory();