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

Change Teleport to not modify spawnTileX/Y (not tested.)

Browse source
This commit is contained in:
Deathmax 2011-07-02 21:49:07 +08:00
parent 2eb1084566
commit 552970c8d5
2 changed files with 49 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
TShockAPI/TSPlayer.cs
View file

@ -42,6 +42,8 @@ namespace TShockAPI
public Vector2 oldSpawn = Vector2.Zero;
public TSPlayer LastWhisper;
public int LoginAttempts { get; set; }
public bool Teleporting = false;
public Vector2 TeleportCoords = new Vector2(-1, -1);
Player FakePlayer = null;
@ -148,10 +150,8 @@ namespace TShockAPI
public bool Teleport(int tileX, int tileY)
{
InitSpawn = false;
int spawnTileX = Main.spawnTileX;
int spawnTileY = Main.spawnTileY;
Main.spawnTileX = tileX;
Main.spawnTileY = tileY;
Teleporting = true;
TeleportCoords = new Vector2(tileX, tileY);
SendData(PacketTypes.WorldInfo);
@ -189,9 +189,7 @@ namespace TShockAPI
}
}
Main.spawnTileX = spawnTileX;
Main.spawnTileY = spawnTileY;
Teleporting = false;
SendData(PacketTypes.WorldInfo);
return true;