diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/IImperfectRitualStone.java b/src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/IImperfectRitualStone.java index 7bb39c91..e2ca632d 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/IImperfectRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/IImperfectRitualStone.java @@ -14,7 +14,7 @@ public interface IImperfectRitualStone boolean performRitual(World world, BlockPos pos, ImperfectRitual imperfectRitual, EntityPlayer player); - World getWorld(); + World getRitualWorld(); - BlockPos getPos(); + BlockPos getRitualPos(); } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java index 6f3eea72..29df1d44 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java @@ -18,8 +18,8 @@ public class ImperfectRitualDay extends ImperfectRitual public boolean onActivate(IImperfectRitualStone imperfectRitualStone, EntityPlayer player) { - if (!imperfectRitualStone.getWorld().isRemote) - imperfectRitualStone.getWorld().setWorldTime((imperfectRitualStone.getWorld().getWorldTime() / 24000) * 24000); + if (!imperfectRitualStone.getRitualWorld().isRemote) + imperfectRitualStone.getRitualWorld().setWorldTime((imperfectRitualStone.getRitualWorld().getWorldTime() / 24000) * 24000); return true; } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java index 508d21d3..d5c529d0 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java @@ -18,8 +18,8 @@ public class ImperfectRitualNight extends ImperfectRitual public boolean onActivate(IImperfectRitualStone imperfectRitualStone, EntityPlayer player) { - if (!imperfectRitualStone.getWorld().isRemote) - imperfectRitualStone.getWorld().setWorldTime((imperfectRitualStone.getWorld().getWorldTime() / 24000) * 24000 + 13800); + if (!imperfectRitualStone.getRitualWorld().isRemote) + imperfectRitualStone.getRitualWorld().setWorldTime((imperfectRitualStone.getRitualWorld().getWorldTime() / 24000) * 24000 + 13800); return true; } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java index c666d178..afac587e 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java @@ -17,15 +17,15 @@ public class ImperfectRitualRain extends ImperfectRitual @Override public boolean onActivate(IImperfectRitualStone imperfectRitualStone, EntityPlayer player) { - if (!imperfectRitualStone.getWorld().isRemote) + if (!imperfectRitualStone.getRitualWorld().isRemote) { - imperfectRitualStone.getWorld().getWorldInfo().setRaining(true); + imperfectRitualStone.getRitualWorld().getWorldInfo().setRaining(true); } - if (imperfectRitualStone.getWorld().isRemote) + if (imperfectRitualStone.getRitualWorld().isRemote) { - imperfectRitualStone.getWorld().setRainStrength(1.0F); - imperfectRitualStone.getWorld().setThunderStrength(1.0F); + imperfectRitualStone.getRitualWorld().setRainStrength(1.0F); + imperfectRitualStone.getRitualWorld().setThunderStrength(1.0F); } return true; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java index b058e850..43995ab9 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java @@ -20,14 +20,14 @@ public class ImperfectRitualZombie extends ImperfectRitual @Override public boolean onActivate(IImperfectRitualStone imperfectRitualStone, EntityPlayer player) { - EntityZombie zombie = new EntityZombie(imperfectRitualStone.getWorld()); - zombie.setPosition(imperfectRitualStone.getPos().getX() + 0.5, imperfectRitualStone.getPos().getY() + 2.1, imperfectRitualStone.getPos().getZ() + 0.5); + EntityZombie zombie = new EntityZombie(imperfectRitualStone.getRitualWorld()); + zombie.setPosition(imperfectRitualStone.getRitualPos().getX() + 0.5, imperfectRitualStone.getRitualPos().getY() + 2.1, imperfectRitualStone.getRitualPos().getZ() + 0.5); zombie.addPotionEffect(new PotionEffect(Potion.fireResistance.getId(), 2000)); zombie.addPotionEffect(new PotionEffect(Potion.damageBoost.getId(), 20000, 7)); zombie.addPotionEffect(new PotionEffect(Potion.resistance.getId(), 20000, 3)); - if (!imperfectRitualStone.getWorld().isRemote) - imperfectRitualStone.getWorld().spawnEntityInWorld(zombie); + if (!imperfectRitualStone.getRitualWorld().isRemote) + imperfectRitualStone.getRitualWorld().spawnEntityInWorld(zombie); return true; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java index 7ff70989..f2391a9a 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java @@ -35,14 +35,14 @@ public class TileImperfectRitualStone extends TileEntity implements IImperfectRi } @Override - public World getWorld() + public World getRitualWorld() { - return super.getWorld(); + return getWorld(); } @Override - public BlockPos getPos() + public BlockPos getRitualPos() { - return super.getPos(); + return getPos(); } }