From 5695d089a5c51cf44650f1d6a9565bef66276869 Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Wed, 7 Aug 2019 01:08:05 +0200 Subject: [PATCH] Fix merge issues --- .../authme/listener/protocollib/FreezePacketAdapter.java | 5 ++++- .../authme/listener/protocollib/ProtocolLibService.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/fr/xephi/authme/listener/protocollib/FreezePacketAdapter.java b/src/main/java/fr/xephi/authme/listener/protocollib/FreezePacketAdapter.java index 41e744b4b..d03474a85 100644 --- a/src/main/java/fr/xephi/authme/listener/protocollib/FreezePacketAdapter.java +++ b/src/main/java/fr/xephi/authme/listener/protocollib/FreezePacketAdapter.java @@ -28,6 +28,7 @@ import fr.xephi.authme.AuthMe; import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.data.auth.PlayerCache; import fr.xephi.authme.datasource.DataSource; +import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.service.BukkitService; import org.bukkit.entity.Player; @@ -39,6 +40,8 @@ import java.util.List; class FreezePacketAdapter extends PacketAdapter { + private final ConsoleLogger logger = ConsoleLoggerFactory.get(FreezePacketAdapter.class); + private static final String ATTRIBUTE_MOVEMENT_SPEED = "generic.movementSpeed"; private static final String ATTRIBUTE_FLYING_SPEED = "generic.flyingSpeed"; @@ -115,7 +118,7 @@ class FreezePacketAdapter extends PacketAdapter { try { protocolManager.sendServerPacket(player, attributesPacket, false); } catch (InvocationTargetException invocationExc) { - ConsoleLogger.logException("Error during sending freeze packet", invocationExc); + logger.logException("Error during sending freeze packet", invocationExc); } } diff --git a/src/main/java/fr/xephi/authme/listener/protocollib/ProtocolLibService.java b/src/main/java/fr/xephi/authme/listener/protocollib/ProtocolLibService.java index 39e858456..a56a72fc5 100644 --- a/src/main/java/fr/xephi/authme/listener/protocollib/ProtocolLibService.java +++ b/src/main/java/fr/xephi/authme/listener/protocollib/ProtocolLibService.java @@ -61,7 +61,7 @@ public class ProtocolLibService implements SettingsDependent { } if (freezePlayerBeforeLogin) { - ConsoleLogger.warning("WARNING! In oder to prevent player movements in a nicer way consider" + logger.warning("WARNING! In oder to prevent player movements in a nicer way consider" + " installing ProtocolLib!"); }