Additional use of reuse hashcode constant.

This commit is contained in:
MobiusDev
2018-06-08 06:23:28 +00:00
parent 140aaf00df
commit 24182a9979
8 changed files with 16 additions and 25 deletions

View File

@@ -1553,7 +1553,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
return true; return true;
} }
if (hasSkillReuse(skill.getReuseHashCode())) final long hashCode = skill.getReuseHashCode();
if (hasSkillReuse(hashCode))
{ {
return true; return true;
} }
@@ -1562,8 +1563,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
{ {
return false; return false;
} }
final long hashCode = skill.getReuseHashCode();
final Long stamp = _disabledSkills.get(hashCode); final Long stamp = _disabledSkills.get(hashCode);
if (stamp == null) if (stamp == null)
{ {

View File

@@ -1553,7 +1553,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
return true; return true;
} }
if (hasSkillReuse(skill.getReuseHashCode())) final long hashCode = skill.getReuseHashCode();
if (hasSkillReuse(hashCode))
{ {
return true; return true;
} }
@@ -1562,8 +1563,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
{ {
return false; return false;
} }
final long hashCode = skill.getReuseHashCode();
final Long stamp = _disabledSkills.get(hashCode); final Long stamp = _disabledSkills.get(hashCode);
if (stamp == null) if (stamp == null)
{ {

View File

@@ -1553,7 +1553,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
return true; return true;
} }
if (hasSkillReuse(skill.getReuseHashCode())) final long hashCode = skill.getReuseHashCode();
if (hasSkillReuse(hashCode))
{ {
return true; return true;
} }
@@ -1562,8 +1563,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
{ {
return false; return false;
} }
final long hashCode = skill.getReuseHashCode();
final Long stamp = _disabledSkills.get(hashCode); final Long stamp = _disabledSkills.get(hashCode);
if (stamp == null) if (stamp == null)
{ {

View File

@@ -1553,7 +1553,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
return true; return true;
} }
if (hasSkillReuse(skill.getReuseHashCode())) final long hashCode = skill.getReuseHashCode();
if (hasSkillReuse(hashCode))
{ {
return true; return true;
} }
@@ -1562,8 +1563,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
{ {
return false; return false;
} }
final long hashCode = skill.getReuseHashCode();
final Long stamp = _disabledSkills.get(hashCode); final Long stamp = _disabledSkills.get(hashCode);
if (stamp == null) if (stamp == null)
{ {

View File

@@ -2337,7 +2337,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
return true; return true;
} }
if (hasSkillReuse(skill.getReuseHashCode())) final int hashCode = skill.getReuseHashCode();
if (hasSkillReuse(hashCode))
{ {
return true; return true;
} }
@@ -2346,14 +2347,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
{ {
return false; return false;
} }
final int hashCode = skill.getReuseHashCode();
final Long stamp = _disabledSkills.get(hashCode); final Long stamp = _disabledSkills.get(hashCode);
if (stamp == null) if (stamp == null)
{ {
return false; return false;
} }
if (stamp < System.currentTimeMillis()) if (stamp < System.currentTimeMillis())
{ {
_disabledSkills.remove(hashCode); _disabledSkills.remove(hashCode);

View File

@@ -1553,7 +1553,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
return true; return true;
} }
if (hasSkillReuse(skill.getReuseHashCode())) final long hashCode = skill.getReuseHashCode();
if (hasSkillReuse(hashCode))
{ {
return true; return true;
} }
@@ -1562,8 +1563,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
{ {
return false; return false;
} }
final long hashCode = skill.getReuseHashCode();
final Long stamp = _disabledSkills.get(hashCode); final Long stamp = _disabledSkills.get(hashCode);
if (stamp == null) if (stamp == null)
{ {

View File

@@ -1553,7 +1553,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
return true; return true;
} }
if (hasSkillReuse(skill.getReuseHashCode())) final long hashCode = skill.getReuseHashCode();
if (hasSkillReuse(hashCode))
{ {
return true; return true;
} }
@@ -1562,8 +1563,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
{ {
return false; return false;
} }
final long hashCode = skill.getReuseHashCode();
final Long stamp = _disabledSkills.get(hashCode); final Long stamp = _disabledSkills.get(hashCode);
if (stamp == null) if (stamp == null)
{ {

View File

@@ -1553,7 +1553,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
return true; return true;
} }
if (hasSkillReuse(skill.getReuseHashCode())) final long hashCode = skill.getReuseHashCode();
if (hasSkillReuse(hashCode))
{ {
return true; return true;
} }
@@ -1562,8 +1563,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
{ {
return false; return false;
} }
final long hashCode = skill.getReuseHashCode();
final Long stamp = _disabledSkills.get(hashCode); final Long stamp = _disabledSkills.get(hashCode);
if (stamp == null) if (stamp == null)
{ {