Fix merge issues

This commit is contained in:
Gabriele C 2019-08-07 01:08:05 +02:00
parent 063abf45bf
commit 5695d089a5
2 changed files with 5 additions and 2 deletions

View File

@ -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);
}
}

View File

@ -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!");
}