diff --git a/TwosideKeeper.jar b/TwosideKeeper.jar index 116526b..4536ac6 100644 Binary files a/TwosideKeeper.jar and b/TwosideKeeper.jar differ diff --git a/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java b/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java index 6c6a57a..1ede5cf 100644 --- a/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java +++ b/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java @@ -2960,7 +2960,7 @@ public class GenericFunctions { player.playSound(player.getLocation(), Sound.ENTITY_ZOMBIE_VILLAGER_CURE, 1.0f, 1.0f); addIFrame(player,40); GenericFunctions.logAndRemovePotionEffectFromPlayer(PotionEffectType.REGENERATION,player); - GenericFunctions.logAndApplyPotionEffectToPlayer(PotionEffectType.REGENERATION,200,9,player); + GenericFunctions.logAndApplyPotionEffectToPlayer(PotionEffectType.REGENERATION,200,9,player,true); aPlugin.API.sendCooldownPacket(player, player.getEquipment().getItemInMainHand(), TwosideKeeper.REJUVENATE_COOLDOWN); } } diff --git a/src/sig/plugin/TwosideKeeper/Recipes.java b/src/sig/plugin/TwosideKeeper/Recipes.java index f74afdb..10317a2 100644 --- a/src/sig/plugin/TwosideKeeper/Recipes.java +++ b/src/sig/plugin/TwosideKeeper/Recipes.java @@ -655,7 +655,16 @@ public class Recipes { explosionarrow_recipe.addIngredient(Material.FEATHER); Bukkit.addRecipe(explosionarrow_recipe); } - + + @SuppressWarnings("deprecation") + public static void Initialize_NotchApple_Recipe() { + + ItemStack notchapple = new ItemStack(Material.GOLDEN_APPLE); + ShapelessRecipe notchapple_recipe = new ShapelessRecipe(new ItemStack(Material.GOLDEN_APPLE,1,(short)1)); + notchapple_recipe.addIngredient(8,Material.GOLD_BLOCK); + notchapple_recipe.addIngredient(Material.APPLE); + Bukkit.addRecipe(notchapple_recipe); + } public static ItemStack getArrowFromMeta(String string) { switch (string) { case "EXPLODE_ARR": { diff --git a/src/sig/plugin/TwosideKeeper/TwosideKeeper.java b/src/sig/plugin/TwosideKeeper/TwosideKeeper.java index da19e69..def2570 100644 --- a/src/sig/plugin/TwosideKeeper/TwosideKeeper.java +++ b/src/sig/plugin/TwosideKeeper/TwosideKeeper.java @@ -912,6 +912,7 @@ public class TwosideKeeper extends JavaPlugin implements Listener { sig.plugin.TwosideKeeper.Recipes.Initialize_Check_Recipe(); //sig.plugin.TwosideKeeper.Recipes.Initialize_HunterCompass_Recipe(); sig.plugin.TwosideKeeper.Recipes.Initialize_CustomArrow_Recipes(); + sig.plugin.TwosideKeeper.Recipes.Initialize_NotchApple_Recipe(); //Bukkit.createWorld(new WorldCreator("ItemCube")); @@ -5340,7 +5341,7 @@ public class TwosideKeeper extends JavaPlugin implements Listener { pd.lastarrowwasinrangermode=(PlayerMode.isRanger(p)&&GenericFunctions.getBowMode(p.getEquipment().getItemInMainHand())==BowMode.SNIPE); log("Arrow velocity is "+arr.getVelocity().lengthSquared(),5); arr.setCustomName("HIT"); - } else + } if (arr.getCustomName()==null && (arr instanceof Arrow)) { if (arr.getType()==EntityType.TIPPED_ARROW) { //This might be special. Let's get the potion meta.