Fix merge conflicts

This commit is contained in:
mDiyo committed 2013-09-08 20:37:41 -07:00
commit 856b31361d
199 files changed
+947 -322

No files matched your search

+2 -2
View File
@@ -152,7 +152,7 @@ public class TitleIcon extends Item
if (!world.isRemote)
{
entity.setPosition(x, y, z);
((EntityLiving) entity).func_110161_a((EntityLivingData) null);
((EntityLiving) entity).onSpawnWithEgg((EntityLivingData) null);
world.spawnEntityInWorld(entity);
}
}
@@ -163,7 +163,7 @@ public class TitleIcon extends Item
{
entity.setPosition(x, y, z);
entity.setAngles(player.cameraYaw, player.cameraYaw);
((EntityLiving) entity).func_110161_a((EntityLivingData) null);
((EntityLiving) entity).onSpawnWithEgg((EntityLivingData) null);
world.spawnEntityInWorld(entity);
}
}
@@ -7,6 +7,7 @@ import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.MathHelper;
import net.minecraft.util.StatCollector;
public class LavaTankItemBlock extends ItemBlock
{
@@ -37,7 +38,7 @@ public class LavaTankItemBlock extends ItemBlock
NBTTagCompound liquidTag = stack.getTagCompound().getCompoundTag("Fluid");
if (liquidTag != null)
{
list.add("Contains " + liquidTag.getString("FluidName"));
list.add("Contains " + StatCollector.translateToLocal(liquidTag.getString("FluidName")));
list.add(liquidTag.getInteger("Amount") + " mB");
}
}
+1 -1
View File
@@ -41,7 +41,7 @@ public class FryingPan extends Weapon
@Override
public boolean onLeftClickEntity (ItemStack stack, EntityPlayer player, Entity mob)
{
if (mob.canAttackWithItem() && !mob.func_85031_j(player) && mob.hurtResistantTime < 14)
if (mob.canAttackWithItem() && !mob.hitByEntity(player) && mob.hurtResistantTime < 14)
AbilityHelper.onLeftClickEntity(stack, player, mob, this);
return true;
}