Minecraft/mc-server
Archived
0
Fork 0
Code Releases Activity

замена переменной INSTANCE на метод getInstance() в EventBusGetter

Browse Source
This commit is contained in:
DmitriyMX
2018-08-17 11:08:13 +03:00
parent aafe91a896
commit a3b40b750a
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/mc/core/GameLoop.java
View File

@@ -76,7 +76,7 @@ public class GameLoop extends Thread {
} }
if (!eventChunkLoad.getNeedLoadChunks().isEmpty()) { if (!eventChunkLoad.getNeedLoadChunks().isEmpty()) {
EventBusGetter.INSTANCE.post(eventChunkLoad); EventBusGetter.getInstance().post(eventChunkLoad);
} }
} }
@@ -90,7 +90,7 @@ public class GameLoop extends Thread {
public void run() { public void run() {
TPS_WATCHER.startWatch(); TPS_WATCHER.startWatch();
EventBusGetter.INSTANCE.register(this); EventBusGetter.getInstance().register(this);
while (!isInterrupted()) { while (!isInterrupted()) {
TPS_WATCHER.check(); TPS_WATCHER.check();

4
core/src/main/java/mc/core/eventbus/EventBusGetter.java
View File

@@ -5,9 +5,11 @@
package mc.core.eventbus; package mc.core.eventbus;
import com.google.common.eventbus.EventBus; import com.google.common.eventbus.EventBus;
import lombok.Getter;
public final class EventBusGetter { public final class EventBusGetter {
public static final EventBus INSTANCE = new EventBus(); @Getter
private static final EventBus instance = new EventBus();
private EventBusGetter() { private EventBusGetter() {
} }

2
proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/NettyServer.java
View File

@@ -64,7 +64,7 @@ public class NettyServer implements Server {
public void start() throws StartServerException { public void start() throws StartServerException {
log.info("Use protocol {}", StatusResponsePacket.NAME); log.info("Use protocol {}", StatusResponsePacket.NAME);
EventBusGetter.INSTANCE.register(new PlayerEventListener()); EventBusGetter.getInstance().register(new PlayerEventListener());
bossGroup = new NioEventLoopGroup(1); bossGroup = new NioEventLoopGroup(1);
workerGroup = new NioEventLoopGroup(workerGroupCount); workerGroup = new NioEventLoopGroup(workerGroupCount);

2
proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/LoginHandler.java
View File

@@ -140,7 +140,7 @@ public class LoginHandler extends AbstractStateHandler implements LoginStateHand
CS_PlayerMoveEvent event = new CS_PlayerMoveEvent(player, player.getLocation()); CS_PlayerMoveEvent event = new CS_PlayerMoveEvent(player, player.getLocation());
event.setNewLocation(player.getLocation()); event.setNewLocation(player.getLocation());
event.setRecalcChunk(true); event.setRecalcChunk(true);
EventBusGetter.INSTANCE.post(event); EventBusGetter.getInstance().post(event);
} }
} }
} }

2
proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/PlayHandler.java
View File

@@ -85,7 +85,7 @@ public class PlayHandler extends AbstractStateHandler implements PlayStateHandle
player.getLocation().getPitch(), player.getLocation().getPitch(),
player.getLocation().getWorld() player.getLocation().getWorld()
)); ));
EventBusGetter.INSTANCE.post(event); EventBusGetter.getInstance().post(event);
} }
@Handler @Handler