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

Re-activating a ritual via Redstone should not consume LP

Browse source
This commit is contained in:
Nick 2016-02-04 13:32:59 -08:00
parent cd794250bd
commit 2bf401f1d6
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -61,10 +61,10 @@ public class TileMasterRitualStone extends TileEntity implements IMasterRitualSt
if (!isActive() && !getWorld().isBlockPowered(getPos()) && isRedstoned() && getCurrentRitual() != null) if (!isActive() && !getWorld().isBlockPowered(getPos()) && isRedstoned() && getCurrentRitual() != null)
{ {
active = true; active = true;
redstoned = false;
ItemStack crystalStack = NBTHelper.checkNBT(new ItemStack(ModItems.activationCrystal, 1, getCurrentRitual().getCrystalLevel())); ItemStack crystalStack = NBTHelper.checkNBT(new ItemStack(ModItems.activationCrystal, 1, getCurrentRitual().getCrystalLevel()));
crystalStack.getTagCompound().setString(Constants.NBT.OWNER_UUID, getOwner()); crystalStack.getTagCompound().setString(Constants.NBT.OWNER_UUID, getOwner());
activateRitual(crystalStack, PlayerHelper.getPlayerFromUUID(getOwner()), getCurrentRitual()); activateRitual(crystalStack, PlayerHelper.getPlayerFromUUID(getOwner()), getCurrentRitual());
redstoned = false;
} }
if (getCurrentRitual() != null && isActive()) if (getCurrentRitual() != null && isActive())
@ -133,7 +133,7 @@ public class TileMasterRitualStone extends TileEntity implements IMasterRitualSt
{ {
SoulNetwork network = NetworkHelper.getSoulNetwork(crystalOwner); SoulNetwork network = NetworkHelper.getSoulNetwork(crystalOwner);
if (network.getCurrentEssence() < ritual.getActivationCost() && !activator.capabilities.isCreativeMode) if (!isRedstoned() && network.getCurrentEssence() < ritual.getActivationCost() && !activator.capabilities.isCreativeMode)
{ {
ChatUtil.sendNoSpamUnloc(activator, "chat.BloodMagic.ritual.weak"); ChatUtil.sendNoSpamUnloc(activator, "chat.BloodMagic.ritual.weak");
return false; return false;
@ -152,16 +152,13 @@ public class TileMasterRitualStone extends TileEntity implements IMasterRitualSt
if (ritual.activateRitual(this, activator)) if (ritual.activateRitual(this, activator))
{ {
if (!activator.capabilities.isCreativeMode) if (!isRedstoned() && !activator.capabilities.isCreativeMode)
{
network.syphon(ritual.getActivationCost()); network.syphon(ritual.getActivationCost());
}
ChatUtil.sendNoSpamUnloc(activator, "chat.BloodMagic.ritual.activate"); ChatUtil.sendNoSpamUnloc(activator, "chat.BloodMagic.ritual.activate");
this.active = true;
// Set the owner of the ritual to the crystal's owner
this.owner = crystalOwner;
this.active = true;
this.owner = crystalOwner;
this.currentRitual = ritual; this.currentRitual = ritual;
return true; return true;