Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
ricardoboss committed Mar 13, 2017
2 parents e98da78 + 6dd0879 commit 38c0ddc
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions src/main/java/de/mcmainiac/gmc/helpers/Permissions.java
Original file line number Diff line number Diff line change
Expand Up @@ -80,23 +80,23 @@ public static Perm fromString(String perm) {
case "gmonce": return GMONCE;
case "gmtemp": return GMTEMP;
case "gm": return GM;
case "gm_self": return GM_SELF;
case "gm_others": return GM_OTHERS;
case "gm.self": return GM_SELF;
case "gm.others": return GM_OTHERS;
case "gamemode": return GAMEMODE;
case "gamemode_self": return GAMEMODE_SELF;
case "gamemode_others": return GAMEMODE_OTHERS;
case "gamemode.self": return GAMEMODE_SELF;
case "gamemode.others": return GAMEMODE_OTHERS;
case "survival": return SURVIVAL;
case "survival_self": return SURVIVAL_SELF;
case "survival_others": return SURVIVAL_OTHERS;
case "survival.self": return SURVIVAL_SELF;
case "survival.others": return SURVIVAL_OTHERS;
case "creative": return CREATIVE;
case "creative_self": return CREATIVE_SELF;
case "creative_others": return CREATIVE_OTHERS;
case "creative.self": return CREATIVE_SELF;
case "creative.others": return CREATIVE_OTHERS;
case "adventure": return ADVENTURE;
case "adventure_self": return ADVENTURE_SELF;
case "adventure_others": return ADVENTURE_OTHERS;
case "adventure.self": return ADVENTURE_SELF;
case "adventure.others": return ADVENTURE_OTHERS;
case "spectator": return SPECTATOR;
case "spectator_self": return SPECTATOR_SELF;
case "spectator_others": return SPECTATOR_OTHERS;
case "spectator.self": return SPECTATOR_SELF;
case "spectator.others": return SPECTATOR_OTHERS;
default: return DEFAULT_OP;
}
}
Expand Down

0 comments on commit 38c0ddc

Please sign in to comment.