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

Fix stuff with teleporting.

Browse source
This commit is contained in:
Zidonuke 2011-12-29 20:23:58 -05:00
parent d44920023b
commit 1e6c74ace0
3 changed files with 42 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

70
TShockAPI/GetDataHandlers.cs
View file

@ -738,39 +738,51 @@ namespace TShockAPI
if (!pos.Equals(args.Player.LastNetPosition)) if (!pos.Equals(args.Player.LastNetPosition))
{ {
float distance = Vector2.Distance(new Vector2(pos.X / 16f, pos.Y / 16f), new Vector2(args.Player.LastNetPosition.X / 16f, args.Player.LastNetPosition.Y / 16f)); float distance = Vector2.Distance(new Vector2(pos.X / 16f, pos.Y / 16f), new Vector2(args.Player.LastNetPosition.X / 16f, args.Player.LastNetPosition.Y / 16f));
if (TShock.CheckIgnores(args.Player) && distance > TShock.Config.MaxRangeForDisabled) if (TShock.CheckIgnores(args.Player))
{ {
if(args.Player.IgnoreActionsForCheating != "none") if (distance > TShock.Config.MaxRangeForDisabled)
{ {
args.Player.SendMessage("Disabled for cheating: " + args.Player.IgnoreActionsForCheating, Color.Red); if (args.Player.IgnoreActionsForCheating != "none")
{
args.Player.SendMessage("Disabled for cheating: " + args.Player.IgnoreActionsForCheating,
Color.Red);
}
else if (args.Player.IgnoreActionsForDisabledArmor != "none")
{
args.Player.SendMessage(
"Disabled for banned armor: " + args.Player.IgnoreActionsForDisabledArmor, Color.Red);
}
else if (args.Player.IgnoreActionsForInventory != "none")
{
args.Player.SendMessage(
"Disabled for Server Side Inventory: " + args.Player.IgnoreActionsForInventory,
Color.Red);
}
else if (TShock.Config.RequireLogin && !args.Player.IsLoggedIn)
{
args.Player.SendMessage("Please /register or /login to play!", Color.Red);
}
else if (args.Player.IgnoreActionsForClearingTrashCan)
{
args.Player.SendMessage("You need to rejoin to ensure your trash can is cleared!", Color.Red);
}
else if (TShock.Config.PvPMode == "always" && !args.TPlayer.hostile)
{
args.Player.SendMessage("PvP is forced! Enable PvP else you can't move or do anything!",
Color.Red);
}
int lastTileX = (int) (args.Player.LastNetPosition.X/16f);
int lastTileY = (int) (args.Player.LastNetPosition.Y/16f);
if (!args.Player.Teleport(lastTileX, lastTileY + 3))
{
args.Player.Spawn();
}
return true;
} }
else if (args.Player.IgnoreActionsForDisabledArmor != "none") else
{ {
args.Player.SendMessage("Disabled for banned armor: " + args.Player.IgnoreActionsForDisabledArmor, Color.Red); return true;
} }
else if (args.Player.IgnoreActionsForInventory != "none")
{
args.Player.SendMessage("Disabled for Server Side Inventory: " + args.Player.IgnoreActionsForInventory, Color.Red);
}
else if (TShock.Config.RequireLogin && !args.Player.IsLoggedIn)
{
args.Player.SendMessage("Please /register or /login to play!", Color.Red);
}
else if (args.Player.IgnoreActionsForClearingTrashCan)
{
args.Player.SendMessage("You need to rejoin to ensure your trash can is cleared!", Color.Red);
}
else if (TShock.Config.PvPMode == "always" && !args.TPlayer.hostile)
{
args.Player.SendMessage("PvP is forced! Enable PvP else you can't move or do anything!", Color.Red);
}
int lastTileX = (int)(args.Player.LastNetPosition.X / 16f);
int lastTileY = (int)(args.Player.LastNetPosition.Y / 16f);
if (!args.Player.Teleport(lastTileX, lastTileY + 3))
{
args.Player.Spawn();
}
return true;
} }
if (args.Player.Dead) if (args.Player.Dead)
@ -789,8 +801,8 @@ namespace TShockAPI
} }
return true; return true;
} }
args.Player.LastNetPosition = pos;
} }
args.Player.LastNetPosition = pos;
if ((control & 32) == 32) if ((control & 32) == 32)
{ {

3
TShockAPI/TSPlayer.cs
View file

@ -234,7 +234,6 @@ namespace TShockAPI
{ {
InitSpawn = false; InitSpawn = false;
LastNetPosition = new Vector2(tilex * 16f, tiley * 16f);
SendWorldInfo(tilex, tiley, true); SendWorldInfo(tilex, tiley, true);
//150 Should avoid all client crash errors //150 Should avoid all client crash errors
@ -245,7 +244,6 @@ namespace TShockAPI
{ {
InitSpawn = true; InitSpawn = true;
SendWorldInfo(Main.spawnTileX, Main.spawnTileY, false); SendWorldInfo(Main.spawnTileX, Main.spawnTileY, false);
SendMessage("Warning, teleport failed due to being too close to the edge of the map.", Color.Red);
return false; return false;
} }
@ -261,7 +259,6 @@ namespace TShockAPI
public void Spawn() public void Spawn()
{ {
LastNetPosition = new Vector2(TPlayer.SpawnX*16f, TPlayer.SpawnX*16f);
Spawn(TPlayer.SpawnX, TPlayer.SpawnY); Spawn(TPlayer.SpawnX, TPlayer.SpawnY);
} }

2
TShockAPI/TShock.cs
View file

@ -842,7 +842,7 @@ namespace TShockAPI
if (Config.RememberLeavePos) if (Config.RememberLeavePos)
{ {
var pos = RememberedPos.GetLeavePos(player.Name, player.IP); var pos = RememberedPos.GetLeavePos(player.Name, player.IP);
player.Teleport((int) pos.X, (int) pos.Y); player.Teleport((int) pos.X, (int) pos.Y + 3);
} }
e.Handled = true; e.Handled = true;