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

Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex

Browse Source
This commit is contained in:
Cheese 2015-11-24 21:30:45 +11:00
commit 7e2f5f0657
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/VitalitySpores.java
View File

@ -38,7 +38,7 @@ public class VitalitySpores extends Skill
@EventHandler @EventHandler
public void playerMove(PlayerMoveEvent event) public void playerMove(PlayerMoveEvent event)
{ {
if (UtilMath.offset(event.getFrom(), event.getTo()) > 0) if (doesUserHaveSkill(event.getPlayer()) && UtilMath.offset(event.getFrom(), event.getTo()) > 0)
_lastMove.put(event.getPlayer(), System.currentTimeMillis()); _lastMove.put(event.getPlayer(), System.currentTimeMillis());
} }
@ -71,6 +71,6 @@ public class VitalitySpores extends Skill
@Override @Override
public void Reset(Player player) public void Reset(Player player)
{ {
_lastMove.remove(player);
} }
} }

5
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Skill.java
View File

@ -257,6 +257,11 @@ public abstract class Skill implements ISkill, Listener
return null; return null;
} }
protected boolean doesUserHaveSkill(Player player)
{
return _users.containsKey(player);
}
@Override @Override
public Set<Player> GetUsers() public Set<Player> GetUsers()
{ {