Added MaxSlots (Kicks player if full)
This commit is contained in:
high
parent
1429595c5b
commit
73f17b0260
4 changed files with 835 additions and 824 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -1,30 +1,32 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
|
||||
namespace TShockAPI
|
||||
{
|
||||
class ConfigFile
|
||||
{
|
||||
public ConfigFile() { }
|
||||
public int InvasionMultiplier = 1;
|
||||
public int DefaultMaximumSpawns = 4;
|
||||
public int DefaultSpawnRate = 700;
|
||||
public int ServerPort = 7777;
|
||||
public bool EnableWhitelist = false;
|
||||
public bool InfiniteInvasion = false;
|
||||
public bool AlwaysPvP = false;
|
||||
public bool KickCheaters = true;
|
||||
public bool BanCheaters = true;
|
||||
public bool KickGriefers = true;
|
||||
public bool BanGriefers = true;
|
||||
public bool BanKillTileAbusers = false;
|
||||
public bool KickKillTileAbusers = false;
|
||||
public bool BanExplosives = true;
|
||||
public bool KickExplosives = true;
|
||||
public bool SpawnProtection = true;
|
||||
public int SpawnProtectionRadius = 5;
|
||||
public string DistributationAgent = "facepunch";
|
||||
}
|
||||
}
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
|
||||
namespace TShockAPI
|
||||
{
|
||||
class ConfigFile
|
||||
{
|
||||
public ConfigFile() { }
|
||||
|
||||
public int InvasionMultiplier = 1;
|
||||
public int DefaultMaximumSpawns = 4;
|
||||
public int DefaultSpawnRate = 700;
|
||||
public int ServerPort = 7777;
|
||||
public bool EnableWhitelist = false;
|
||||
public bool InfiniteInvasion = false;
|
||||
public bool AlwaysPvP = false;
|
||||
public bool KickCheaters = true;
|
||||
public bool BanCheaters = true;
|
||||
public bool KickGriefers = true;
|
||||
public bool BanGriefers = true;
|
||||
public bool BanKillTileAbusers = false;
|
||||
public bool KickKillTileAbusers = false;
|
||||
public bool BanExplosives = true;
|
||||
public bool KickExplosives = true;
|
||||
public bool SpawnProtection = true;
|
||||
public int SpawnProtectionRadius = 5;
|
||||
public string DistributationAgent = "facepunch";
|
||||
public int MaxSlots = 8;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,109 +1,112 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.IO;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
namespace TShockAPI
|
||||
{
|
||||
/// <summary>
|
||||
/// Provides all the stupid little variables a home away from home.
|
||||
/// </summary>
|
||||
class ConfigurationManager
|
||||
{
|
||||
public static int invasionMultiplier = 1;
|
||||
public static int defaultMaxSpawns = 4;
|
||||
public static int defaultSpawnRate = 700;
|
||||
public static int serverPort = 7777;
|
||||
public static bool enableWhitelist = false;
|
||||
public static bool infiniteInvasion = false;
|
||||
public static bool permaPvp = false;
|
||||
public static int killCount = 0;
|
||||
public static bool startedInvasion = false;
|
||||
public static bool kickCheater = true;
|
||||
public static bool banCheater = true;
|
||||
public static bool kickGriefer = true;
|
||||
public static bool banGriefer = true;
|
||||
public static bool banTnt = false;
|
||||
public static bool kickTnt = false;
|
||||
public static bool banBoom = true;
|
||||
public static bool kickBoom = true;
|
||||
public static bool spawnProtect = true;
|
||||
public static int spawnProtectRadius = 5;
|
||||
public static string distributationAgent = "facepunch";
|
||||
public static int authToken = 0;
|
||||
|
||||
public enum NPCList : int
|
||||
{
|
||||
WORLD_EATER = 0,
|
||||
EYE = 1,
|
||||
SKELETRON = 2
|
||||
}
|
||||
|
||||
public static void ReadJsonConfiguration()
|
||||
{
|
||||
TextReader tr = new StreamReader(FileTools.SaveDir + "config.json");
|
||||
ConfigFile cfg = JsonConvert.DeserializeObject<ConfigFile>(tr.ReadToEnd());
|
||||
tr.Close();
|
||||
|
||||
invasionMultiplier = cfg.InvasionMultiplier;
|
||||
defaultMaxSpawns = cfg.DefaultMaximumSpawns;
|
||||
defaultSpawnRate = cfg.DefaultSpawnRate;
|
||||
serverPort = cfg.ServerPort;
|
||||
enableWhitelist = cfg.EnableWhitelist;
|
||||
infiniteInvasion = cfg.InfiniteInvasion;
|
||||
permaPvp = cfg.AlwaysPvP;
|
||||
kickCheater = cfg.KickCheaters;
|
||||
banCheater = cfg.BanCheaters;
|
||||
kickGriefer = cfg.KickGriefers;
|
||||
banGriefer = cfg.BanGriefers;
|
||||
banTnt = cfg.BanKillTileAbusers;
|
||||
kickTnt = cfg.KickKillTileAbusers;
|
||||
banBoom = cfg.BanExplosives;
|
||||
kickBoom = cfg.KickExplosives;
|
||||
spawnProtect = cfg.SpawnProtection;
|
||||
spawnProtectRadius = cfg.SpawnProtectionRadius;
|
||||
distributationAgent = cfg.DistributationAgent;
|
||||
Terraria.NPC.maxSpawns = defaultMaxSpawns;
|
||||
Terraria.NPC.defaultSpawnRate = defaultSpawnRate;
|
||||
}
|
||||
|
||||
public static void WriteJsonConfiguration()
|
||||
{
|
||||
if (!System.IO.Directory.Exists(FileTools.SaveDir))
|
||||
{
|
||||
System.IO.Directory.CreateDirectory(FileTools.SaveDir);
|
||||
}
|
||||
if (System.IO.File.Exists(FileTools.SaveDir + "config.json"))
|
||||
{
|
||||
return;
|
||||
}
|
||||
else
|
||||
FileTools.CreateFile(FileTools.SaveDir + "config.json");
|
||||
ConfigFile cfg = new ConfigFile();
|
||||
cfg.InvasionMultiplier = 50;
|
||||
cfg.DefaultMaximumSpawns = 4;
|
||||
cfg.DefaultSpawnRate = 700;
|
||||
cfg.ServerPort = 7777;
|
||||
cfg.EnableWhitelist = false;
|
||||
cfg.InfiniteInvasion = false;
|
||||
cfg.AlwaysPvP = false;
|
||||
cfg.KickCheaters = kickCheater;
|
||||
cfg.BanCheaters = banCheater;
|
||||
cfg.KickGriefers = kickGriefer;
|
||||
cfg.BanGriefers = banGriefer;
|
||||
cfg.BanKillTileAbusers = true;
|
||||
cfg.KickKillTileAbusers = true;
|
||||
cfg.BanExplosives = true;
|
||||
cfg.KickExplosives = true;
|
||||
cfg.SpawnProtection = true;
|
||||
cfg.SpawnProtectionRadius = 5;
|
||||
|
||||
string json = JsonConvert.SerializeObject(cfg, Formatting.Indented);
|
||||
TextWriter tr = new StreamWriter(FileTools.SaveDir + "config.json");
|
||||
tr.Write(json);
|
||||
tr.Close();
|
||||
}
|
||||
}
|
||||
}
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
namespace TShockAPI
|
||||
{
|
||||
/// <summary>
|
||||
/// Provides all the stupid little variables a home away from home.
|
||||
/// </summary>
|
||||
class ConfigurationManager
|
||||
{
|
||||
public static int invasionMultiplier = 1;
|
||||
public static int defaultMaxSpawns = 4;
|
||||
public static int defaultSpawnRate = 700;
|
||||
public static int serverPort = 7777;
|
||||
public static bool enableWhitelist = false;
|
||||
public static bool infiniteInvasion = false;
|
||||
public static bool permaPvp = false;
|
||||
public static int killCount = 0;
|
||||
public static bool startedInvasion = false;
|
||||
public static bool kickCheater = true;
|
||||
public static bool banCheater = true;
|
||||
public static bool kickGriefer = true;
|
||||
public static bool banGriefer = true;
|
||||
public static bool banTnt = false;
|
||||
public static bool kickTnt = false;
|
||||
public static bool banBoom = true;
|
||||
public static bool kickBoom = true;
|
||||
public static bool spawnProtect = true;
|
||||
public static int spawnProtectRadius = 5;
|
||||
public static string distributationAgent = "facepunch";
|
||||
public static int authToken = 0;
|
||||
public static int maxSlots = 8;
|
||||
|
||||
public enum NPCList : int
|
||||
{
|
||||
WORLD_EATER = 0,
|
||||
EYE = 1,
|
||||
SKELETRON = 2
|
||||
}
|
||||
|
||||
public static void ReadJsonConfiguration()
|
||||
{
|
||||
TextReader tr = new StreamReader(FileTools.SaveDir + "config.json");
|
||||
ConfigFile cfg = JsonConvert.DeserializeObject<ConfigFile>(tr.ReadToEnd());
|
||||
tr.Close();
|
||||
|
||||
invasionMultiplier = cfg.InvasionMultiplier;
|
||||
defaultMaxSpawns = cfg.DefaultMaximumSpawns;
|
||||
defaultSpawnRate = cfg.DefaultSpawnRate;
|
||||
serverPort = cfg.ServerPort;
|
||||
enableWhitelist = cfg.EnableWhitelist;
|
||||
infiniteInvasion = cfg.InfiniteInvasion;
|
||||
permaPvp = cfg.AlwaysPvP;
|
||||
kickCheater = cfg.KickCheaters;
|
||||
banCheater = cfg.BanCheaters;
|
||||
kickGriefer = cfg.KickGriefers;
|
||||
banGriefer = cfg.BanGriefers;
|
||||
banTnt = cfg.BanKillTileAbusers;
|
||||
kickTnt = cfg.KickKillTileAbusers;
|
||||
banBoom = cfg.BanExplosives;
|
||||
kickBoom = cfg.KickExplosives;
|
||||
spawnProtect = cfg.SpawnProtection;
|
||||
spawnProtectRadius = cfg.SpawnProtectionRadius;
|
||||
distributationAgent = cfg.DistributationAgent;
|
||||
maxSlots = cfg.MaxSlots;
|
||||
Terraria.NPC.maxSpawns = defaultMaxSpawns;
|
||||
Terraria.NPC.defaultSpawnRate = defaultSpawnRate;
|
||||
}
|
||||
|
||||
public static void WriteJsonConfiguration()
|
||||
{
|
||||
if (!System.IO.Directory.Exists(FileTools.SaveDir))
|
||||
{
|
||||
System.IO.Directory.CreateDirectory(FileTools.SaveDir);
|
||||
}
|
||||
if (System.IO.File.Exists(FileTools.SaveDir + "config.json"))
|
||||
{
|
||||
return;
|
||||
}
|
||||
else
|
||||
FileTools.CreateFile(FileTools.SaveDir + "config.json");
|
||||
ConfigFile cfg = new ConfigFile();
|
||||
cfg.InvasionMultiplier = 50;
|
||||
cfg.DefaultMaximumSpawns = 4;
|
||||
cfg.DefaultSpawnRate = 700;
|
||||
cfg.ServerPort = 7777;
|
||||
cfg.EnableWhitelist = false;
|
||||
cfg.InfiniteInvasion = false;
|
||||
cfg.AlwaysPvP = false;
|
||||
cfg.KickCheaters = kickCheater;
|
||||
cfg.BanCheaters = banCheater;
|
||||
cfg.KickGriefers = kickGriefer;
|
||||
cfg.BanGriefers = banGriefer;
|
||||
cfg.BanKillTileAbusers = true;
|
||||
cfg.KickKillTileAbusers = true;
|
||||
cfg.BanExplosives = true;
|
||||
cfg.KickExplosives = true;
|
||||
cfg.SpawnProtection = true;
|
||||
cfg.SpawnProtectionRadius = 5;
|
||||
cfg.MaxSlots = maxSlots;
|
||||
|
||||
string json = JsonConvert.SerializeObject(cfg, Formatting.Indented);
|
||||
TextWriter tr = new StreamWriter(FileTools.SaveDir + "config.json");
|
||||
tr.Write(json);
|
||||
tr.Close();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -443,6 +443,17 @@ namespace TShockAPI
|
|||
void OnJoin(int ply, AllowEventArgs handler)
|
||||
{
|
||||
if (Main.netMode != 2) { return; }
|
||||
|
||||
int count = 1;
|
||||
for (int i = 0; i < Main.player.Length; i++)
|
||||
count += Main.player[i].active ? 1 : 0;
|
||||
|
||||
if (count > ConfigurationManager.maxSlots)
|
||||
{
|
||||
Tools.Kick(ply, "Server is full");
|
||||
return;
|
||||
}
|
||||
|
||||
string ip = Tools.GetRealIP((Convert.ToString(Netplay.serverSock[ply].tcpClient.Client.RemoteEndPoint)));
|
||||
if (FileTools.CheckBanned(ip))
|
||||
{
|
||||
|
|
@ -674,12 +685,6 @@ namespace TShockAPI
|
|||
NetMessage.SendData(44, i, -1, "", plr, (float)1, (float)9999999, (float)0);
|
||||
}
|
||||
|
||||
public static void SendDataAll(int type, int ignore = -1, string text = "", int num = 0, float f1 = 0f, float f2 = 0f, float f3 = 0f)
|
||||
{
|
||||
for (int i = 0; i < Main.player.Length; i++)
|
||||
NetMessage.SendData(type, i, ignore, text, num, f1, f2, f3);
|
||||
}
|
||||
|
||||
//TODO : Notify the player if there is more than one match. (or do we want a First() kinda thing?)
|
||||
public static int GetNPCID(string name, bool exact = false)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue