projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-04 05:16:21 -04:00
Code Issues Projects Releases Wiki Activity

Combat fixes, radial bug fix, tatooine shuttleport travel terminal is no longer stuck in wall

Browse Source
This commit is contained in:
Light2
2013-11-22 00:02:46 +01:00
parent f3db0818a8
commit a6ecdcd225
7 changed files with 79 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/combat/CombatService.java
+9 -8
View File
@@ -650,15 +650,16 @@ public class CombatService implements INetworkDispatch {
if(r <= missChance)
return HitType.MISS;
}
float dodgeChance = (float) target.getSkillMod("display_only_dodge").getBase() / 10000;
r = random.nextFloat();
if(r <= dodgeChance)
return HitType.DODGE;
if(target.getSkillMod("display_only_dodge") != null) {
float dodgeChance = (float) target.getSkillMod("display_only_dodge").getBase() / 10000;
r = random.nextFloat();
if(r <= dodgeChance)
return HitType.DODGE;
}
WeaponObject weapon2 = (WeaponObject) core.objectService.getObject(((CreatureObject) target).getWeaponId());
if(weapon2 != null && weapon2.isMelee()) {
if(weapon2 != null && weapon2.isMelee() && target.getSkillMod("display_only_parry") != null) {
float parryChance = (float) target.getSkillMod("display_only_parry").getBase() / 10000;
@@ -708,7 +709,7 @@ public class CombatService implements INetworkDispatch {
}
if(hitType == HitType.HIT) {
if(hitType == HitType.HIT && target.getSkillMod("display_only_glancing_blow") != null) {
float glanceChance = (float) target.getSkillMod("display_only_glancing_blow").getBase() / 10000;