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

Fix method conflict for IImperfectRitualStone

Browse source
This commit is contained in:
Nick 2016-01-31 15:48:49 -08:00
parent 60d44d7f89
commit b6bdd0740c
6 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/IImperfectRitualStone.java
View file

@ -14,7 +14,7 @@ public interface IImperfectRitualStone
boolean performRitual(World world, BlockPos pos, ImperfectRitual imperfectRitual, EntityPlayer player); boolean performRitual(World world, BlockPos pos, ImperfectRitual imperfectRitual, EntityPlayer player);
World getWorld(); World getRitualWorld();
BlockPos getPos(); BlockPos getRitualPos();
} }

4
src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java
View file

@ -18,8 +18,8 @@ public class ImperfectRitualDay extends ImperfectRitual
public boolean onActivate(IImperfectRitualStone imperfectRitualStone, EntityPlayer player) public boolean onActivate(IImperfectRitualStone imperfectRitualStone, EntityPlayer player)
{ {
if (!imperfectRitualStone.getWorld().isRemote) if (!imperfectRitualStone.getRitualWorld().isRemote)
imperfectRitualStone.getWorld().setWorldTime((imperfectRitualStone.getWorld().getWorldTime() / 24000) * 24000); imperfectRitualStone.getRitualWorld().setWorldTime((imperfectRitualStone.getRitualWorld().getWorldTime() / 24000) * 24000);
return true; return true;
} }

4
src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java
View file

@ -18,8 +18,8 @@ public class ImperfectRitualNight extends ImperfectRitual
public boolean onActivate(IImperfectRitualStone imperfectRitualStone, EntityPlayer player) public boolean onActivate(IImperfectRitualStone imperfectRitualStone, EntityPlayer player)
{ {
if (!imperfectRitualStone.getWorld().isRemote) if (!imperfectRitualStone.getRitualWorld().isRemote)
imperfectRitualStone.getWorld().setWorldTime((imperfectRitualStone.getWorld().getWorldTime() / 24000) * 24000 + 13800); imperfectRitualStone.getRitualWorld().setWorldTime((imperfectRitualStone.getRitualWorld().getWorldTime() / 24000) * 24000 + 13800);
return true; return true;
} }

10
src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java
View file

@ -17,15 +17,15 @@ public class ImperfectRitualRain extends ImperfectRitual
@Override @Override
public boolean onActivate(IImperfectRitualStone imperfectRitualStone, EntityPlayer player) 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.getRitualWorld().setRainStrength(1.0F);
imperfectRitualStone.getWorld().setThunderStrength(1.0F); imperfectRitualStone.getRitualWorld().setThunderStrength(1.0F);
} }
return true; return true;

8
src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java
View file

@ -20,14 +20,14 @@ public class ImperfectRitualZombie extends ImperfectRitual
@Override @Override
public boolean onActivate(IImperfectRitualStone imperfectRitualStone, EntityPlayer player) public boolean onActivate(IImperfectRitualStone imperfectRitualStone, EntityPlayer player)
{ {
EntityZombie zombie = new EntityZombie(imperfectRitualStone.getWorld()); EntityZombie zombie = new EntityZombie(imperfectRitualStone.getRitualWorld());
zombie.setPosition(imperfectRitualStone.getPos().getX() + 0.5, imperfectRitualStone.getPos().getY() + 2.1, imperfectRitualStone.getPos().getZ() + 0.5); 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.fireResistance.getId(), 2000));
zombie.addPotionEffect(new PotionEffect(Potion.damageBoost.getId(), 20000, 7)); zombie.addPotionEffect(new PotionEffect(Potion.damageBoost.getId(), 20000, 7));
zombie.addPotionEffect(new PotionEffect(Potion.resistance.getId(), 20000, 3)); zombie.addPotionEffect(new PotionEffect(Potion.resistance.getId(), 20000, 3));
if (!imperfectRitualStone.getWorld().isRemote) if (!imperfectRitualStone.getRitualWorld().isRemote)
imperfectRitualStone.getWorld().spawnEntityInWorld(zombie); imperfectRitualStone.getRitualWorld().spawnEntityInWorld(zombie);
return true; return true;
} }

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

@ -35,14 +35,14 @@ public class TileImperfectRitualStone extends TileEntity implements IImperfectRi
} }
@Override @Override
public World getWorld() public World getRitualWorld()
{ {
return super.getWorld(); return getWorld();
} }
@Override @Override
public BlockPos getPos() public BlockPos getRitualPos()
{ {
return super.getPos(); return getPos();
} }
} }