diff --git a/TwosideKeeper.jar b/TwosideKeeper.jar index 67226f4..faae6d3 100644 Binary files a/TwosideKeeper.jar and b/TwosideKeeper.jar differ diff --git a/src/sig/plugin/TwosideKeeper/AwakenedArtifact.java b/src/sig/plugin/TwosideKeeper/AwakenedArtifact.java index 9d43e2e..d1bd9a4 100644 --- a/src/sig/plugin/TwosideKeeper/AwakenedArtifact.java +++ b/src/sig/plugin/TwosideKeeper/AwakenedArtifact.java @@ -81,7 +81,7 @@ public class AwakenedArtifact { item = addAP(item,1); double potentialred = 10.0d; potentialred/=1+(ArtifactAbility.calculateValue(ArtifactAbility.PRESERVATION, artifact.getEnchantmentLevel(Enchantment.LUCK), ArtifactAbility.getEnchantmentLevel(ArtifactAbility.PRESERVATION, artifact))/100d); - TwosideKeeper.log("Potential reduction is reduced by "+(10-potentialred), 2); + TwosideKeeper.log("Potential reduction is reduced by "+(10-potentialred), 4); if (ArtifactAbility.containsEnchantment(ArtifactAbility.GREED, item)) { if (ArtifactAbility.getEnchantmentLevel(ArtifactAbility.GREED, item)>1) { item = ArtifactAbility.applyEnchantment(ArtifactAbility.GREED, ArtifactAbility.getEnchantmentLevel(ArtifactAbility.GREED, item)-1, item); diff --git a/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java b/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java index 26f125a..49e7165 100644 --- a/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java +++ b/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java @@ -1955,7 +1955,7 @@ public class GenericFunctions { + ChatColor.GRAY+"- Close Range Mode (Default): \n" + ChatColor.WHITE+" You gain the ability to deal headshots from any distance, even directly onto an enemy's face. (Old headshot behavior)\n" + ChatColor.GRAY+"- Sniping Mode: \n" - + ChatColor.WHITE+" Headshot collision area increases by x3. Headshots deal x4 damage, but you also have Slowness VI while in this mode.\n" + + ChatColor.WHITE+" Headshot collision area increases by x3. Headshots will deal an extra x0.25 damage for each headshot landed, up to a cap of 8 stacks. Each stack also increases your Slowness level by 1.\n" + ChatColor.GRAY+"- Debilitation Mode:\n" + ChatColor.WHITE+" Adds a stack of Poison when hitting non-poisoned targets (20 second duration). Hitting mobs in this mode refreshes the duration of the poison stacks. Headshots made in this mode will increase the level of Poison on the mob, making the mob more and more vulnerable.\n" ; diff --git a/src/sig/plugin/TwosideKeeper/TwosideKeeper.java b/src/sig/plugin/TwosideKeeper/TwosideKeeper.java index 038c98e..24fd1ca 100644 --- a/src/sig/plugin/TwosideKeeper/TwosideKeeper.java +++ b/src/sig/plugin/TwosideKeeper/TwosideKeeper.java @@ -998,7 +998,7 @@ public class TwosideKeeper extends JavaPlugin implements Listener { p.spigot().sendMessage(ArtifactAbility.GenerateMenu(ArtifactItemType.getArtifactItemTypeFromItemStack(p.getInventory().getArmorContents()[Integer.parseInt(args[1])-900]).getUpgradePath(), CalculateDamageReduction(1,p,p), p.getInventory().getArmorContents()[Integer.parseInt(args[1])-900],Integer.parseInt(args[1]))); } } else { - if (p.getEquipment().getItemInMainHand()!=null) { + if (p.getEquipment().getItemInMainHand()!=null && GenericFunctions.isArtifactEquip(p.getEquipment().getItemInMainHand())) { p.spigot().sendMessage(ArtifactAbility.GenerateMenu(ArtifactItemType.getArtifactItemTypeFromItemStack(p.getEquipment().getItemInMainHand()).getUpgradePath(), CalculateDamageReduction(1,p,p), p.getEquipment().getItemInMainHand())); } } @@ -4158,7 +4158,7 @@ public class TwosideKeeper extends JavaPlugin implements Listener { headshotvaly*=mult; headshotvalz*=mult; - log("Headshot hitbox size Multiplier: x"+mult,2); + log("Headshot hitbox size Multiplier: x"+mult,4); log(headshotvalx+","+headshotvaly+","+headshotvalz,5); if (ev.getDamager().getTicksLived()>=4 || GenericFunctions.isRanger(p)) { @@ -4175,7 +4175,7 @@ public class TwosideKeeper extends JavaPlugin implements Listener { for (int i1=0;i1