diff options
| author | KHobbits <rob@khobbits.co.uk> | 2013-08-18 22:43:43 +0100 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2013-08-18 22:43:43 +0100 |
| commit | f0a8798b55050e33e07b5240e7ae69da9dca8f1c (patch) | |
| tree | 00c1cc39d8ea30cda734ca9906956fab5b6b27a1 | |
| parent | a6bb2cf9a003908b49f4ae5c8daeff1969347859 (diff) | |
| download | Essentials-f0a8798b55050e33e07b5240e7ae69da9dca8f1c.tar Essentials-f0a8798b55050e33e07b5240e7ae69da9dca8f1c.tar.gz Essentials-f0a8798b55050e33e07b5240e7ae69da9dca8f1c.tar.lz Essentials-f0a8798b55050e33e07b5240e7ae69da9dca8f1c.tar.xz Essentials-f0a8798b55050e33e07b5240e7ae69da9dca8f1c.zip | |
Reset fall distance when toggling fly so fall damage is not accidentally applied.
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java | 1 | ||||
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/commands/Commandfly.java | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java index 6eb3e1134..e5839f104 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java @@ -421,6 +421,7 @@ public class EssentialsPlayerListener implements Listener final User user = ess.getUser(event.getPlayer()); if (user.getGameMode() != GameMode.CREATIVE && !user.isAuthorized("essentials.fly")) { + user.setFallDistance(0f); user.setAllowFlight(false); } user.setFlySpeed(0.1f); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandfly.java b/Essentials/src/com/earth2me/essentials/commands/Commandfly.java index 43b40a780..8036ba57c 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandfly.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandfly.java @@ -52,8 +52,9 @@ public class Commandfly extends EssentialsToggleCommand enabled = !user.getAllowFlight(); } + user.setFallDistance(0f); user.setAllowFlight(enabled); - + if (!user.getAllowFlight()) { user.setFlying(false); |