From d4e4150a6e8f48a4235aaa378d68c6ac6f4beb11 Mon Sep 17 00:00:00 2001
From: ronancpl <rcpl2010@gmail.com>
Date: Sat, 10 Apr 2021 09:43:05 -0300
Subject: [PATCH] cleanup: adjust syntax

---
 .../java/client/command/commands/gm6/WarpWorldCommand.java    | 2 +-
 src/main/java/net/server/Server.java                          | 4 ++--
 .../server/coordinator/session/MapleSessionCoordinator.java   | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/client/command/commands/gm6/WarpWorldCommand.java b/src/main/java/client/command/commands/gm6/WarpWorldCommand.java
index bacb83521f..9670f16a87 100644
--- a/src/main/java/client/command/commands/gm6/WarpWorldCommand.java
+++ b/src/main/java/client/command/commands/gm6/WarpWorldCommand.java
@@ -49,7 +49,7 @@ public class WarpWorldCommand extends Command {
         byte worldb = Byte.parseByte(params[0]);
         if (worldb <= (server.getWorldsSize() - 1)) {
             try {
-                String[] socket = server.getInetSocket(worldb, c.getChannel());
+                String[] socket = server.getInetSocket(c.getSession(), worldb, c.getChannel());
                 c.getWorldServer().removePlayer(player);
                 player.getMap().removePlayer(player);//LOL FORGOT THIS ><
                 player.setSessionTransitionState();
diff --git a/src/main/java/net/server/Server.java b/src/main/java/net/server/Server.java
index 5009b48923..a8def9df3b 100644
--- a/src/main/java/net/server/Server.java
+++ b/src/main/java/net/server/Server.java
@@ -56,6 +56,7 @@ import org.apache.mina.core.buffer.IoBuffer;
 import org.apache.mina.core.buffer.SimpleBufferAllocator;
 import org.apache.mina.core.service.IoAcceptor;
 import org.apache.mina.core.session.IdleStatus;
+import org.apache.mina.core.session.IoSession;
 import org.apache.mina.filter.codec.ProtocolCodecFilter;
 import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
 import org.slf4j.Logger;
@@ -285,8 +286,7 @@ public class Server {
         }
     }
 
-    public String[] getInetSocket(int world, int channel) {
-        public String[] getInetSocket(IoSession session, int world, int channel) {
+    public String[] getInetSocket(IoSession session, int world, int channel) {
         String remoteIp = MapleSessionCoordinator.getSessionRemoteAddress(session);
 
         String[] hostAddress = getIP(world, channel).split(":");
diff --git a/src/main/java/net/server/coordinator/session/MapleSessionCoordinator.java b/src/main/java/net/server/coordinator/session/MapleSessionCoordinator.java
index 78361d066c..93e4135649 100644
--- a/src/main/java/net/server/coordinator/session/MapleSessionCoordinator.java
+++ b/src/main/java/net/server/coordinator/session/MapleSessionCoordinator.java
@@ -38,6 +38,8 @@ import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  *