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

fix physics blocks losing block permissions from recent commits

Browse Source
This commit is contained in:
UnknownShadow200 2017-09-24 09:07:42 +10:00
parent 48f3e1486d
commit 4328ff25e2
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
MCGalaxy/Blocks/BlockPerms.cs
View File

@ -52,7 +52,7 @@ namespace MCGalaxy.Blocks {
public static BlockPerms[] List = new BlockPerms[Block.Count]; public static BlockPerms[] List = new BlockPerms[Block.Count];
/// <summary> Returns whether the given rank can modify the given block. </summary> /// <summary> Returns whether the given rank can modify the given block. </summary>
public static bool UsableBy(Player p, byte block) { public static bool UsableBy(Player p, byte block) {
BlockPerms b = List[block]; BlockPerms b = List[block];
LevelPermission perm = p.Rank; LevelPermission perm = p.Rank;
@ -74,13 +74,13 @@ namespace MCGalaxy.Blocks {
int count = pl.hasCustomBlocks ? Block.CpeCount : Block.OriginalCount; int count = pl.hasCustomBlocks ? Block.CpeCount : Block.OriginalCount;
if (block < count) { if (block < count) {
bool usable = UsableBy(pl, block); bool usable = UsableBy(pl, block);
pl.Send(Packet.BlockPermission(block, pl.Send(Packet.BlockPermission(block,
usable && pl.level.CanPlace, usable && pl.level.CanPlace,
usable && pl.level.CanDelete)); usable && pl.level.CanDelete));
} }
} }
} }
public void MessageCannotUse(Player p, string action) { public void MessageCannotUse(Player p, string action) {
StringBuilder builder = new StringBuilder("Only "); StringBuilder builder = new StringBuilder("Only ");
Formatter.PrintRanks(MinRank, Allowed, Disallowed, builder); Formatter.PrintRanks(MinRank, Allowed, Disallowed, builder);
@ -125,7 +125,7 @@ namespace MCGalaxy.Blocks {
} }
/// <summary> Loads the list of all block permissions. </summary> /// <summary> Loads the list of all block permissions. </summary>
public static void Load() { public static void Load() {
SetDefaultPerms(); SetDefaultPerms();
@ -153,11 +153,14 @@ namespace MCGalaxy.Blocks {
//Name/ID : Lowest : Disallow : Allow //Name/ID : Lowest : Disallow : Allow
line.Replace(" ", "").FixedSplit(args, ':'); line.Replace(" ", "").FixedSplit(args, ':');
byte block = Block.Byte(args[0]); byte block;
if (!byte.TryParse(args[0], out block)) {
block = Block.Byte(args[0]);
}
if (block == Block.Invalid) continue; if (block == Block.Invalid) continue;
BlockPerms perms = new BlockPerms(); BlockPerms perms = new BlockPerms();
perms.BlockID = block; perms.BlockID = block;
try { try {
perms.MinRank = (LevelPermission)int.Parse(args[1]); perms.MinRank = (LevelPermission)int.Parse(args[1]);
string disallowRaw = args[2], allowRaw = args[3]; string disallowRaw = args[2], allowRaw = args[3];
@ -184,7 +187,7 @@ namespace MCGalaxy.Blocks {
List[block].MinRank = group.Permission; List[block].MinRank = group.Permission;
else else
throw new InvalidDataException("Line " + line + " is invalid."); throw new InvalidDataException("Line " + line + " is invalid.");
} catch { } catch {
Logger.Log(LogType.Warning, "Could not find the rank given on {0}. Using default", line); Logger.Log(LogType.Warning, "Could not find the rank given on {0}. Using default", line);
} }
} }