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

fixed teleporting

Browse source
This commit is contained in:
high 2011-06-01 03:56:13 -04:00
parent f3ff33db62
commit 0d4e09dbd5
1 changed files with 459 additions and 473 deletions
Download patch file Download diff file Expand all files Collapse all files

60
TShockAPI/TShock.cs
View file

@ -1,15 +1,10 @@
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.IO; using System.IO;
using System.Net;
using Microsoft.Xna.Framework;
using Terraria; using Terraria;
using TerrariaAPI; using TerrariaAPI;
using TerrariaAPI.Hooks; using TerrariaAPI.Hooks;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using System.Net;
using TShockAPI;
namespace TShockAPI namespace TShockAPI
{ {
@ -50,7 +45,8 @@ namespace TShockAPI
get { return "The administration modification of the future."; } get { return "The administration modification of the future."; }
} }
public TShock(Main game) : base (game) public TShock(Main game)
: base(game)
{ {
} }
@ -84,7 +80,7 @@ namespace TShockAPI
* Hooks: * Hooks:
* */ * */
void NpcHooks_OnStrikeNpc(NpcStrikeEventArgs e) private void NpcHooks_OnStrikeNpc(NpcStrikeEventArgs e)
{ {
if (ConfigurationManager.infiniteInvasion) if (ConfigurationManager.infiniteInvasion)
{ {
@ -96,7 +92,7 @@ namespace TShockAPI
} }
} }
void OnPreGetData(byte id, messageBuffer msg, int idx, int length, HandledEventArgs e) private void OnPreGetData(byte id, messageBuffer msg, int idx, int length, HandledEventArgs e)
{ {
if (Main.netMode != 2) { return; } if (Main.netMode != 2) { return; }
if (id == 0x1e && ConfigurationManager.permaPvp) if (id == 0x1e && ConfigurationManager.permaPvp)
@ -105,7 +101,7 @@ namespace TShockAPI
} }
} }
void GetData(GetDataEventArgs e) private void GetData(GetDataEventArgs e)
{ {
if (Main.netMode != 2) { return; } if (Main.netMode != 2) { return; }
if (e.MsgID == 17) if (e.MsgID == 17)
@ -133,7 +129,7 @@ namespace TShockAPI
} }
} }
void OnGreetPlayer(int who, HandledEventArgs e) private void OnGreetPlayer(int who, HandledEventArgs e)
{ {
if (Main.netMode != 2) { return; } if (Main.netMode != 2) { return; }
int plr = who; //legacy support int plr = who; //legacy support
@ -155,7 +151,7 @@ namespace TShockAPI
e.Handled = true; e.Handled = true;
} }
void OnChat(int ply, string msg, HandledEventArgs handler) private void OnChat(int ply, string msg, HandledEventArgs handler)
{ {
if (Main.netMode != 2) { return; } if (Main.netMode != 2) { return; }
int x = (int)Main.player[ply].position.X; int x = (int)Main.player[ply].position.X;
@ -286,7 +282,7 @@ namespace TShockAPI
if (msg.Length > 3 && msg.Substring(0, 3) == "/tp") if (msg.Length > 3 && msg.Substring(0, 3) == "/tp")
{ {
string player = msg.Remove(0, 3).Trim(); string player = msg.Remove(0, 3).Trim();
if (!(Tools.FindPlayer(player) == -1) && !(player == "")) if (Tools.FindPlayer(player) != -1 && player != "")
{ {
Teleport(ply, Main.player[Tools.FindPlayer(player)].position.X, Main.player[Tools.FindPlayer(player)].position.Y); Teleport(ply, Main.player[Tools.FindPlayer(player)].position.X, Main.player[Tools.FindPlayer(player)].position.Y);
Tools.SendMessage(ply, "Teleported to " + player); Tools.SendMessage(ply, "Teleported to " + player);
@ -296,7 +292,7 @@ namespace TShockAPI
if (msg.Length > 7 && msg.Substring(0, 7) == "/tphere") if (msg.Length > 7 && msg.Substring(0, 7) == "/tphere")
{ {
string player = msg.Remove(0, 7).Trim(); string player = msg.Remove(0, 7).Trim();
if (!(Tools.FindPlayer(player) == -1) && !(player == "")) if (Tools.FindPlayer(player) != -1 && player != "")
{ {
Teleport(Tools.FindPlayer(player), Main.player[ply].position.X, Main.player[ply].position.Y); Teleport(Tools.FindPlayer(player), Main.player[ply].position.X, Main.player[ply].position.Y);
Tools.SendMessage(Tools.FindPlayer(player), "You were teleported to " + Tools.FindPlayer(ply) + "."); Tools.SendMessage(Tools.FindPlayer(player), "You were teleported to " + Tools.FindPlayer(ply) + ".");
@ -316,8 +312,7 @@ namespace TShockAPI
} }
} }
private void OnJoin(int ply, AllowEventArgs handler)
void OnJoin(int ply, AllowEventArgs handler)
{ {
if (Main.netMode != 2) { return; } if (Main.netMode != 2) { return; }
string ip = Tools.GetRealIP((Convert.ToString(Netplay.serverSock[ply].tcpClient.Client.RemoteEndPoint))); string ip = Tools.GetRealIP((Convert.ToString(Netplay.serverSock[ply].tcpClient.Client.RemoteEndPoint)));
@ -331,21 +326,20 @@ namespace TShockAPI
} }
} }
void OnLoadContent(Microsoft.Xna.Framework.Content.ContentManager obj) private void OnLoadContent(Microsoft.Xna.Framework.Content.ContentManager obj)
{ {
} }
void OnPreInit() private void OnPreInit()
{ {
FileTools.SetupConfig(); FileTools.SetupConfig();
} }
void OnPostInit() private void OnPostInit()
{ {
} }
void OnUpdate(GameTime time) private void OnUpdate(GameTime time)
{ {
if (Main.netMode != 2) { return; } if (Main.netMode != 2) { return; }
for (uint i = 0; i < Main.maxPlayers; i++) for (uint i = 0; i < Main.maxPlayers; i++)
@ -402,22 +396,15 @@ namespace TShockAPI
} }
} }
public static void Teleport(int ply, int x, int y)
{
Main.player[ply].velocity = new Vector2(0, 0);
NetMessage.SendData(0x0d, -1, -1, "", ply);
Main.player[ply].position.X = x;
Main.player[ply].position.Y = y - 0x2a;
NetMessage.SendData(0x0d, -1, -1, "", ply);
}
public static void Teleport(int ply, float x, float y) public static void Teleport(int ply, float x, float y)
{ {
Main.player[ply].position.X = x; int oldx = Main.player[ply].SpawnX;
Main.player[ply].position.Y = y - 0x2a; int oldy = Main.player[ply].SpawnY;
NetMessage.SendData(0x0d, -1, -1, "", ply); Main.player[ply].SpawnX = (int)(x / 16);
Main.player[ply].SpawnY = (int)((y - 0x2a) / 16);
NetMessage.SendData(0xC, -1, -1, "", ply);
Main.player[ply].SpawnX = oldx;
Main.player[ply].SpawnY = oldy;
} }
public static void StartInvasion() public static void StartInvasion()
@ -471,7 +458,6 @@ namespace TShockAPI
Tools.Broadcast(ConfigurationManager.killCount + " copies of Call of Duty smashed."); Tools.Broadcast(ConfigurationManager.killCount + " copies of Call of Duty smashed.");
break; break;
} }
} }
} }
} }