From c7b6afe5b8e0b7645e65b1b47a0a5be34455c7d3 Mon Sep 17 00:00:00 2001
From: Andrew Steinborn <git@steinborn.me>
Date: Sat, 12 Jan 2019 10:52:02 -0500
Subject: [PATCH] Fix merge checkstyle issues

---
 .../velocitypowered/proxy/connection/MinecraftConnection.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/MinecraftConnection.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/MinecraftConnection.java
index 5a5fb4f8..be92e54f 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/connection/MinecraftConnection.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/connection/MinecraftConnection.java
@@ -138,7 +138,8 @@ public class MinecraftConnection extends ChannelInboundHandlerAdapter {
         try {
           sessionHandler.exception(cause);
         } catch (Exception ex) {
-          logger.error("{}: exception handling exception", (association != null ? association : channel.remoteAddress()), cause);
+          logger.error("{}: exception handling exception", (association != null ? association :
+              channel.remoteAddress()), cause);
         }
       }