1 files changed, 38 insertions, 20 deletions

diff --git a/Minecraft.World/WeaponItem.cpp b/Minecraft.World/WeaponItem.cpp
index 82b16bde..67b887af 100644
--- a/Minecraft.World/WeaponItem.cpp
+++ b/Minecraft.World/WeaponItem.cpp
@@ -1,49 +1,58 @@
 #include "stdafx.h"
 #include "net.minecraft.world.item.h"
 #include "net.minecraft.world.entity.h"
+#include "net.minecraft.world.entity.ai.attributes.h"
 #include "net.minecraft.world.entity.player.h"
+#include "net.minecraft.world.entity.monster.h"
 #include "net.minecraft.world.level.tile.h"
 #include "WeaponItem.h"
 
 WeaponItem::WeaponItem(int id, const Tier *tier) : Item(id), tier( tier )
 {
-    maxStackSize = 1;
-    setMaxDamage(tier->getUses());
+	maxStackSize = 1;
+	setMaxDamage(tier->getUses());
 
-    damage = 4 + tier->getAttackDamageBonus();
+	damage = 4 + tier->getAttackDamageBonus();
 }
 
-float WeaponItem::getDestroySpeed(shared_ptr<ItemInstance> itemInstance, Tile *tile)
+float WeaponItem::getTierDamage()
 {
-    if (tile->id == Tile::web_Id)
-	{
-        // swords can quickly cut web
-        return 15;
-    }
-    return 1.5f;
+	return tier->getAttackDamageBonus();
 }
 
-bool WeaponItem::hurtEnemy(shared_ptr<ItemInstance> itemInstance, shared_ptr<Mob> mob, shared_ptr<Mob> attacker) 
+float WeaponItem::getDestroySpeed(shared_ptr<ItemInstance> itemInstance, Tile *tile)
 {
-	itemInstance->hurt(1, attacker);
-    return true;
+	if (tile->id == Tile::web_Id)
+	{
+		// swords can quickly cut web
+		return 15;
+	}
+	// this change modifies which tiles the swords can destroy in creative
+	// mode (>1 == yes)
+	Material *material = tile->material;
+	if (material == Material::plant || material == Material::replaceable_plant || material == Material::coral || material == Material::leaves || material == Material::vegetable)
+	{
+		return 1.5f;
+	}
+	return 1.0f;
 }
 
-bool WeaponItem::mineBlock(shared_ptr<ItemInstance> itemInstance, Level *level, int tile, int x, int y, int z, shared_ptr<Mob> owner)
+bool WeaponItem::hurtEnemy(shared_ptr<ItemInstance> itemInstance, shared_ptr<LivingEntity> mob, shared_ptr<LivingEntity> attacker) 
 {
-	// Don't damage weapons if the tile can be destroyed in one hit.
-	if (Tile::tiles[tile]->getDestroySpeed(level, x, y, z) != 0.0) itemInstance->hurt(2, owner);
+	itemInstance->hurtAndBreak(1, attacker);
 	return true;
 }
 
-int WeaponItem::getAttackDamage(shared_ptr<Entity> entity)
+bool WeaponItem::mineBlock(shared_ptr<ItemInstance> itemInstance, Level *level, int tile, int x, int y, int z, shared_ptr<LivingEntity> owner)
 {
-    return damage;
+	// Don't damage weapons if the tile can be destroyed in one hit.
+	if (Tile::tiles[tile]->getDestroySpeed(level, x, y, z) != 0.0) itemInstance->hurtAndBreak(2, owner);
+	return true;
 }
 
 bool WeaponItem::isHandEquipped()
 {
-    return true;
+	return true;
 }
 
 UseAnim WeaponItem::getUseAnimation(shared_ptr<ItemInstance> itemInstance)
@@ -64,7 +73,7 @@ shared_ptr<ItemInstance> WeaponItem::use(shared_ptr<ItemInstance> instance, Leve
 
 bool WeaponItem::canDestroySpecial(Tile *tile)
 {
-    return tile->id == Tile::web_Id;
+	return tile->id == Tile::web_Id;
 }
 
 int WeaponItem::getEnchantmentValue()
@@ -84,4 +93,13 @@ bool WeaponItem::isValidRepairItem(shared_ptr<ItemInstance> source, shared_ptr<I
 		return true;
 	}
 	return Item::isValidRepairItem(source, repairItem);
+}
+
+attrAttrModMap *WeaponItem::getDefaultAttributeModifiers()
+{
+	attrAttrModMap *result = Item::getDefaultAttributeModifiers();
+
+	result->insert(attrAttrModMap::value_type( SharedMonsterAttributes::ATTACK_DAMAGE->getId(), new AttributeModifier(eModifierId_ITEM_BASEDAMAGE, damage, AttributeModifier::OPERATION_ADDITION) ) );
+
+	return result;
 }
\ No newline at end of file