sigonasr2/TwosideKeeper
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix Custom arrows not being picked up properly.

Browse Source
This commit is contained in:
sigonasr2 2016-08-31 23:03:21 -05:00
parent 1e90b76a98
commit 9e5b9b68f2
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
TwosideKeeper.jar
View File

Binary file not shown.

2
src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java
View File

@ -2960,7 +2960,7 @@ public class GenericFunctions {
player.playSound(player.getLocation(), Sound.ENTITY_ZOMBIE_VILLAGER_CURE, 1.0f, 1.0f); player.playSound(player.getLocation(), Sound.ENTITY_ZOMBIE_VILLAGER_CURE, 1.0f, 1.0f);
addIFrame(player,40); addIFrame(player,40);
GenericFunctions.logAndRemovePotionEffectFromPlayer(PotionEffectType.REGENERATION,player); 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); aPlugin.API.sendCooldownPacket(player, player.getEquipment().getItemInMainHand(), TwosideKeeper.REJUVENATE_COOLDOWN);
} }
} }

9
src/sig/plugin/TwosideKeeper/Recipes.java
View File

@ -656,6 +656,15 @@ public class Recipes {
Bukkit.addRecipe(explosionarrow_recipe); 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) { public static ItemStack getArrowFromMeta(String string) {
switch (string) { switch (string) {
case "EXPLODE_ARR": { case "EXPLODE_ARR": {

3
src/sig/plugin/TwosideKeeper/TwosideKeeper.java
View File

@ -912,6 +912,7 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
sig.plugin.TwosideKeeper.Recipes.Initialize_Check_Recipe(); sig.plugin.TwosideKeeper.Recipes.Initialize_Check_Recipe();
//sig.plugin.TwosideKeeper.Recipes.Initialize_HunterCompass_Recipe(); //sig.plugin.TwosideKeeper.Recipes.Initialize_HunterCompass_Recipe();
sig.plugin.TwosideKeeper.Recipes.Initialize_CustomArrow_Recipes(); sig.plugin.TwosideKeeper.Recipes.Initialize_CustomArrow_Recipes();
sig.plugin.TwosideKeeper.Recipes.Initialize_NotchApple_Recipe();
//Bukkit.createWorld(new WorldCreator("ItemCube")); //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); pd.lastarrowwasinrangermode=(PlayerMode.isRanger(p)&&GenericFunctions.getBowMode(p.getEquipment().getItemInMainHand())==BowMode.SNIPE);
log("Arrow velocity is "+arr.getVelocity().lengthSquared(),5); log("Arrow velocity is "+arr.getVelocity().lengthSquared(),5);
arr.setCustomName("HIT"); arr.setCustomName("HIT");
} else }
if (arr.getCustomName()==null && (arr instanceof Arrow)) { if (arr.getCustomName()==null && (arr instanceof Arrow)) {
if (arr.getType()==EntityType.TIPPED_ARROW) { if (arr.getType()==EntityType.TIPPED_ARROW) {
//This might be special. Let's get the potion meta. //This might be special. Let's get the potion meta.