diff --git a/Change Log.txt b/Change Log.txt index 322736cf..3700a996 100644 --- a/Change Log.txt +++ b/Change Log.txt @@ -1,3 +1,7 @@ +######## 1.0.1a ######## +-fixed heart dupe bug. +-AOE Mining tools now add xp from blocks directly to the player. + ######## 1.0.1 ######## -fixed advanced dislocator index out of bounds exceptions once and for all. -added option to adjust vertical acceleration on chestplate. diff --git a/build.gradle b/build.gradle index da63890e..f9fb4540 100644 --- a/build.gradle +++ b/build.gradle @@ -31,7 +31,7 @@ group = "com.brandon3055.draconicevolution" // http://maven.apache.org/guides/mi archivesBaseName = "Draconic-Evolution" minecraft { - version = "1.7.10-10.13.2.1291" + version = "1.7.10-10.13.3.1400-1.7.10" runDir = "run" //assetDir = "run/assets" } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/entity/DragonLoader.java b/src/main/java/com/brandon3055/draconicevolution/common/entity/DragonLoader.java deleted file mode 100644 index 551fd32b..00000000 --- a/src/main/java/com/brandon3055/draconicevolution/common/entity/DragonLoader.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.brandon3055.draconicevolution.common.entity; - - -import net.minecraft.world.World; -import net.minecraftforge.common.ForgeChunkManager; -import net.minecraftforge.common.ForgeChunkManager.LoadingCallback; - -import java.util.List; - -/** - * Created by Brandon on 9/03/2015. - */ -public class DragonLoader implements LoadingCallback { - - - - @Override - public void ticketsLoaded(List tickets, World world) { - - } -} diff --git a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityDragonHeart.java b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityDragonHeart.java index 217e4f65..c52061f9 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityDragonHeart.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityDragonHeart.java @@ -62,7 +62,6 @@ public class EntityDragonHeart extends Entity { @Override public boolean attackEntityFrom(DamageSource damageSource, float dmg) { - return false; } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityPersistentItem.java b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityPersistentItem.java index b5269100..65e54498 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityPersistentItem.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityPersistentItem.java @@ -52,7 +52,7 @@ public class EntityPersistentItem extends EntityItem { @Override public boolean attackEntityFrom (DamageSource par1DamageSource, float par2) { - if (getEntityItem().getItem() instanceof DragonHeart && par1DamageSource.isExplosion() && par2 > 10f){ + if (getEntityItem().getItem() instanceof DragonHeart && par1DamageSource.isExplosion() && par2 > 10f && !this.isDead){ worldObj.spawnEntityInWorld(new EntityDragonHeart(worldObj, posX, posY, posZ)); this.setDead(); } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/MiningTool.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/MiningTool.java index e87feb89..21c1c2c3 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/MiningTool.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/MiningTool.java @@ -9,7 +9,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.item.EntityXPOrb; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemBlock; @@ -259,11 +258,7 @@ public abstract class MiningTool extends ToolBase {//todo add custom information block.onBlockDestroyedByPlayer(world, x,y,z, meta); block.harvestBlock(world, player, x,y,z, meta); player.addExhaustion(-0.025F); - if (block.getExpDrop(world, meta, EnchantmentHelper.getFortuneModifier(player)) > 0) { - EntityXPOrb xp = new EntityXPOrb(world, player.posX, player.posY, player.posZ, block.getExpDrop(world, meta, EnchantmentHelper.getFortuneModifier(player))); - xp.xpOrbAge = 5400; - world.spawnEntityInWorld(xp); - } + if (block.getExpDrop(world, meta, EnchantmentHelper.getFortuneModifier(player)) > 0) player.addExperience(block.getExpDrop(world, meta, EnchantmentHelper.getFortuneModifier(player))); } EntityPlayerMP mpPlayer = (EntityPlayerMP) player; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/CustomSpawnerBaseLogic.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/CustomSpawnerBaseLogic.java index 3d17911c..d96586e7 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/CustomSpawnerBaseLogic.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/CustomSpawnerBaseLogic.java @@ -154,6 +154,7 @@ public abstract class CustomSpawnerBaseLogic { } public Entity spawnEntity(Entity par1Entity) { + if (par1Entity instanceof EntityLivingBase && par1Entity.worldObj != null) { if (par1Entity instanceof EntitySkeleton) { ((EntitySkeleton)par1Entity).setSkeletonType(skeletonType);