AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2024-11-26 17:05:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #90 from AtlasMediaGroup/FS-309

Browse Source 
2 bugfixes, one command (FS-309)
This commit is contained in:
Paldiu 2021-07-16 09:05:57 -05:00 committed by GitHub
commit 0caf972248
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/me/totalfreedom/totalfreedommod/command/Command_cage.java
View File

@ -77,13 +77,26 @@ public class Command_cage extends FreedomCommand
}
case "block":
{
if (Material.matchMaterial(args[2]) != null)
if (args.length >= 3)
{
outerMaterial = Material.matchMaterial(args[2]);
break;
// Checks the validity of the Material and checks if it's a block.
// This is incredibly inefficient, as Spigot's isBlock() method in Material is an actual
// nightmare of switch-cases.
if (Material.matchMaterial(args[2]) != null && Material.matchMaterial(args[2]).isBlock())
{
outerMaterial = Material.matchMaterial(args[2]);
break;
}
else
{
msg("Invalid block!", ChatColor.RED);
return true;
}
}
else
{
return false;
}
msg("Invalid block!", ChatColor.RED);
break;
}
default:
{