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

Core: Fix issue with all /gb becoming /lb after doing /server reload

Browse Source
This commit is contained in:
UnknownShadow200 2016-12-05 22:11:06 +11:00
parent 770d123b53
commit 5bb4b3269f
1 changed files with 58 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
MCGalaxy/Blocks/BlockDefinitions.cs
View File

@ -67,28 +67,6 @@ namespace MCGalaxy {
return def; return def;
} }
public static void LoadGlobal() {
GlobalDefs = Load(true, null);
GlobalDefs[0] = new BlockDefinition();
GlobalDefs[0].Name = "Air fallback";
GlobalProps = new BlockProps[256];
for (int i = 0; i < GlobalProps.Length; i++)
GlobalProps[i] = new BlockProps((byte)i);
try {
if (File.Exists(GlobalPath) && File.Exists(GlobalBackupPath)) {
File.Delete(GlobalBackupPath);
File.Copy(GlobalPath, GlobalBackupPath);
}
} catch (Exception ex) {
Server.ErrorLog(ex);
}
Save(true, null);
BlockProps.Load("global", BlockDefinition.GlobalProps);
}
internal static BlockDefinition[] Load(bool global, Level lvl) { internal static BlockDefinition[] Load(bool global, Level lvl) {
BlockDefinition[] defs = new BlockDefinition[256]; BlockDefinition[] defs = new BlockDefinition[256];
string path = global ? GlobalPath : "blockdefs/lvl_" + lvl.name + ".json"; string path = global ? GlobalPath : "blockdefs/lvl_" + lvl.name + ".json";
@ -135,6 +113,45 @@ namespace MCGalaxy {
File.WriteAllText(path, json); File.WriteAllText(path, json);
} }
public static void LoadGlobal() {
BlockDefinition[] oldDefs = GlobalDefs;
GlobalDefs = Load(true, null);
GlobalDefs[0] = new BlockDefinition();
GlobalDefs[0].Name = "Air fallback";
GlobalProps = new BlockProps[256];
for (int i = 0; i < GlobalProps.Length; i++)
GlobalProps[i] = new BlockProps((byte)i);
try {
if (File.Exists(GlobalPath) && File.Exists(GlobalBackupPath)) {
File.Delete(GlobalBackupPath);
File.Copy(GlobalPath, GlobalBackupPath);
}
} catch (Exception ex) {
Server.ErrorLog(ex);
}
Save(true, null);
BlockProps.Load("global", BlockDefinition.GlobalProps);
// As the BlockDefinition instances in levels will now be different
// to the instances in GlobalDefs, we need to update them.
if (oldDefs != null) UpdateLoadedLevels(oldDefs);
}
static void UpdateLoadedLevels(BlockDefinition[] oldGlobalDefs) {
Level[] loaded = LevelInfo.Loaded.Items;
foreach (Level lvl in loaded) {
for (int i = 0; i < lvl.CustomBlockDefs.Length; i++) {
if (lvl.CustomBlockDefs[i] != oldGlobalDefs[i]) continue;
lvl.CustomBlockDefs[i] = GlobalDefs[i];
lvl.CustomBlockProps[i] = GlobalProps[i];
}
}
}
public static void Add(BlockDefinition def, BlockDefinition[] defs, Level level) { public static void Add(BlockDefinition def, BlockDefinition[] defs, Level level) {
byte id = def.BlockID; byte id = def.BlockID;
bool global = defs == GlobalDefs; bool global = defs == GlobalDefs;
@ -162,7 +179,7 @@ namespace MCGalaxy {
SendDefineBlock(pl, def); SendDefineBlock(pl, def);
if (pl.HasCpeExt(CpeExt.BlockPermissions)) if (pl.HasCpeExt(CpeExt.BlockPermissions))
pl.Send(Packet.BlockPermission(def.BlockID, pl.level.CanPlace, pl.level.CanDelete)); pl.Send(Packet.BlockPermission(def.BlockID, pl.level.CanPlace, pl.level.CanDelete));
} }
Save(global, level); Save(global, level);
} }
@ -191,24 +208,6 @@ namespace MCGalaxy {
Save(global, level); Save(global, level);
} }
internal static void SendLevelCustomBlocks(Player pl) {
BlockDefinition[] defs = pl.level.CustomBlockDefs;
for (int i = 1; i < defs.Length; i++) {
BlockDefinition def = defs[i];
if (def == null) continue;
if (pl.HasCpeExt(CpeExt.BlockDefinitionsExt, 2) && def.Shape != 0) {
SendDefineBlockExt(pl, def, true);
} else if (pl.HasCpeExt(CpeExt.BlockDefinitionsExt) && def.Shape != 0) {
SendDefineBlockExt(pl, def, false);
} else {
SendDefineBlock(pl, def);
}
if (pl.HasCpeExt(CpeExt.BlockPermissions))
pl.Send(Packet.BlockPermission(def.BlockID, pl.level.CanPlace, pl.level.CanDelete));
}
}
public static byte GetBlock(string msg, Player p) { public static byte GetBlock(string msg, Player p) {
return GetBlock(msg, p.level.CustomBlockDefs); return GetBlock(msg, p.level.CustomBlockDefs);
} }
@ -228,6 +227,24 @@ namespace MCGalaxy {
} }
internal static void SendLevelCustomBlocks(Player pl) {
BlockDefinition[] defs = pl.level.CustomBlockDefs;
for (int i = 1; i < defs.Length; i++) {
BlockDefinition def = defs[i];
if (def == null) continue;
if (pl.HasCpeExt(CpeExt.BlockDefinitionsExt, 2) && def.Shape != 0) {
SendDefineBlockExt(pl, def, true);
} else if (pl.HasCpeExt(CpeExt.BlockDefinitionsExt) && def.Shape != 0) {
SendDefineBlockExt(pl, def, false);
} else {
SendDefineBlock(pl, def);
}
if (pl.HasCpeExt(CpeExt.BlockPermissions))
pl.Send(Packet.BlockPermission(def.BlockID, pl.level.CanPlace, pl.level.CanDelete));
}
}
static void SendDefineBlock(Player p, BlockDefinition def) { static void SendDefineBlock(Player p, BlockDefinition def) {
byte[] buffer = new byte[80]; byte[] buffer = new byte[80];
int index = 0; int index = 0;