themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Final batch of .name changes

Browse source
This commit is contained in:
Lucas Nicodemus 2017-04-19 17:41:15 -06:00
parent 2dee3edb3d
commit b8dbdb9ff4
No known key found for this signature in database
GPG key ID: CEE668CCE1BF2C7C
4 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

18
TShockAPI/GetDataHandlers.cs
View file

@ -2149,7 +2149,7 @@ namespace TShockAPI
args.Player.SendErrorMessage("You do not have permission to place actuators."); args.Player.SendErrorMessage("You do not have permission to place actuators.");
return true; return true;
} }
if (TShock.Itembans.ItemIsBanned(selectedItem.name, args.Player) || editData >= (action == EditAction.PlaceTile ? Main.maxTileSets : Main.maxWallTypes)) if (TShock.Itembans.ItemIsBanned(selectedItem.Name, args.Player) || editData >= (action == EditAction.PlaceTile ? Main.maxTileSets : Main.maxWallTypes))
{ {
args.Player.SendTileSquare(tileX, tileY, 4); args.Player.SendTileSquare(tileX, tileY, 4);
return true; return true;
@ -2608,7 +2608,7 @@ namespace TShockAPI
if (control[5]) if (control[5])
{ {
string itemName = args.TPlayer.inventory[item].name; string itemName = args.TPlayer.inventory[item].Name;
if (TShock.Itembans.ItemIsBanned(itemName, args.Player)) if (TShock.Itembans.ItemIsBanned(itemName, args.Player))
{ {
control[5] = false; control[5] = false;
@ -2616,19 +2616,19 @@ namespace TShockAPI
args.Player.SendErrorMessage("You cannot use {0} on this server. Your actions are being ignored.", itemName); args.Player.SendErrorMessage("You cannot use {0} on this server. Your actions are being ignored.", itemName);
} }
if (args.TPlayer.inventory[item].name == "Mana Crystal" && args.Player.TPlayer.statManaMax <= 180) if (args.TPlayer.inventory[item].Name == "Mana Crystal" && args.Player.TPlayer.statManaMax <= 180)
{ {
args.Player.TPlayer.statMana += 20; args.Player.TPlayer.statMana += 20;
args.Player.TPlayer.statManaMax += 20; args.Player.TPlayer.statManaMax += 20;
args.Player.PlayerData.maxMana += 20; args.Player.PlayerData.maxMana += 20;
} }
else if (args.TPlayer.inventory[item].name == "Life Crystal" && args.Player.TPlayer.statLifeMax <= 380) else if (args.TPlayer.inventory[item].Name == "Life Crystal" && args.Player.TPlayer.statLifeMax <= 380)
{ {
args.TPlayer.statLife += 20; args.TPlayer.statLife += 20;
args.TPlayer.statLifeMax += 20; args.TPlayer.statLifeMax += 20;
args.Player.PlayerData.maxHealth += 20; args.Player.PlayerData.maxHealth += 20;
} }
else if (args.TPlayer.inventory[item].name == "Life Fruit" && args.Player.TPlayer.statLifeMax >= 400 && args.Player.TPlayer.statLifeMax <= 495) else if (args.TPlayer.inventory[item].Name == "Life Fruit" && args.Player.TPlayer.statLifeMax >= 400 && args.Player.TPlayer.statLifeMax <= 495)
{ {
args.TPlayer.statLife += 5; args.TPlayer.statLife += 5;
args.TPlayer.statLifeMax += 5; args.TPlayer.statLifeMax += 5;
@ -3330,7 +3330,7 @@ namespace TShockAPI
Item item = new Item(); Item item = new Item();
item.netDefaults(type); item.netDefaults(type);
if (stacks > item.maxStack || TShock.Itembans.ItemIsBanned(item.name, args.Player)) if (stacks > item.maxStack || TShock.Itembans.ItemIsBanned(item.Name, args.Player))
{ {
return false; return false;
} }
@ -3510,7 +3510,7 @@ namespace TShockAPI
Item item = new Item(); Item item = new Item();
item.netDefaults(type); item.netDefaults(type);
if ((stacks > item.maxStack || stacks <= 0) || (TShock.Itembans.ItemIsBanned(item.name, args.Player) && !args.Player.HasPermission(Permissions.allowdroppingbanneditems))) if ((stacks > item.maxStack || stacks <= 0) || (TShock.Itembans.ItemIsBanned(item.Name, args.Player) && !args.Player.HasPermission(Permissions.allowdroppingbanneditems)))
{ {
args.Player.SendData(PacketTypes.ItemDrop, "", id); args.Player.SendData(PacketTypes.ItemDrop, "", id);
return true; return true;
@ -3518,7 +3518,7 @@ namespace TShockAPI
if ((Main.ServerSideCharacter) && (DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond - args.Player.LoginMS < TShock.ServerSideCharacterConfig.LogonDiscardThreshold)) if ((Main.ServerSideCharacter) && (DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond - args.Player.LoginMS < TShock.ServerSideCharacterConfig.LogonDiscardThreshold))
{ {
//Player is probably trying to sneak items onto the server in their hands!!! //Player is probably trying to sneak items onto the server in their hands!!!
TShock.Log.ConsoleInfo("Player {0} tried to sneak {1} onto the server!", args.Player.Name, item.name); TShock.Log.ConsoleInfo("Player {0} tried to sneak {1} onto the server!", args.Player.Name, item.Name);
args.Player.SendData(PacketTypes.ItemDrop, "", id); args.Player.SendData(PacketTypes.ItemDrop, "", id);
return true; return true;
@ -3932,7 +3932,7 @@ namespace TShockAPI
boss = "a Goblin Invasion"; boss = "a Goblin Invasion";
break; break;
default: default:
boss = String.Format("the {0}", npc.name); boss = String.Format("the {0}", npc.FullName);
break; break;
} }
if (TShock.Config.AnonymousBossInvasions) if (TShock.Config.AnonymousBossInvasions)

4
TShockAPI/Rest/RestManager.cs
View file

@ -940,9 +940,9 @@ namespace TShockAPI
{"registered", player.User?.Registered}, {"registered", player.User?.Registered},
{"muted", player.mute }, {"muted", player.mute },
{"position", player.TileX + "," + player.TileY}, {"position", player.TileX + "," + player.TileY},
{"inventory", string.Join(", ", inventory.Select(p => (p.name + ":" + p.stack)))}, {"inventory", string.Join(", ", inventory.Select(p => (p.Name + ":" + p.stack)))},
{"armor", string.Join(", ", equipment.Select(p => (p.netID + ":" + p.prefix)))}, {"armor", string.Join(", ", equipment.Select(p => (p.netID + ":" + p.prefix)))},
{"dyes", string.Join(", ", dyes.Select(p => (p.name)))}, {"dyes", string.Join(", ", dyes.Select(p => (p.Name)))},
{"buffs", string.Join(", ", player.TPlayer.buffType)} {"buffs", string.Join(", ", player.TPlayer.buffType)}
}; };
} }

2
TShockAPI/TSPlayer.cs
View file

@ -565,7 +565,7 @@ namespace TShockAPI
{ {
for (int i = 0; i < 50; i++) //51 is trash can, 52-55 is coins, 56-59 is ammo for (int i = 0; i < 50; i++) //51 is trash can, 52-55 is coins, 56-59 is ammo
{ {
if (TPlayer.inventory[i] == null || !TPlayer.inventory[i].active || TPlayer.inventory[i].name == "") if (TPlayer.inventory[i] == null || !TPlayer.inventory[i].active || TPlayer.inventory[i].Name == "")
{ {
flag = true; flag = true;
break; break;

22
TShockAPI/Utils.cs
View file

@ -348,11 +348,11 @@ namespace TShockAPI
for (int i = -48; i < Main.maxItemTypes; i++) for (int i = -48; i < Main.maxItemTypes; i++)
{ {
item.netDefaults(i); item.netDefaults(i);
if (String.IsNullOrWhiteSpace(item.name)) if (String.IsNullOrWhiteSpace(item.Name))
continue; continue;
if (item.name.ToLower() == nameLower) if (item.Name.ToLower() == nameLower)
return new List<Item> { item }; return new List<Item> { item };
if (item.name.ToLower().StartsWith(nameLower)) if (item.Name.ToLower().StartsWith(nameLower))
found.Add(item.Clone()); found.Add(item.Clone());
} }
return found; return found;
@ -420,9 +420,9 @@ namespace TShockAPI
for (int i = -17; i < Main.maxNPCTypes; i++) for (int i = -17; i < Main.maxNPCTypes; i++)
{ {
npc.netDefaults(i); npc.netDefaults(i);
if (npc.name.ToLower() == nameLower || npc.displayName.ToLower() == nameLower) if (npc.FullName.ToLower() == nameLower || npc.TypeName.ToLower() == nameLower)
return new List<NPC> { npc }; return new List<NPC> { npc };
if (npc.name.ToLower().StartsWith(nameLower) || npc.displayName.ToLower().StartsWith(nameLower)) if (npc.FullName.ToLower().StartsWith(nameLower) || npc.TypeName.ToLower().StartsWith(nameLower))
found.Add((NPC)npc.Clone()); found.Add((NPC)npc.Clone());
} }
return found; return found;
@ -1248,10 +1248,10 @@ namespace TShockAPI
{ {
Item item = new Item(); Item item = new Item();
item.netDefaults(i); item.netDefaults(i);
if (!String.IsNullOrEmpty(item.name)) if (!String.IsNullOrEmpty(item.Name))
{ {
object[] element = new object[] { i, object[] element = new object[] { i,
newLine.Replace(item.name, @" "), newLine.Replace(item.Name, @" "),
newLine.Replace(item.toolTip, @" "), newLine.Replace(item.toolTip, @" "),
newLine.Replace(item.toolTip2, @" ") newLine.Replace(item.toolTip2, @" ")
}; };
@ -1288,9 +1288,9 @@ namespace TShockAPI
{ {
NPC npc = new NPC(); NPC npc = new NPC();
npc.netDefaults(i); npc.netDefaults(i);
if (!String.IsNullOrEmpty(npc.name)) if (!String.IsNullOrEmpty(npc.FullName))
{ {
object[] element = new object[] { i, npc.name, npc.displayName }; object[] element = new object[] { i, npc.FullName, npc.displayName };
elements.Add(element); elements.Add(element);
} }
} }
@ -1324,9 +1324,9 @@ namespace TShockAPI
{ {
Projectile projectile = new Projectile(); Projectile projectile = new Projectile();
projectile.SetDefaults(i); projectile.SetDefaults(i);
if (!String.IsNullOrEmpty(projectile.name)) if (!String.IsNullOrEmpty(projectile.Name))
{ {
object[] element = new object[] { i, projectile.name }; object[] element = new object[] { i, projectile.Name };
elements.Add(element); elements.Add(element);
} }
} }