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

merge take 2

Browse source
This commit is contained in:
high 2011-06-01 04:14:39 -04:00
parent da882cc9db
commit ab4d714a97
1 changed files with 68 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

27
TShockAPI/TShock.cs
View file

@ -1,23 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.IO;
using System.Net;
using Microsoft.Xna.Framework;
using Terraria;
using TerrariaAPI;
using TerrariaAPI.Hooks;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using System.Net;
using TShockAPI;
namespace TShockAPI
{
public class TShock : TerrariaPlugin
{
private uint[] tileThreshold = new uint[Main.maxPlayers];
uint[] tileThreshold = new uint[Main.maxPlayers];
public static string saveDir = "./tshock/";
@ -52,7 +45,6 @@ namespace TShockAPI
get { return "The administration modification of the future."; }
}
public TShock(Main game) : base (game)
public TShock(Main game)
: base(game)
{
@ -89,7 +81,6 @@ namespace TShockAPI
* */
void NpcHooks_OnStrikeNpc(NpcStrikeEventArgs e)
private void NpcHooks_OnStrikeNpc(NpcStrikeEventArgs e)
{
if (ConfigurationManager.infiniteInvasion)
{
@ -102,7 +93,6 @@ 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 (id == 0x1e && ConfigurationManager.permaPvp)
@ -112,7 +102,6 @@ namespace TShockAPI
}
void GetData(GetDataEventArgs e)
private void GetData(GetDataEventArgs e)
{
if (Main.netMode != 2) { return; }
if (e.MsgID == 17)
@ -141,7 +130,6 @@ namespace TShockAPI
}
void OnGreetPlayer(int who, HandledEventArgs e)
private void OnGreetPlayer(int who, HandledEventArgs e)
{
if (Main.netMode != 2) { return; }
int plr = who; //legacy support
@ -164,13 +152,10 @@ namespace TShockAPI
}
void OnChat(int ply, string msg, HandledEventArgs handler)
private void OnChat(int ply, string msg, HandledEventArgs handler)
{
if (Main.netMode != 2) { return; }
int x = (int)Main.player[ply].position.X;
int y = (int)Main.player[ply].position.Y;
int x = (int)Main.player[ply].position.X;
int y = (int)Main.player[ply].position.Y;
if (Tools.IsAdmin(ply))
{
@ -344,9 +329,7 @@ namespace TShockAPI
}
}
void OnJoin(int ply, AllowEventArgs handler)
private void OnJoin(int ply, AllowEventArgs handler)
{
if (Main.netMode != 2) { return; }
string ip = Tools.GetRealIP((Convert.ToString(Netplay.serverSock[ply].tcpClient.Client.RemoteEndPoint)));
@ -361,24 +344,19 @@ 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();
}
void OnPostInit()
private void OnPostInit()
{
}
void OnUpdate(GameTime time)
private void OnUpdate(GameTime time)
{
if (Main.netMode != 2) { return; }
for (uint i = 0; i < Main.maxPlayers; i++)
@ -435,7 +413,6 @@ namespace TShockAPI
}
}
public static void Teleport(int ply, int x, int y)
{
Main.player[ply].velocity = new Vector2(0, 0);
@ -445,7 +422,6 @@ namespace TShockAPI
NetMessage.SendData(0x0d, -1, -1, "", ply);
}
public static void Teleport(int ply, float x, float y)
{
Main.player[ply].position.X = x;
@ -511,7 +487,6 @@ namespace TShockAPI
Tools.Broadcast(ConfigurationManager.killCount + " copies of Call of Duty smashed.");
break;
}
}
}
}