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

Fix minor Swift Aegis buff things missed.

Browse Source
This commit is contained in:
sigonasr2 2016-09-20 20:01:01 -05:00
parent 01af59a81a
commit 6c4167665c
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
TwosideKeeper.jar
View File

Binary file not shown.

3
src/sig/plugin/TwosideKeeper/ActionBarBuffUpdater.java
View File

@ -7,6 +7,7 @@ import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType; import org.bukkit.potion.PotionEffectType;
import sig.plugin.TwosideKeeper.HelperStructures.WorldShop; import sig.plugin.TwosideKeeper.HelperStructures.WorldShop;
import sig.plugin.TwosideKeeper.HelperStructures.Common.GenericFunctions;
public class ActionBarBuffUpdater{ public class ActionBarBuffUpdater{
@ -46,7 +47,7 @@ public class ActionBarBuffUpdater{
} }
if (pd.swiftaegisamt>4) { if (pd.swiftaegisamt>4) {
effectString.append(ChatColor.YELLOW+"❈"); effectString.append(ChatColor.YELLOW+"❈");
effectString.append(AppendAmplifier((int)(pd.swiftaegisamt-1))); effectString.append(AppendAmplifier((int)(GenericFunctions.getSwiftAegisAmt((Player)p)-1)));
effectString.append(" "); effectString.append(" ");
} }
} }

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

@ -801,7 +801,7 @@ public class CustomDamage {
}*/ }*/
pd.swiftaegisamt=Math.max(0, GenericFunctions.getSwiftAegisAmt(p)-1); pd.swiftaegisamt=Math.max(0, GenericFunctions.getSwiftAegisAmt(p)-1);
if (GenericFunctions.getSwiftAegisAmt(p)>0) { if (GenericFunctions.getSwiftAegisAmt(p)>0) {
GenericFunctions.sendActionBarMessage(p, ChatColor.GRAY+"Resist "+WorldShop.toRomanNumeral(GenericFunctions.getSwiftAegisAmt(p)+1)); GenericFunctions.sendActionBarMessage(p, ChatColor.GRAY+"Resist "+WorldShop.toRomanNumeral(GenericFunctions.getSwiftAegisAmt(p)));
} else { } else {
GenericFunctions.sendActionBarMessage(p, ChatColor.GRAY+"Swift Aegis Resist Removed."); GenericFunctions.sendActionBarMessage(p, ChatColor.GRAY+"Swift Aegis Resist Removed.");
} }

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

@ -3946,7 +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)); GenericFunctions.sendActionBarMessage(p, ChatColor.GRAY+"Resist "+WorldShop.toRomanNumeral(pd.swiftaegisamt));
} }
public static int getSwiftAegisAmt(Player p) { public static int getSwiftAegisAmt(Player p) {
@ -3954,6 +3954,7 @@ public class GenericFunctions {
if (pd.swiftaegistime+(20*20)>TwosideKeeper.getServerTickTime()) { if (pd.swiftaegistime+(20*20)>TwosideKeeper.getServerTickTime()) {
return pd.swiftaegisamt; return pd.swiftaegisamt;
} else { } else {
pd.swiftaegisamt=0;
return 0; return 0;
} }
} }