TotalFreedomMC/TF-LibsDisguises
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-LibsDisguises.git synced 2025-02-05 06:12:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge https://github.com/libraryaddict/LibsDisguises

Browse source
This commit is contained in:
Telesphoreo 2022-04-14 17:23:49 -05:00
commit da078f026a
3 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDDebugPlayer.java
View file

@ -95,7 +95,7 @@ public class LDDebugPlayer implements LDCommand {
@Override
public void onCommand(CommandSender sender, String[] args) {
if (!(sender instanceof Player)) {
LibsMsg.NO_PERM.send(sender);
LibsMsg.NO_CONSOLE.send(sender);
}
LibsDisguises.getInstance().getListener().addInteraction(sender.getName(), new DebugInteraction(), 60);

1
plugin/src/main/java/me/libraryaddict/disguise/utilities/parser/DisguiseParser.java
View file

@ -733,7 +733,6 @@ public class DisguiseParser {
toSkip++;
}
} else if (disguisePerm.isMob()) { // Its a mob, use the mob constructor
if (args.length > 1) {
boolean adult = true;

18
plugin/src/main/java/me/libraryaddict/disguise/utilities/parser/DisguisePermissions.java
View file

@ -151,7 +151,7 @@ public class DisguisePermissions {
// If this refers to a specific disguise
if (dPerm != null) {
return new ParsedPermission(new DisguisePerm[]{dPerm}, options, (byte) 0, split[1].equals("*"));
return new ParsedPermission(new DisguisePerm[]{dPerm}, options, (byte) (options.containsKey("*") ? 1 : 0), split[1].equals("*"));
}
// If the disguise can't be found, it may be refering to a range
@ -403,34 +403,34 @@ public class DisguisePermissions {
if (permissionName.equals("ageable")) {
if (Ageable.class.isAssignableFrom(disguiseType.getEntityClass())) {
return 1;
return 2;
}
} else if (permissionName.equals("monster") || permissionName.equals("monsters")) {
if (Monster.class.isAssignableFrom(disguiseType.getEntityClass())) {
return 2;
return 3;
}
} else if (permissionName.equals("animal") || permissionName.equals("animals")) {
if (Animals.class.isAssignableFrom(disguiseType.getEntityClass())) {
return 2;
return 3;
}
} else if (permissionName.equals("mob")) {
if (disguiseType.isMob()) {
return 3;
return 4;
}
} else if (permissionName.equals("misc")) {
if (disguiseType.isMisc()) {
return 3;
return 4;
}
} else if (permissionName.equals("custom")) {
if (disguisePerm.isCustomDisguise()) {
return 3;
return 4;
}
} else if (permissionName.equals("vanilla")) {
if (!disguisePerm.isCustomDisguise()) {
return 4;
return 5;
}
} else if (permissionName.equals("*")) {
return 5;
return 6;
}
return -1;