From 2cf8756993b44c6750cd7408694a59570d2e1a82 Mon Sep 17 00:00:00 2001 From: Simon Date: Mon, 1 Jun 2020 20:30:22 +0200 Subject: [PATCH] fix: clear fall damage on teleport --- .../java/de/cliffbreak/varo/managers/GameTimeManager.java | 8 ++++---- .../main/java/de/cliffbreak/varo/utils/PlayerUtils.java | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/varo/src/main/java/de/cliffbreak/varo/managers/GameTimeManager.java b/varo/src/main/java/de/cliffbreak/varo/managers/GameTimeManager.java index 7ec8636..fed0834 100644 --- a/varo/src/main/java/de/cliffbreak/varo/managers/GameTimeManager.java +++ b/varo/src/main/java/de/cliffbreak/varo/managers/GameTimeManager.java @@ -18,13 +18,13 @@ public class GameTimeManager { private static final int firstPlayTimeMinutes = 50; private static final int firstPlayTimeLoginMinutes = 10; private static final int protectionPeriodMinutes = 11; - // private static final LocalTime firstPlayStart = LocalTime.of(19, 20, 00); - private static final LocalTime firstPlayStart = LocalTime.now().plusMinutes(1); + private static final LocalTime firstPlayStart = LocalTime.of(19, 30, 00); + // private static final LocalTime firstPlayStart = LocalTime.now().plusMinutes(1); private static final int firstRoundPreStartMinutes = 1; private static final int playTimeMinutes = 30; private static final int playTimeLoginMinutes = 5; - // private static final LocalTime playStart = LocalTime.of(19, 30, 00); - private static final LocalTime playStart = LocalTime.now().plusSeconds(10); + private static final LocalTime playStart = LocalTime.of(19, 30, 00); + // private static final LocalTime playStart = LocalTime.now().plusSeconds(10); public GameTimeManager(final Varo plugin) { this.plugin = plugin; diff --git a/varo/src/main/java/de/cliffbreak/varo/utils/PlayerUtils.java b/varo/src/main/java/de/cliffbreak/varo/utils/PlayerUtils.java index ed37395..d2f6698 100644 --- a/varo/src/main/java/de/cliffbreak/varo/utils/PlayerUtils.java +++ b/varo/src/main/java/de/cliffbreak/varo/utils/PlayerUtils.java @@ -35,6 +35,7 @@ public class PlayerUtils { } p.teleport(new Location(w, 0, 0, 100)); + p.setFallDistance(0); p.setGameMode(GameMode.SPECTATOR); p.setFlying(true); p.setFlySpeed(0.0f);