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

Added a lot of soul stuff.

Browse source
This commit is contained in:
WayofTime 2016-01-07 12:59:46 -05:00
parent 45870812d4
commit 72ed003da1
13 changed files with 278 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,13 +28,16 @@ import net.minecraftforge.event.world.BlockEvent;
import net.minecraftforge.fml.client.event.ConfigChangedEvent;
import net.minecraftforge.fml.common.eventhandler.Event;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.eventhandler.Event.Result;
import WayofTime.bloodmagic.ConfigHandler;
import WayofTime.bloodmagic.api.BloodMagicAPI;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.event.SacrificeKnifeUsedEvent;
import WayofTime.bloodmagic.api.event.TeleposeEvent;
import WayofTime.bloodmagic.api.iface.ISoulWeapon;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import WayofTime.bloodmagic.api.soul.ISoul;
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.item.ItemAltarMaker;
@ -413,7 +416,18 @@ public class EventHandler
@SubscribeEvent
public void onItemPickup(EntityItemPickupEvent event)
{
//TODO:
EntityPlayer player = event.entityPlayer;
ItemStack stack = event.item.getEntityItem();
if (stack != null && stack.getItem() instanceof ISoul)
{
EntityPlayer player = event.entityPlayer;
ItemStack remainder = PlayerSoulHandler.addSouls(player, stack);
if (remainder == null)
{
stack.stackSize = 0;
event.setResult(Result.ALLOW);
}
}
}
}