AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-24 05:03:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use safer method of changing same map in /restore.

Browse Source
This commit is contained in:
UnknownShadow200 2016-07-14 23:13:25 +10:00
parent 81735196ac
commit a6b78325bb
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Commands/World/CmdRestore.cs
View File

@ -58,23 +58,21 @@ namespace MCGalaxy.Commands {
static void DoRestore(Level lvl, string backup) {
File.Copy(LevelInfo.BackupPath(lvl.name, backup), LevelInfo.LevelPath(lvl.name), true);
Level temp = Level.Load(lvl.name);
temp.StartPhysics();
if (temp != null) {
lvl.spawnx = temp.spawnx;
lvl.spawny = temp.spawny;
lvl.spawnz = temp.spawnz;
lvl.Width = temp.Width; lvl.width = temp.Width;
lvl.Height = temp.Height; lvl.depth = temp.Height;
lvl.Length = temp.Length; lvl.length = temp.Length; lvl.height = temp.Length;
lvl.blocks = temp.blocks;
lvl.CustomBlocks = temp.CustomBlocks;
Level restore = Level.Load(lvl.name);
if (restore != null) {
LevelInfo.Loaded.Remove(lvl);
LevelInfo.Loaded.Add(restore);
restore.StartPhysics();
lvl.setPhysics(0);
lvl.ClearPhysics();
Command.all.Find("reveal").Use(null, "all " + lvl.name);
Player[] players = PlayerInfo.Online.Items;
foreach (Player pl in players) {
if (pl.level != lvl) continue;
pl.level = restore;
CmdReload.ReloadMap(null, pl, false);
}
} else {
Server.s.Log("Restore nulled");
File.Copy(LevelInfo.LevelPath(lvl.name) + ".backup", LevelInfo.LevelPath(lvl.name), true);

5
Levels/Level.Physics.cs
View File

@ -30,9 +30,8 @@ namespace MCGalaxy {
if (physics == 0 && newValue != 0 && blocks != null) {
for (int i = 0; i < blocks.Length; i++)
// Optimization hack, since no blocks under 183 ever need a restart
if (blocks[i] > 183)
if (Block.NeedRestart(blocks[i]))
AddCheck(i);
if (blocks[i] > 183 && Block.NeedRestart(blocks[i]))
AddCheck(i);
}
physics = newValue;
//StartPhysics(); This isnt needed, the physics will start when we set the new value above