Skip to content

Input sanitation for MorphCMD #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Input sanitation for MorphCMD #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
12a6f94
Input sanitation for MorphCMD
NahuLD Mar 18, 2024
39ae64f
Update to latest FancyNpcs and FancyLib
NahuLD Jun 10, 2024
5184a4d
Merge remote-tracking branch 'upstream/main'
NahuLD Feb 4, 2025
56af37f
Update to latest
NahuLD Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ tasks {
minecraftVersion(findProperty("minecraftVersion").toString())

downloadPlugins {
modrinth("FancyNpcs", "2.3.1")
modrinth("FancyNpcs", "2.4.1")
}
}

Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
minecraftVersion=1.21.1
fancyNpcsVersion=2.3.1
fancyLibVersion=33
minecraftVersion=1.21.4
fancyNpcsVersion=2.4.2
fancyLibVersion=35
15 changes: 13 additions & 2 deletions src/main/java/de/oliver/fancymorphs/commands/MorphCMD.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,15 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
return false;
}

// perhaps unmorph if no arguments are provided (?
if (args.length == 0) {
MessageHelper.error(sender, "Usage: /morph <entity-type>");
return false;
}

Npc morph = FancyMorphs.getInstance().getMorphManager().getNpc(p.getUniqueId());

String entityName = args[0];

if (entityName.equalsIgnoreCase("none") || entityName.equalsIgnoreCase("player")) {
if (morph == null) {
MessageHelper.error(p, "You are already unmorphed");
Expand All @@ -61,7 +66,13 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
}


EntityType type = EntityType.valueOf(entityName.toUpperCase());
final EntityType type;
try {
type = EntityType.valueOf(entityName.toUpperCase());
} catch (IllegalArgumentException ignored) {
MessageHelper.error(sender, "No entity type could be found for name: " + entityName);
return false;
}

if (!(p.hasPermission("fancymorphs.morph." + type.name().toLowerCase()) || p.hasPermission("fancymorphs.morph.*"))) {
MessageHelper.error(p, "You don't have permission to morph as this entity type.");
Expand Down