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

SolarPowered logic fix. (#1454)

Browse source 
Need to see the sky AND needs to be day, instead of or.

Before:
- Solar Powered works at night
- Solar Powered works at day underground

After:
- Solar Powered works only during daytime if the sky is in line of sight, as well
This commit is contained in:
Tobias Gremeyer 2019-02-01 01:36:31 +01:00 committed by Nick Ignoffo
parent 827ee85e81
commit a04e4d7a09
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java
View file

@ -26,7 +26,7 @@ public class LivingArmourUpgradeSolarPowered extends LivingArmourUpgrade {
@Override @Override
public double getArmourProtection(EntityLivingBase wearer, DamageSource source) { public double getArmourProtection(EntityLivingBase wearer, DamageSource source) {
if (wearer.getEntityWorld().canSeeSky(wearer.getPosition()) || wearer.getEntityWorld().provider.isDaytime()) { if (wearer.getEntityWorld().canSeeSky(wearer.getPosition()) && wearer.getEntityWorld().provider.isDaytime()) {
return protectionLevel[this.level]; return protectionLevel[this.level];
} }
@ -36,7 +36,7 @@ public class LivingArmourUpgradeSolarPowered extends LivingArmourUpgrade {
@Override @Override
public void onTick(World world, EntityPlayer player, ILivingArmour livingArmour) { public void onTick(World world, EntityPlayer player, ILivingArmour livingArmour) {
counter++; counter++;
if (world.canSeeSky(player.getPosition()) || world.provider.isDaytime()) { if (world.canSeeSky(player.getPosition()) && world.provider.isDaytime()) {
if (counter % regenCooldown[this.level] == 0 && player.getHealth() < player.getMaxHealth()) { if (counter % regenCooldown[this.level] == 0 && player.getHealth() < player.getMaxHealth()) {
player.heal(1); player.heal(1);
} }