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

Match the god damned existing tab format

Browse source
This commit is contained in:
MarioE 2012-08-20 10:33:54 -04:00
parent 8bbed92683
commit 5b032f277d
4 changed files with 186 additions and 186 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/Commands.cs
View file

@ -215,11 +215,11 @@ namespace TShockAPI
if (cmd == null) if (cmd == null)
{ {
if( player.AwaitingResponse.ContainsKey(cmdName)) if (player.AwaitingResponse.ContainsKey(cmdName))
{ {
Action<CommandArgs> call = player.AwaitingResponse[cmdName]; Action<CommandArgs> call = player.AwaitingResponse[cmdName];
player.AwaitingResponse.Remove(cmdName); player.AwaitingResponse.Remove(cmdName);
call( new CommandArgs(cmdText, player, args)); call(new CommandArgs(cmdText, player, args));
return true; return true;
} }
player.SendErrorMessage("Invalid command entered. Type /help for a list of valid commands."); player.SendErrorMessage("Invalid command entered. Type /help for a list of valid commands.");

6
TShockAPI/GetDataHandlers.cs
View file

@ -1911,8 +1911,8 @@ namespace TShockAPI
TSCheckNoclip(pos, args.TPlayer.width, args.TPlayer.height) && !TShock.Config.IgnoreNoClip TSCheckNoclip(pos, args.TPlayer.width, args.TPlayer.height) && !TShock.Config.IgnoreNoClip
&& !args.TPlayer.tongued) && !args.TPlayer.tongued)
{ {
int lastTileX = (int) (args.Player.LastNetPosition.X/16f); int lastTileX = (int)(args.Player.LastNetPosition.X / 16f);
int lastTileY = (int) (args.Player.LastNetPosition.Y/16f); int lastTileY = (int)(args.Player.LastNetPosition.Y / 16f);
if (!args.Player.Teleport(lastTileX, lastTileY + 3)) if (!args.Player.Teleport(lastTileX, lastTileY + 3))
{ {
args.Player.SendErrorMessage("You got stuck in a solid object, Sent to spawn point."); args.Player.SendErrorMessage("You got stuck in a solid object, Sent to spawn point.");
@ -2531,7 +2531,7 @@ namespace TShockAPI
if (dmg > TShock.Config.MaxDamage && !args.Player.Group.HasPermission(Permissions.ignoredamagecap) && id != args.Player.Index) if (dmg > TShock.Config.MaxDamage && !args.Player.Group.HasPermission(Permissions.ignoredamagecap) && id != args.Player.Index)
{ {
args.Player.Disable(String.Format("Player damage exceeded {0}.", TShock.Config.MaxDamage ) ); args.Player.Disable(String.Format("Player damage exceeded {0}.", TShock.Config.MaxDamage));
args.Player.SendData(PacketTypes.PlayerHp, "", id); args.Player.SendData(PacketTypes.PlayerHp, "", id);
args.Player.SendData(PacketTypes.PlayerUpdate, "", id); args.Player.SendData(PacketTypes.PlayerUpdate, "", id);
return true; return true;