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

Removed setspawn, it should not be a config option!

Browse source
This commit is contained in:
high 2011-06-25 20:10:52 -04:00
parent ed0ad7e751
commit 7a62674ba3
4 changed files with 0 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

19
TShockAPI/Commands.cs
View file

@ -130,8 +130,6 @@ namespace TShockAPI
ChatCommands.Add(new Command("save", "cfg", Save)); ChatCommands.Add(new Command("save", "cfg", Save));
ChatCommands.Add(new Command("maxspawns", "cfg", MaxSpawns)); ChatCommands.Add(new Command("maxspawns", "cfg", MaxSpawns));
ChatCommands.Add(new Command("spawnrate", "cfg", SpawnRate)); ChatCommands.Add(new Command("spawnrate", "cfg", SpawnRate));
ChatCommands.Add(new Command("setspawn", "cfg", SetSpawn));
ChatCommands.Add(new Command("savespawn", "cfg", SaveSpawn));
ChatCommands.Add(new Command("time", "time", Time)); ChatCommands.Add(new Command("time", "time", Time));
ChatCommands.Add(new Command("slap", "pvpfun", Slap)); ChatCommands.Add(new Command("slap", "pvpfun", Slap));
ChatCommands.Add(new Command("antibuild", "editspawn", ToggleAntiBuild)); ChatCommands.Add(new Command("antibuild", "editspawn", ToggleAntiBuild));
@ -871,23 +869,6 @@ namespace TShockAPI
#region Server Config Commands #region Server Config Commands
private static void SetSpawn(CommandArgs args)
{
ConfigurationManager.SpawnTileX = args.Player.TileX;
ConfigurationManager.SpawnTileY = args.Player.TileY + 3;
ConfigurationManager.Spawn_WorldID = Main.worldID;
ConfigurationManager.WriteJsonConfiguration();
args.Player.SendMessage("Set server spawn point to your position");
}
private static void SaveSpawn(CommandArgs args)
{
Main.spawnTileX = ConfigurationManager.SpawnTileX;
Main.spawnTileY = ConfigurationManager.SpawnTileY;
WorldGen.saveWorld();
args.Player.SendMessage("Saved current spawn point to file.");
}
private static void DebugConfiguration(CommandArgs args) private static void DebugConfiguration(CommandArgs args)
{ {
args.Player.SendMessage("TShock Config:"); args.Player.SendMessage("TShock Config:");

6
TShockAPI/ConfigFile.cs
View file

@ -52,12 +52,6 @@ namespace TShockAPI
public int BackupInterval = 0; public int BackupInterval = 0;
public int BackupKeepFor = 60; public int BackupKeepFor = 60;
public bool ListServer = false;
public int SpawnTileX;
public int SpawnTileY;
public int Spawn_WorldID;
public bool RememberLeavePos = false; public bool RememberLeavePos = false;
public bool HardcoreOnly = false; public bool HardcoreOnly = false;

21
TShockAPI/ConfigurationManager.cs
View file

@ -72,17 +72,6 @@ namespace TShockAPI
/// </summary> /// </summary>
public static int BackupKeepFor = 60; public static int BackupKeepFor = 60;
/// <summary>
/// Server will broadcast itself to the server list.
/// </summary>
public static bool ListServer = false;
public static int Spawn_WorldID;
public static int OriginalSpawnX;
public static int OriginalSpawnY;
public static int SpawnTileX;
public static int SpawnTileY;
public static bool HardcoreOnly = false; public static bool HardcoreOnly = false;
public static bool KickOnHardcoreDeath = false; public static bool KickOnHardcoreDeath = false;
public static bool BanOnHardcoreDeath = false; public static bool BanOnHardcoreDeath = false;
@ -126,12 +115,6 @@ namespace TShockAPI
PvpThrottle = cfg.PvpThrottle; PvpThrottle = cfg.PvpThrottle;
BackupInterval = cfg.BackupInterval; BackupInterval = cfg.BackupInterval;
BackupKeepFor = cfg.BackupKeepFor; BackupKeepFor = cfg.BackupKeepFor;
ListServer = cfg.ListServer;
OriginalSpawnX = Main.spawnTileX;
OriginalSpawnY = Main.spawnTileY;
SpawnTileX = cfg.SpawnTileX;
SpawnTileY = cfg.SpawnTileY;
Spawn_WorldID = cfg.Spawn_WorldID;
RememberLeavePos = cfg.RememberLeavePos; RememberLeavePos = cfg.RememberLeavePos;
HardcoreOnly = cfg.HardcoreOnly; HardcoreOnly = cfg.HardcoreOnly;
KickOnHardcoreDeath = cfg.KickOnHardcoreOnlyDeath; KickOnHardcoreDeath = cfg.KickOnHardcoreOnlyDeath;
@ -170,11 +153,7 @@ namespace TShockAPI
cfg.PvpThrottle = PvpThrottle; cfg.PvpThrottle = PvpThrottle;
cfg.BackupInterval = BackupInterval; cfg.BackupInterval = BackupInterval;
cfg.BackupKeepFor = BackupKeepFor; cfg.BackupKeepFor = BackupKeepFor;
cfg.ListServer = ListServer;
cfg.SpawnTileX = SpawnTileX;
cfg.SpawnTileY = SpawnTileY;
cfg.RememberLeavePos = RememberLeavePos; cfg.RememberLeavePos = RememberLeavePos;
cfg.Spawn_WorldID = Spawn_WorldID;
cfg.HardcoreOnly = HardcoreOnly; cfg.HardcoreOnly = HardcoreOnly;
cfg.BanOnHardcoreOnlyDeath = BanOnHardcoreDeath; cfg.BanOnHardcoreOnlyDeath = BanOnHardcoreDeath;
cfg.KickOnHardcoreOnlyDeath = KickOnHardcoreDeath; cfg.KickOnHardcoreOnlyDeath = KickOnHardcoreDeath;

9
TShockAPI/TShock.cs
View file

@ -231,15 +231,6 @@ namespace TShockAPI
} }
} }
} }
var id = Main.worldID;
if (ConfigurationManager.Spawn_WorldID != Main.worldID)
{
Main.spawnTileX = ConfigurationManager.OriginalSpawnX;
Main.spawnTileY = ConfigurationManager.OriginalSpawnY;
ConfigurationManager.SpawnTileX = Main.spawnTileX;
ConfigurationManager.SpawnTileY = Main.spawnTileY;
ConfigurationManager.Spawn_WorldID = Main.worldID;
}
} }
private void OnJoin(int ply, HandledEventArgs handler) private void OnJoin(int ply, HandledEventArgs handler)