diff options
author | KHobbits <rob@khobbits.co.uk> | 2014-06-04 16:13:20 +0100 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2014-06-04 16:13:20 +0100 |
commit | 8b8e6cbbe33d57fb54048b92191d2d4a0a6e0a56 (patch) | |
tree | d000aa3d4086e70941aaadbaf61f37b43efb7abb | |
parent | e0a1c3319b2bae7f73ae600f7621dc1dd5d43cd2 (diff) | |
download | Essentials-8b8e6cbbe33d57fb54048b92191d2d4a0a6e0a56.tar Essentials-8b8e6cbbe33d57fb54048b92191d2d4a0a6e0a56.tar.gz Essentials-8b8e6cbbe33d57fb54048b92191d2d4a0a6e0a56.tar.lz Essentials-8b8e6cbbe33d57fb54048b92191d2d4a0a6e0a56.tar.xz Essentials-8b8e6cbbe33d57fb54048b92191d2d4a0a6e0a56.zip |
Fix firework recipe in /recipe
-rwxr-xr-x | Essentials/src/com/earth2me/essentials/commands/Commandrecipe.java | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandrecipe.java b/Essentials/src/com/earth2me/essentials/commands/Commandrecipe.java index 3c2a69fa0..ec4fa896f 100755 --- a/Essentials/src/com/earth2me/essentials/commands/Commandrecipe.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandrecipe.java @@ -63,11 +63,22 @@ public class Commandrecipe extends EssentialsCommand }
else if (selectedRecipe instanceof ShapedRecipe)
{
- shapedRecipe(sender, (ShapedRecipe)selectedRecipe);
+ shapedRecipe(sender, (ShapedRecipe)selectedRecipe, sender.isPlayer());
}
else if (selectedRecipe instanceof ShapelessRecipe)
{
- shapelessRecipe(sender, (ShapelessRecipe)selectedRecipe);
+ if (recipesOfType.size() == 1 && itemType.getType() == Material.FIREWORK)
+ {
+ ShapelessRecipe shapelessRecipe = new ShapelessRecipe(itemType);
+ shapelessRecipe.addIngredient(Material.SULPHUR);
+ shapelessRecipe.addIngredient(Material.PAPER);
+ shapelessRecipe.addIngredient(Material.FIREWORK_CHARGE);
+ shapelessRecipe(sender, shapelessRecipe, sender.isPlayer());
+ }
+ else
+ {
+ shapelessRecipe(sender, (ShapelessRecipe)selectedRecipe, sender.isPlayer());
+ }
}
if (recipesOfType.size() > 1 && args.length == 1)
@@ -81,11 +92,11 @@ public class Commandrecipe extends EssentialsCommand sender.sendMessage(tl("recipeFurnace", getMaterialName(recipe.getInput())));
}
- public void shapedRecipe(final CommandSource sender, final ShapedRecipe recipe)
+ public void shapedRecipe(final CommandSource sender, final ShapedRecipe recipe, final boolean showWindow)
{
final Map<Character, ItemStack> recipeMap = recipe.getIngredientMap();
- if (sender.isPlayer())
+ if (showWindow)
{
final User user = ess.getUser(sender.getPlayer());
user.getBase().closeInventory();
@@ -141,10 +152,10 @@ public class Commandrecipe extends EssentialsCommand }
}
- public void shapelessRecipe(final CommandSource sender, final ShapelessRecipe recipe)
+ public void shapelessRecipe(final CommandSource sender, final ShapelessRecipe recipe, final boolean showWindow)
{
final List<ItemStack> ingredients = recipe.getIngredientList();
- if (sender.isPlayer())
+ if (showWindow)
{
final User user = ess.getUser(sender.getPlayer());
user.setRecipeSee(true);
|