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

Merge branch 'dev/event-bus' into dev/network-api

Browse Source 
# Conflicts:
#	protocol/build.gradle
#	protocol/src/main/java/mc/protocol/NettyServer.java
#	protocol/src/main/java/mc/protocol/PacketInboundHandler.java
#	protocol/src/main/java/mc/protocol/State.java
#	protocol/src/main/java/mc/protocol/di/ProtocolModule.java
#	server/src/main/java/mc/server/Main.java
This commit is contained in:
DmitriyMX
2021-05-06 13:42:01 +03:00
parent 9b183b7d8d c4a6a01908
commit 39996f9847
10 changed files with 99 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
protocol/build.gradle
View File

@@ -1,8 +1,6 @@
apply from: rootDir.toPath().resolve('logic.gradle').toFile()
dependencies {
api libs.reactor
implementation libs.netty
implementation libs.json
implementation libs.objpool