lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

this doesn't compile yet, but have something to peek at

Browse source
This commit is contained in:
Nicholas Ignoffo 2017-08-14 20:53:42 -07:00
parent 973f1019a5
commit 5fcdd978d7
329 changed files with 3247 additions and 2953 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java
View file

@ -22,8 +22,6 @@ import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.util.helper.NBTHelper;
import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTablePotionAugmentRecipe;
import com.google.common.base.Objects;
public class BMPotionUtils
{
public static Random rand = new Random();
@ -50,7 +48,7 @@ public class BMPotionUtils
BlockPos blockPos = entity.getPosition().add(rand.nextInt(horizontalRadius * 2 + 1) - horizontalRadius, rand.nextInt(verticalRadius * 2 + 1) - verticalRadius, rand.nextInt(horizontalRadius * 2 + 1) - horizontalRadius);
Block block = world.getBlockState(blockPos).getBlock();
if (!BloodMagicAPI.getGreenGroveBlacklist().contains(block))
if (!BloodMagicAPI.greenGroveBlacklist.contains(block))
{
if (block instanceof IPlantable || block instanceof IGrowable)
{
@ -79,7 +77,7 @@ public class BMPotionUtils
if (incurredDamage > 0)
{
entity.attackEntityFrom(BloodMagicAPI.getDamageSource(), (float) incurredDamage);
entity.attackEntityFrom(BloodMagicAPI.damageSource, (float) incurredDamage);
}
return incurredDamage;
@ -125,7 +123,7 @@ public class BMPotionUtils
return stack;
} else
{
NBTTagCompound nbttagcompound = (NBTTagCompound) Objects.firstNonNull(stack.getTagCompound(), new NBTTagCompound());
NBTTagCompound nbttagcompound = stack.hasTagCompound() ? stack.getTagCompound() : new NBTTagCompound();
NBTTagList nbttaglist = new NBTTagList();
for (PotionEffect potioneffect : effects)