Fixed some merge issues.

This commit is contained in:
CannibalVox
2013-12-06 21:14:20 -06:00
parent 2388be2681
commit 7dc51a8e56
3 changed files with 9 additions and 34 deletions

View File

@@ -6,6 +6,7 @@ import net.minecraft.entity.DataWatcher;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityFlying;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.monster.IMob;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;