sigonasr2/TwosideKeeper
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix Action bar messages for Swift Aegis. Properly reduce swift aegis

Browse Source 
amount when hit.
This commit is contained in:
sigonasr2 2016-09-20 19:52:06 -05:00
parent ea1432af6c
commit 01af59a81a
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
TwosideKeeper.jar
View File

Binary file not shown.

8
src/sig/plugin/TwosideKeeper/CustomDamage.java
View File

@ -778,7 +778,7 @@ public class CustomDamage {
private static void reduceSwiftAegisBuff(Player p) { private static void reduceSwiftAegisBuff(Player p) {
PlayerStructure pd = PlayerStructure.GetPlayerStructure(p); PlayerStructure pd = PlayerStructure.GetPlayerStructure(p);
if (pd.swiftaegisamt>0) { /*if (pd.swiftaegisamt>0) {
if (p.hasPotionEffect(PotionEffectType.DAMAGE_RESISTANCE)) { if (p.hasPotionEffect(PotionEffectType.DAMAGE_RESISTANCE)) {
int resistancelv = GenericFunctions.getPotionEffectLevel(PotionEffectType.DAMAGE_RESISTANCE, p); int resistancelv = GenericFunctions.getPotionEffectLevel(PotionEffectType.DAMAGE_RESISTANCE, p);
int resistance_duration = GenericFunctions.getPotionEffectDuration(PotionEffectType.DAMAGE_RESISTANCE, p); int resistance_duration = GenericFunctions.getPotionEffectDuration(PotionEffectType.DAMAGE_RESISTANCE, p);
@ -798,6 +798,12 @@ public class CustomDamage {
} else { } else {
GenericFunctions.sendActionBarMessage(p, ChatColor.GRAY+"Swift Aegis Resistance Removed."); GenericFunctions.sendActionBarMessage(p, ChatColor.GRAY+"Swift Aegis Resistance Removed.");
} }
}*/
pd.swiftaegisamt=Math.max(0, GenericFunctions.getSwiftAegisAmt(p)-1);
if (GenericFunctions.getSwiftAegisAmt(p)>0) {
GenericFunctions.sendActionBarMessage(p, ChatColor.GRAY+"Resist "+WorldShop.toRomanNumeral(GenericFunctions.getSwiftAegisAmt(p)+1));
} else {
GenericFunctions.sendActionBarMessage(p, ChatColor.GRAY+"Swift Aegis Resist Removed.");
} }
} }

1
src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java
View File

@ -3946,6 +3946,7 @@ public class GenericFunctions {
}*/ }*/
pd.swiftaegisamt=Math.min(10,getSwiftAegisAmt(p)+swiftaegislv); pd.swiftaegisamt=Math.min(10,getSwiftAegisAmt(p)+swiftaegislv);
pd.swiftaegistime=TwosideKeeper.getServerTickTime(); pd.swiftaegistime=TwosideKeeper.getServerTickTime();
GenericFunctions.sendActionBarMessage(p, ChatColor.GRAY+"Resist "+WorldShop.toRomanNumeral(pd.swiftaegisamt+1));
} }
public static int getSwiftAegisAmt(Player p) { public static int getSwiftAegisAmt(Player p) {