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

block.properties uses block IDs now. Fixes block permissions being lost if a core block was made a global block, then renamed.

Browse Source
This commit is contained in:
UnknownShadow200 2017-09-22 13:59:22 +10:00
parent c991671fe5
commit 33d9ca82a0
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
MCGalaxy/Blocks/BlockPerms.cs
View File

@ -106,18 +106,18 @@ namespace MCGalaxy.Blocks {
static void SaveCore(IEnumerable<BlockPerms> list) { static void SaveCore(IEnumerable<BlockPerms> list) {
using (StreamWriter w = new StreamWriter(Paths.BlockPermsFile)) { using (StreamWriter w = new StreamWriter(Paths.BlockPermsFile)) {
w.WriteLine("#Version 2"); w.WriteLine("#Version 2");
w.WriteLine("# This file list the ranks that can use each command."); w.WriteLine("# This file list the ranks that can use each block");
w.WriteLine("# Disallow and allow can be left empty."); w.WriteLine("# Disallow and allow can be left empty.");
w.WriteLine("# Works entirely on rank permission values, not rank names."); w.WriteLine("# Works entirely on rank permission values, not rank names.");
w.WriteLine("#"); w.WriteLine("#");
w.WriteLine("# Layout: CommandName : MinRank : Disallow : Allow"); w.WriteLine("# Layout: Block ID : MinRank : Disallow : Allow");
w.WriteLine("# lava : 60 : 80,67 : 40,41,55"); w.WriteLine("# lava : 60 : 80,67 : 40,41,55");
w.WriteLine(""); w.WriteLine("");
foreach (BlockPerms perms in list) { foreach (BlockPerms perms in list) {
if (Block.Name(perms.BlockID).CaselessEq("unknown")) continue; if (Block.Name(perms.BlockID).CaselessEq("unknown")) continue;
string line = Block.Name(perms.BlockID) + " : " + (int)perms.MinRank + " : " string line = perms.BlockID + " : " + (int)perms.MinRank + " : "
+ CommandPerms.JoinPerms(perms.Disallowed) + " : " + CommandPerms.JoinPerms(perms.Allowed); + CommandPerms.JoinPerms(perms.Disallowed) + " : " + CommandPerms.JoinPerms(perms.Allowed);
w.WriteLine(line); w.WriteLine(line);
} }
@ -150,12 +150,13 @@ namespace MCGalaxy.Blocks {
string[] args = new string[4]; string[] args = new string[4];
foreach (string line in lines) { foreach (string line in lines) {
if (line.Length == 0 || line[0] == '#') continue; if (line.Length == 0 || line[0] == '#') continue;
//Name : Lowest : Disallow : Allow //Name/ID : Lowest : Disallow : Allow
line.Replace(" ", "").FixedSplit(args, ':'); line.Replace(" ", "").FixedSplit(args, ':');
byte block = Block.Byte(args[0]);
if (block == Block.Invalid) continue;
BlockPerms perms = new BlockPerms(); BlockPerms perms = new BlockPerms();
if (Block.Byte(args[0]) == Block.Invalid) continue; perms.BlockID = block;
perms.BlockID = Block.Byte(args[0]);
try { try {
perms.MinRank = (LevelPermission)int.Parse(args[1]); perms.MinRank = (LevelPermission)int.Parse(args[1]);