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

44
TShockAPI/TShock.cs
View file

@ -103,6 +103,7 @@ namespace TShockAPI
ServerHooks.Command += ServerHooks_OnCommand; ServerHooks.Command += ServerHooks_OnCommand;
NetHooks.GetData += GetData; NetHooks.GetData += GetData;
NetHooks.GreetPlayer += OnGreetPlayer; NetHooks.GreetPlayer += OnGreetPlayer;
NetHooks.SendData += OnSendData;
NpcHooks.StrikeNpc += NpcHooks_OnStrikeNpc; NpcHooks.StrikeNpc += NpcHooks_OnStrikeNpc;
AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException; AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
@ -128,6 +129,7 @@ namespace TShockAPI
ServerHooks.Command -= ServerHooks_OnCommand; ServerHooks.Command -= ServerHooks_OnCommand;
NetHooks.GetData -= GetData; NetHooks.GetData -= GetData;
NetHooks.GreetPlayer -= OnGreetPlayer; NetHooks.GreetPlayer -= OnGreetPlayer;
NetHooks.SendData -= OnSendData;
NpcHooks.StrikeNpc -= NpcHooks_OnStrikeNpc; NpcHooks.StrikeNpc -= NpcHooks_OnStrikeNpc;
} }
@ -435,6 +437,48 @@ namespace TShockAPI
} }
} }
private void OnSendData(SendDataEventArgs e)
{
//TODO - Clean this code up
switch (e.MsgID)
{
case PacketTypes.WorldInfo:
if (e.remoteClient >= 0 && Players[e.remoteClient] != null && Players[e.remoteClient].Teleporting)
{
var stream = new MemoryStream();
var writer = new BinaryWriter(stream);
stream.Position = 4;
writer.Write(BitConverter.GetBytes(7), 0, 1);
writer.Write(Main.dayTime);
writer.Write((byte)Main.moonPhase);
writer.Write(Main.bloodMoon);
writer.Write((int)Main.time);
writer.Write(Main.maxTilesX);
writer.Write(Main.maxTilesY);
writer.Write((int)Players[e.remoteClient].TeleportCoords.X);
writer.Write((int)Players[e.remoteClient].TeleportCoords.Y);
writer.Write((int)Main.worldSurface);
writer.Write((int)Main.rockLayer);
writer.Write(Main.worldID);
writer.Write(0 + (WorldGen.shadowOrbSmashed ? 1 : 0) + (NPC.downedBoss1 ? 2 : 0) + (NPC.downedBoss2 ? 4 : 0) + (NPC.downedBoss3 ? 8 : 0));
writer.Write(Main.worldName);
var length = stream.Position - 5;
stream.Position = 0;
writer.Write(length);
try
{
NetMessage.buffer[e.remoteClient].spamCount++;
Netplay.serverSock[e.remoteClient].networkStream.BeginWrite(stream.GetBuffer(), 0, (int)stream.Length, new AsyncCallback(Netplay.serverSock[e.remoteClient].ServerWriteCallBack), Netplay.serverSock[e.remoteClient].networkStream);
}
catch { }
e.Handled = true;
}
break;
default:
break;
}
}
private void OnGreetPlayer(int who, HandledEventArgs e) private void OnGreetPlayer(int who, HandledEventArgs e)
{ {
var player = Players[who]; var player = Players[who];