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

Fix imperfect rituals crashing client

Browse source 
I should really, *really* stop breaking this.
This commit is contained in:
Nick 2016-02-05 14:38:32 -08:00
parent 34afee6dfb
commit fc49dc92ed
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,15 +20,20 @@ public class TileImperfectRitualStone extends TileEntity implements IImperfectRi
@Override @Override
public boolean performRitual(World world, BlockPos pos, ImperfectRitual imperfectRitual, EntityPlayer player) public boolean performRitual(World world, BlockPos pos, ImperfectRitual imperfectRitual, EntityPlayer player)
{ {
if (!PlayerHelper.isFakePlayer(player) && imperfectRitual != null && ImperfectRitualRegistry.ritualEnabled(imperfectRitual)) if (imperfectRitual != null && ImperfectRitualRegistry.ritualEnabled(imperfectRitual))
{ {
NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, imperfectRitual.getActivationCost()); if (!PlayerHelper.isFakePlayer(player) && !world.isRemote)
if (imperfectRitual.onActivate(this, player))
{ {
if (imperfectRitual.isLightshow() && !getWorld().isRemote) NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, imperfectRitual.getActivationCost());
getWorld().addWeatherEffect(new EntityLightningBolt(getWorld(), getPos().getX(), getPos().getY() + 2, getPos().getZ())); if (imperfectRitual.onActivate(this, player))
return true; {
if (imperfectRitual.isLightshow())
getWorld().addWeatherEffect(new EntityLightningBolt(getWorld(), getPos().getX(), getPos().getY() + 2, getPos().getZ()));
return true;
}
} }
return true;
} }
return false; return false;