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

Added infrastructure and rendering for the Soul Arrow.

Browse source
This commit is contained in:
WayofTime 2016-01-08 22:20:31 -05:00
parent 22a0e2b8a9
commit 1d6edae50e
11 changed files with 300 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java
View file

@ -41,6 +41,7 @@ import WayofTime.bloodmagic.api.soul.ISoulWeapon;
import WayofTime.bloodmagic.api.soul.PlayerSoulHandler;
import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
import WayofTime.bloodmagic.block.BlockAltar;
import WayofTime.bloodmagic.entity.projectile.EntitySoulArrow;
import WayofTime.bloodmagic.item.ItemAltarMaker;
import WayofTime.bloodmagic.item.armour.ItemLivingArmour;
import WayofTime.bloodmagic.item.gear.ItemPackSacrifice;
@ -241,6 +242,8 @@ public class EventHandler
{
EntityPlayer attackedPlayer = (EntityPlayer) attackedEntity;
// Living Armour handling
boolean hasFullSet = true;
for (int i = 0; i < 4; i++)
{
@ -269,10 +272,18 @@ public class EventHandler
}
}
if (sourceEntity instanceof EntitySoulArrow)
{
// Soul Weapon handling
((EntitySoulArrow) sourceEntity).reimbursePlayer();
}
if (sourceEntity instanceof EntityPlayer)
{
EntityPlayer player = (EntityPlayer) sourceEntity;
// Living Armour handling
boolean hasFullSet = true;
for (int i = 0; i < 4; i++)
{