tale
/
ProjectAres
mirror of https://github.com/OvercastNetwork/ProjectAres.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix OP axes for tools mutation

This commit is contained in:
ShinyDialga 2018-06-11 22:33:08 -05:00
parent 06fd77595f
commit 7f26cf911f
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PGM/src/main/java/tc/oc/pgm/mutation/types/kit/ToolsMutation.java
View File

@ -2,6 +2,7 @@ package tc.oc.pgm.mutation.types.kit;
import org.bukkit.Material;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.inventory.EquipmentSlot;
import org.bukkit.inventory.ItemStack;
import tc.oc.commons.bukkit.inventory.Slot;
import tc.oc.commons.bukkit.item.ItemBuilder;
@ -22,7 +23,7 @@ public class ToolsMutation extends KitMutation{
final static FreeItemKit[] TOOLS = new FreeItemKit[] {
new FreeItemKit(new ItemBuilder(item(Material.DIAMOND_PICKAXE)).enchant(Enchantment.DIG_SPEED, 3).name("Quick Pick").unbreakable(true).get()),
new FreeItemKit(new ItemBuilder(item(Material.DIAMOND_AXE)).enchant(Enchantment.DIG_SPEED, 3).name("Quick Axe").unbreakable(true).get()),
new FreeItemKit(new ItemBuilder(item(Material.DIAMOND_AXE)).enchant(Enchantment.DIG_SPEED, 3).name("Quick Axe").unbreakable(true).attackDamage(5, EquipmentSlot.HAND).attackSpeed(-2.5, EquipmentSlot.HAND).get()),
new FreeItemKit(new ItemBuilder(item(Material.DIAMOND_SPADE)).enchant(Enchantment.DIG_SPEED, 3).name("Quick Shovel").unbreakable(true).get()),
new FreeItemKit(new ItemBuilder(item(Material.SHEARS)).enchant(Enchantment.DIG_SPEED, 3).name("Quick Shears").unbreakable(true).get()),
new FreeItemKit(new ItemBuilder(item(Material.GLASS)).amount(64).get())

20
Util/bukkit/src/main/java/tc/oc/commons/bukkit/item/ItemBuilder.java
View File

@ -145,8 +145,24 @@ public class ItemBuilder<S extends ItemBuilder<?>> {
public S armor(double amount, EquipmentSlot slot) {
meta().addAttributeModifier(Attribute.GENERIC_ARMOR,
new ItemAttributeModifier(slot,
new AttributeModifier(Attribute.GENERIC_ARMOR.getName(),
amount, AttributeModifier.Operation.ADD_NUMBER)));
new AttributeModifier(Attribute.GENERIC_ARMOR.getName(),
amount, AttributeModifier.Operation.ADD_NUMBER)));
return self();
}
public S attackDamage(double amount, EquipmentSlot slot) {
meta().addAttributeModifier(Attribute.GENERIC_ATTACK_DAMAGE,
new ItemAttributeModifier(slot,
new AttributeModifier(Attribute.GENERIC_ATTACK_DAMAGE.getName(),
amount, AttributeModifier.Operation.ADD_NUMBER)));
return self();
}
public S attackSpeed(double amount, EquipmentSlot slot) {
meta().addAttributeModifier(Attribute.GENERIC_ATTACK_SPEED,
new ItemAttributeModifier(slot,
new AttributeModifier(Attribute.GENERIC_ATTACK_SPEED.getName(),
amount, AttributeModifier.Operation.ADD_NUMBER)));
return self();
}