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

Fixed the Soul Network and made sure the majority of the items worked on it.

Browse source
This commit is contained in:
WayofTime 2015-12-31 20:10:57 -05:00
parent 241c0b8dda
commit 6fb409f20f
19 changed files with 99 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java
View file

@ -23,7 +23,7 @@ public class TileImperfectRitualStone extends TileEntity implements IImperfectRi
if (imperfectRitual != null && ImperfectRitualRegistry.ritualEnabled(imperfectRitual))
{
NetworkHelper.getSoulNetwork(player, world).syphonAndDamage(imperfectRitual.getActivationCost());
NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, imperfectRitual.getActivationCost());
if (imperfectRitual.onActivate(this, player))
if (imperfectRitual.isLightshow())
getWorld().addWeatherEffect(new EntityLightningBolt(getWorld(), getPos().getX(), getPos().getY() + 2, getPos().getZ()));

6
src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java
View file

@ -80,7 +80,6 @@ public class TileMasterRitualStone extends TileEntity implements IMasterRitualSt
@Override
public boolean activateRitual(ItemStack activationCrystal, EntityPlayer activator, Ritual ritual)
{
if (PlayerHelper.isFakePlayer(activator))
return false;
@ -94,8 +93,7 @@ public class TileMasterRitualStone extends TileEntity implements IMasterRitualSt
int crystalLevel = ((ItemActivationCrystal) activationCrystal.getItem()).getCrystalLevel(activationCrystal);
if (RitualHelper.canCrystalActivate(ritual, crystalLevel))
{
SoulNetwork network = NetworkHelper.getSoulNetwork(crystalOwner, getWorld());
SoulNetwork network = NetworkHelper.getSoulNetwork(crystalOwner);
if (network.getCurrentEssence() < ritual.getActivationCost())
{
@ -146,8 +144,6 @@ public class TileMasterRitualStone extends TileEntity implements IMasterRitualSt
if (MinecraftForge.EVENT_BUS.post(event) || event.getResult() == Event.Result.DENY)
return;
SoulNetwork network = NetworkHelper.getSoulNetwork(getOwner(), getWorld());
network.syphonAndDamage(getCurrentRitual().getRefreshCost());
getCurrentRitual().performRitual(this);
}
}