Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
A5H73Y committed Jul 20, 2018
2 parents 3a00110 + c1e89da commit 3ebf0fe
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/main/java/me/A5H73Y/Parkour/ParkourListener.java
Original file line number Diff line number Diff line change
Expand Up @@ -485,13 +485,13 @@ public void onCheckpointEvent(PlayerInteractEvent event) {
if (check == null)
return;

if (Parkour.getSettings().isFirstCheckAsStart() && session.getCheckpoint() == 0) {
session.resetTimeStarted();
Utils.sendActionBar(event.getPlayer(), Utils.getTranslation("Parkour.TimerStarted", false), true);
if (check.getNextCheckpointX() == below.getLocation().getBlockX() && check.getNextCheckpointY() == below.getLocation().getBlockY() && check.getNextCheckpointZ() == below.getLocation().getBlockZ()) {
if (Parkour.getSettings().isFirstCheckAsStart() && session.getCheckpoint() == 0) {
session.resetTimeStarted();
Utils.sendActionBar(event.getPlayer(), Utils.getTranslation("Parkour.TimerStarted", false), true);
}
PlayerMethods.increaseCheckpoint(session, event.getPlayer());
}

if (check.getNextCheckpointX() == below.getLocation().getBlockX() && check.getNextCheckpointY() == below.getLocation().getBlockY() && check.getNextCheckpointZ() == below.getLocation().getBlockZ())
PlayerMethods.increaseCheckpoint(session, event.getPlayer());
}

@EventHandler
Expand Down

0 comments on commit 3ebf0fe

Please sign in to comment.