Skip to content

Shouldn't check length of Material #7121

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

Merged
merged 4 commits into from
Oct 1, 2024
Merged

Shouldn't check length of Material #7121

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fa40c4c
Update BukkitUnsafe.java : We shouldn't check length
0XPYEX0 Oct 1, 2024
d32821d
Merge branch 'dev/patch' into patch-1
0XPYEX0 Oct 1, 2024
e53485f
Merge branch 'dev/patch' into patch-1
UnderscoreTud Oct 1, 2024
ad04bb9
Merge branch 'dev/patch' into patch-1
APickledWalrus Oct 1, 2024
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
6 changes: 1 addition & 5 deletions src/main/java/ch/njol/skript/bukkitutil/BukkitUnsafe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,7 @@ public class BukkitUnsafe {

@Nullable
public static Material getMaterialFromMinecraftId(String id) {
// On 1.13, Vanilla and Spigot names are same
if (id.length() > 9)
return Material.matchMaterial(id.substring(10)); // Strip 'minecraft:' out
else // Malformed material name
return null;
return Material.matchMaterial(id);
}

public static void modifyItemStack(ItemStack stack, String arguments) {
Expand Down