From 68ef28df08be35ab812b619a3b4d805e13c24b2e Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Thu, 7 Apr 2016 22:51:02 +0200 Subject: [PATCH] Fix minor issues --- .../java/fr/xephi/authme/process/join/AsynchronousJoin.java | 4 ++-- .../fr/xephi/authme/process/login/ProcessSyncPlayerLogin.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java b/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java index 75a66f64..4257cf37 100644 --- a/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java +++ b/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java @@ -184,12 +184,12 @@ public class AsynchronousJoin implements Process { @Override public void run() { player.setOp(false); - if (Settings.isRemoveSpeedEnabled) { + if (!Settings.isMovementAllowed && Settings.isRemoveSpeedEnabled) { player.setFlySpeed(0.0f); player.setWalkSpeed(0.0f); } player.setNoDamageTicks(registrationTimeout); - if (service.getProperty(HooksSettings.USE_ESSENTIALS_MOTD)) { + if (plugin.getPluginHooks().isEssentialsAvailable() && service.getProperty(HooksSettings.USE_ESSENTIALS_MOTD)) { player.performCommand("motd"); } if (service.getProperty(RegistrationSettings.APPLY_BLIND_EFFECT)) { diff --git a/src/main/java/fr/xephi/authme/process/login/ProcessSyncPlayerLogin.java b/src/main/java/fr/xephi/authme/process/login/ProcessSyncPlayerLogin.java index 22938184..96429870 100644 --- a/src/main/java/fr/xephi/authme/process/login/ProcessSyncPlayerLogin.java +++ b/src/main/java/fr/xephi/authme/process/login/ProcessSyncPlayerLogin.java @@ -99,7 +99,7 @@ public class ProcessSyncPlayerLogin implements Runnable { } private void restoreSpeedEffects() { - if (settings.getProperty(RestrictionSettings.REMOVE_SPEED)) { + if (!settings.getProperty(RestrictionSettings.ALLOW_UNAUTHED_MOVEMENT) && settings.getProperty(RestrictionSettings.REMOVE_SPEED)) { player.setWalkSpeed(0.2F); player.setFlySpeed(0.1F); }