From 5a2fd19bcf9abcda6b087fa04ae76586532838c6 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Wed, 4 Jun 2014 16:13:20 +0100 Subject: Fix firework recipe in /recipe --- .../essentials/commands/Commandrecipe.java | 23 ++++++++++++++++------ 1 file 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 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 ingredients = recipe.getIngredientList(); - if (sender.isPlayer()) + if (showWindow) { final User user = ess.getUser(sender.getPlayer()); user.setRecipeSee(true); -- cgit v1.2.3