projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-04 19:12:50 -04:00
Code Issues Projects Releases Wiki Activity

Fixed loads of warnings

Browse Source
This commit is contained in:
Treeku
2014-05-14 15:51:25 +01:00
parent 3f571c48aa
commit 865db149ad
36 changed files with 46 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/PlayerService.java
+2 -2
View File
@@ -160,7 +160,7 @@ public class PlayerService implements INetworkDispatch {
scheduleList.add(scheduler.scheduleAtFixedRate(() -> {
if(creature.getAction() < creature.getMaxAction() && creature.getPosture() != 14) {
if(creature.getCombatFlag() == 0)
if(!creature.isInCombat())
creature.setAction(creature.getAction() + (15 + creature.getLevel() * 5));
else
creature.setAction(creature.getAction() + ((15 + creature.getLevel() * 5) / 2));
@@ -168,7 +168,7 @@ public class PlayerService implements INetworkDispatch {
}, 0, 1000, TimeUnit.MILLISECONDS));
scheduleList.add(scheduler.scheduleAtFixedRate(() -> {
if(creature.getHealth() < creature.getMaxHealth() && creature.getCombatFlag() == 0 && creature.getPosture() != 13 && creature.getPosture() != 14)
if(creature.getHealth() < creature.getMaxHealth() && !creature.isInCombat() && creature.getPosture() != 13 && creature.getPosture() != 14)
creature.setHealth(creature.getHealth() + (36 + creature.getLevel() * 4));
}, 0, 1000, TimeUnit.MILLISECONDS));
schedulers.put(creature.getObjectID(), scheduleList);