JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

accurate-ish weapon damage tracking

Browse Source
This commit is contained in:
NewGarbo 2016-02-23 13:03:50 +00:00
parent f0fc2fd519
commit de4568d448
1 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/SiegeWeapon.java
View File

@ -52,6 +52,12 @@ import mineplex.game.clans.clans.siege.weapon.util.AccessType;
import mineplex.game.clans.clans.siege.weapon.util.BarrierCollisionBox; import mineplex.game.clans.clans.siege.weapon.util.BarrierCollisionBox;
import mineplex.game.clans.clans.siege.weapon.util.WeaponStateInfo; import mineplex.game.clans.clans.siege.weapon.util.WeaponStateInfo;
import mineplex.game.clans.items.PlayerGear; import mineplex.game.clans.items.PlayerGear;
import mineplex.game.clans.items.legendaries.AlligatorsTooth;
import mineplex.game.clans.items.legendaries.GiantsBroadsword;
import mineplex.game.clans.items.legendaries.HyperAxe;
import mineplex.game.clans.items.legendaries.LegendaryItem;
import mineplex.game.clans.items.legendaries.MagneticMaul;
import mineplex.game.clans.items.legendaries.WindBlade;
public abstract class SiegeWeapon implements Listener public abstract class SiegeWeapon implements Listener
{ {
@ -201,7 +207,6 @@ public abstract class SiegeWeapon implements Listener
UtilTextMiddle.display(UtilText.possesive(_ownerClan.getName(), _name), C.cRed + "-" + health, 5, 15, 5); UtilTextMiddle.display(UtilText.possesive(_ownerClan.getName(), _name), C.cRed + "-" + health, 5, 15, 5);
} }
protected int getHandDamage(Player player) protected int getHandDamage(Player player)
{ {
ItemStack stack = player.getItemInHand(); ItemStack stack = player.getItemInHand();
@ -209,15 +214,34 @@ public abstract class SiegeWeapon implements Listener
if (stack == null) if (stack == null)
{ {
return 1 ; return 1;
} }
if (gear.getWeapon() != null) if (gear.getWeapon() != null && gear.getWeapon() instanceof LegendaryItem)
{ {
if (gear.getWeapon() instanceof AlligatorsTooth)
{
return 8;
}
else if (gear.getWeapon() instanceof GiantsBroadsword)
{
return 10;
}
else if (gear.getWeapon() instanceof HyperAxe)
{
return 3;
}
else if (gear.getWeapon() instanceof MagneticMaul)
{
return 8;
}
else if (gear.getWeapon() instanceof WindBlade)
{
return 7;
}
} }
return UtilItem.getAttackDamage(player); return (int) UtilItem.getAttackDamage(stack.getType());
} }
protected void ResetEntities() protected void ResetEntities()