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

Fix Sharpness Multiplier display

Browse Source
This commit is contained in:
sigonasr2 2016-07-24 22:44:25 -05:00
parent a7e10880ea
commit 3e623852b7
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
TwosideKeeper.jar
View File

Binary file not shown.

10
src/sig/plugin/TwosideKeeper/NewCombat.java
View File

@ -550,7 +550,9 @@ public class NewCombat {
if (GenericFunctions.isRanger(p)) { if (GenericFunctions.isRanger(p)) {
Bukkit.getScheduler().scheduleSyncDelayedTask(Bukkit.getPluginManager().getPlugin("TwosideKeeper"), new Runnable() { Bukkit.getScheduler().scheduleSyncDelayedTask(Bukkit.getPluginManager().getPlugin("TwosideKeeper"), new Runnable() {
public void run() { public void run() {
if (target!=null) {
target.setVelocity(target.getVelocity().setY(0.1).multiply(8)); target.setVelocity(target.getVelocity().setY(0.1).multiply(8));
}
}} }}
,1); ,1);
} }
@ -681,16 +683,18 @@ public class NewCombat {
addMultiplierToPlayerLogger(damager,"POWER Mult",mult1); addMultiplierToPlayerLogger(damager,"POWER Mult",mult1);
mult*=mult1; mult*=mult1;
} else { } else {
mult*=(weapon.containsEnchantment(Enchantment.DAMAGE_ALL))?1.0+weapon.getEnchantmentLevel(Enchantment.DAMAGE_ALL)*0.1:1.0; double mult1 = (weapon.containsEnchantment(Enchantment.DAMAGE_ALL))?1.0+weapon.getEnchantmentLevel(Enchantment.DAMAGE_ALL)*0.1:1.0;
addMultiplierToPlayerLogger(damager,"SHARPNESS Mult",mult1);
mult*=mult1;
if (weapon.containsEnchantment(Enchantment.DAMAGE_ARTHROPODS) && if (weapon.containsEnchantment(Enchantment.DAMAGE_ARTHROPODS) &&
(target instanceof Spider)) { (target instanceof Spider)) {
double mult1 = 1.0+weapon.getEnchantmentLevel(Enchantment.DAMAGE_ARTHROPODS)*0.1; mult1 = 1.0+weapon.getEnchantmentLevel(Enchantment.DAMAGE_ARTHROPODS)*0.1;
addMultiplierToPlayerLogger(damager,"BANE OF ARTHROPODS Mult",mult1); addMultiplierToPlayerLogger(damager,"BANE OF ARTHROPODS Mult",mult1);
mult*=mult1; mult*=mult1;
} }
if (weapon.containsEnchantment(Enchantment.DAMAGE_UNDEAD) && if (weapon.containsEnchantment(Enchantment.DAMAGE_UNDEAD) &&
(target instanceof Monster) && MonsterController.isUndead((Monster)target)) { (target instanceof Monster) && MonsterController.isUndead((Monster)target)) {
double mult1 = 1.0+weapon.getEnchantmentLevel(Enchantment.DAMAGE_UNDEAD)*0.1; mult1 = 1.0+weapon.getEnchantmentLevel(Enchantment.DAMAGE_UNDEAD)*0.1;
addMultiplierToPlayerLogger(damager,"SMITE Mult",mult1); addMultiplierToPlayerLogger(damager,"SMITE Mult",mult1);
mult*=mult1; mult*=mult1;
} }