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

Fixed Teh Nut derp

Browse source
This commit is contained in:
WayofTime 2016-03-29 19:56:15 -04:00
parent 1b0e07cdb1
commit 63b541da06
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java
View file

@ -45,6 +45,7 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes
public static double[] willBracket = new double[] { 30, 200, 600, 1500, 4000, 6000, 8000, 16000 }; public static double[] willBracket = new double[] { 30, 200, 600, 1500, 4000, 6000, 8000, 16000 };
public static double[] consumptionPerHit = new double[] { 0.1, 0.12, 0.15, 0.2, 0.3, 0.35, 0.4, 0.5 }; public static double[] consumptionPerHit = new double[] { 0.1, 0.12, 0.15, 0.2, 0.3, 0.35, 0.4, 0.5 };
public static double[] extraProtectionLevel = new double[] { 0, 0.25, 0.5, 0.6, 0.7, 0.75, 0.85, 0.9 }; public static double[] extraProtectionLevel = new double[] { 0, 0.25, 0.5, 0.6, 0.7, 0.75, 0.85, 0.9 };
public static double[] steadfastProtectionLevel = new double[] { 0.25, 0.5, 0.6, 0.7, 0.75, 0.85, 0.9, 0.95 };
public static double[] healthBonus = new double[] { 3, 6, 9, 12, 15, 20, 25 }; public static double[] healthBonus = new double[] { 3, 6, 9, 12, 15, 20, 25 };
public static double[] knockbackBonus = new double[] { 0.2, 0.4, 0.6, 0.8, 1, 1, 1 }; public static double[] knockbackBonus = new double[] { 0.2, 0.4, 0.6, 0.8, 1, 1, 1 };
@ -511,6 +512,7 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes
switch (type) switch (type)
{ {
case STEADFAST: case STEADFAST:
return steadfastProtectionLevel[willBracket];
default: default:
return extraProtectionLevel[willBracket]; return extraProtectionLevel[willBracket];
} }

2
src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java
View file

@ -130,7 +130,7 @@ public class RitualMagnetic extends Ritual
if (isBlockOre(block, meta)) if (isBlockOre(block, meta))
{ {
TileTeleposer.teleportBlocks(this, world, newPos, world, replacement); TileTeleposer.teleportBlocks(world, newPos, world, replacement);
network.syphon(getRefreshCost()); network.syphon(getRefreshCost());
k++; k++;
this.lastPos = new BlockPos(i, j, k); this.lastPos = new BlockPos(i, j, k);