From a3b40b750aab6278eeb1491f71b871f5378ac82c Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Fri, 17 Aug 2018 11:08:13 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B7=D0=B0=D0=BC=D0=B5=D0=BD=D0=B0=20=D0=BF?=
 =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D0=BE=D0=B9=20INSTAN?=
 =?UTF-8?q?CE=20=D0=BD=D0=B0=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=20getInstanc?=
 =?UTF-8?q?e()=20=D0=B2=20EventBusGetter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/src/main/java/mc/core/GameLoop.java                      | 4 ++--
 core/src/main/java/mc/core/eventbus/EventBusGetter.java       | 4 +++-
 .../java/mc/core/network/proto_1_12_2/netty/NettyServer.java  | 2 +-
 .../network/proto_1_12_2/netty/handlers/LoginHandler.java     | 2 +-
 .../core/network/proto_1_12_2/netty/handlers/PlayHandler.java | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/mc/core/GameLoop.java b/core/src/main/java/mc/core/GameLoop.java
index d04f929..93a0a6a 100644
--- a/core/src/main/java/mc/core/GameLoop.java
+++ b/core/src/main/java/mc/core/GameLoop.java
@@ -76,7 +76,7 @@ public class GameLoop extends Thread {
             }
 
             if (!eventChunkLoad.getNeedLoadChunks().isEmpty()) {
-                EventBusGetter.INSTANCE.post(eventChunkLoad);
+                EventBusGetter.getInstance().post(eventChunkLoad);
             }
         }
 
@@ -90,7 +90,7 @@ public class GameLoop extends Thread {
     public void run() {
         TPS_WATCHER.startWatch();
 
-        EventBusGetter.INSTANCE.register(this);
+        EventBusGetter.getInstance().register(this);
 
         while (!isInterrupted()) {
             TPS_WATCHER.check();
diff --git a/core/src/main/java/mc/core/eventbus/EventBusGetter.java b/core/src/main/java/mc/core/eventbus/EventBusGetter.java
index 82d3d42..37e952b 100644
--- a/core/src/main/java/mc/core/eventbus/EventBusGetter.java
+++ b/core/src/main/java/mc/core/eventbus/EventBusGetter.java
@@ -5,9 +5,11 @@
 package mc.core.eventbus;
 
 import com.google.common.eventbus.EventBus;
+import lombok.Getter;
 
 public final class EventBusGetter {
-    public static final EventBus INSTANCE = new EventBus();
+    @Getter
+    private static final EventBus instance = new EventBus();
 
     private EventBusGetter() {
     }
diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/NettyServer.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/NettyServer.java
index 51318cb..057a425 100644
--- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/NettyServer.java
+++ b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/NettyServer.java
@@ -64,7 +64,7 @@ public class NettyServer implements Server {
     public void start() throws StartServerException {
         log.info("Use protocol {}", StatusResponsePacket.NAME);
 
-        EventBusGetter.INSTANCE.register(new PlayerEventListener());
+        EventBusGetter.getInstance().register(new PlayerEventListener());
 
         bossGroup = new NioEventLoopGroup(1);
         workerGroup = new NioEventLoopGroup(workerGroupCount);
diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/LoginHandler.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/LoginHandler.java
index 9fea76a..771b1c3 100644
--- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/LoginHandler.java
+++ b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/LoginHandler.java
@@ -140,7 +140,7 @@ public class LoginHandler extends AbstractStateHandler implements LoginStateHand
             CS_PlayerMoveEvent event = new CS_PlayerMoveEvent(player, player.getLocation());
             event.setNewLocation(player.getLocation());
             event.setRecalcChunk(true);
-            EventBusGetter.INSTANCE.post(event);
+            EventBusGetter.getInstance().post(event);
         }
     }
 }
diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/PlayHandler.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/PlayHandler.java
index a0cf347..d7636e3 100644
--- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/PlayHandler.java
+++ b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/PlayHandler.java
@@ -85,7 +85,7 @@ public class PlayHandler extends AbstractStateHandler implements PlayStateHandle
                 player.getLocation().getPitch(),
                 player.getLocation().getWorld()
         ));
-        EventBusGetter.INSTANCE.post(event);
+        EventBusGetter.getInstance().post(event);
     }
 
     @Handler