diff --git a/src/main/java/fox/spiteful/avaritia/items/tools/ItemSwordInfinity.java b/src/main/java/fox/spiteful/avaritia/items/tools/ItemSwordInfinity.java
index cb652de..ee23259 100644
--- a/src/main/java/fox/spiteful/avaritia/items/tools/ItemSwordInfinity.java
+++ b/src/main/java/fox/spiteful/avaritia/items/tools/ItemSwordInfinity.java
@@ -6,6 +6,7 @@ import fox.spiteful.avaritia.items.LudicrousItems;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.ai.attributes.AttributeModifier;
+import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemSword;
@@ -15,7 +16,7 @@ import net.minecraftforge.common.util.EnumHelper;
public class ItemSwordInfinity extends ItemSword {
- private static final ToolMaterial opSword = EnumHelper.addToolMaterial("INFINITY_SWORD", 32, 9999, 9999F, 9995.0F, 200);
+ private static final ToolMaterial opSword = EnumHelper.addToolMaterial("INFINITY_SWORD", 32, 9999, 9999F, -3.0F, 200);
public ItemSwordInfinity(){
super(opSword);
@@ -34,8 +35,11 @@ public class ItemSwordInfinity extends ItemSword {
@Override
public boolean hitEntity(ItemStack stack, EntityLivingBase victim, EntityLivingBase player)
{
+ if(player.worldObj.isRemote)
+ return true;
+ victim.func_110142_aN().func_94547_a(new EntityDamageSource("infinity", player), victim.getHealth(), victim.getHealth());
victim.setHealth(0);
- victim.onDeath(new EntityDamageSource("player", player));
+ victim.onDeath(new EntityDamageSource("infinity", player));
return true;
}
diff --git a/src/main/resources/assets/avaritia/lang/en_US.lang b/src/main/resources/assets/avaritia/lang/en_US.lang
index 72aedb6..72f06a9 100644
--- a/src/main/resources/assets/avaritia/lang/en_US.lang
+++ b/src/main/resources/assets/avaritia/lang/en_US.lang
@@ -36,8 +36,12 @@ container.neutron_collector=Neutron Collector
tc.aspect.terminus=The End of Games, Apocalypse, Grindstones
crafting.extreme=Xtreme Crafting
crafting.extreme.shapeless=Xtreme Shapeless
+plus.infinity=+Infinity
+death.attack.infinity=%1$s was sliced to ribbons by %2$s
+death.attack.infinity.item=%1$s was sliced to ribbons by %2$s
+#
+# Botania
avaritia.flower.asgardandelion.name=Asgardandelion
tile.avaritia.flower.asgardandelion.lore=Watered with Vazkii's tears :c
avaritia.lexicon.asgardandelion=Asgardandelion
-avaritia.lexicon.asgardandelion.0=Rumors abound about some kind of godlike flower that can produce a neverending torrent of mana. If such a mythical flower were to exist, it would probably require wealth and resources beyond mortal reasoning.
&oStill not a SAO reference.&r
-plus.infinity=+Infinity
\ No newline at end of file
+avaritia.lexicon.asgardandelion.0=Rumors abound about some kind of godlike flower that can produce a neverending torrent of mana. If such a mythical flower were to exist, it would probably require wealth and resources beyond mortal reasoning.
&oStill not a SAO reference.&r
\ No newline at end of file