a6f37e8
Branches > main > a6f37e8 > files / src
Pass server directly to run-server!
Commit: a6f37e89697d3ef14014e706bb297859c9ea7621
Parent: 200396e
2 changed files:
src/net/bowmap/server/core.clj view file
@@ -1,8 +1,9 @@ (ns net.bowmap.server.core (:require+ [net.bowmap.server.network.minecraft-server :as mc] [net.bowmap.server.runtime.server :as server] [nrepl.server :as nrepl])) (defn -main [& _args] (spit ".nrepl-port" (req! (nrepl/start-server) :port))- @(server/run-server! :port 25565))+ @(server/run-server! (mc/server :port 25565)))src/net/bowmap/server/runtime/server.clj view file
@@ -2,7 +2,6 @@ (:require [clojure.core.async :refer [<!! chan io-thread put!]] [net.bowmap.server.network.connection :as connection]- [net.bowmap.server.network.minecraft-server :as mc] [net.bowmap.server.protocol.codec :as codec] [net.bowmap.server.protocol.phase :as phase] [net.bowmap.server.runtime.packets :as packets]))@@ -25,12 +24,11 @@ (recur client'))))))) (defn run-server!- "Starts running the Minecraft server.+ "Starts running the given server, where server is a channel of connections. Returns a future that delivers when the server closes."- [& {:keys [& :port :bind-addr] :as args}]- (let [server (mc/server args)]- (future- (loop []- (when-some [connection (<!! server)]- (handle-connection! connection)- (recur))))))+ [server]+ (future+ (loop []+ (when-some [connection (<!! server)]+ (handle-connection! connection)+ (recur)))))