# Conflicts: # core/src/main/java/mc/core/GameLoop.java # proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PlayerEventListener.java
# Conflicts: # core/src/main/java/mc/core/GameLoop.java # proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PlayerEventListener.java