From b0117a11adf8b673c496b791a7ae8f0e3ed9b084 Mon Sep 17 00:00:00 2001
From: kercylan98 <kercylan@gmail.com>
Date: Wed, 19 Apr 2023 18:12:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E6=8E=A5=E6=94=B6=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=8C=85=E4=BA=8B=E4=BB=B6=E5=90=8D=E7=A7=B0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/event.go  | 22 +++++++++++-----------
 server/server.go |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/server/event.go b/server/event.go
index 0ab17d1..d61d765 100644
--- a/server/event.go
+++ b/server/event.go
@@ -5,15 +5,15 @@ import (
 	"minotaur/utils/log"
 )
 
-type ReceivePacketEventHandle func(conn *Conn, packet []byte)
+type ConnectionReceivePacketEventHandle func(conn *Conn, packet []byte)
 type ConnectionOpenedEventHandle func(conn *Conn)
 type ConnectionClosedEventHandle func(conn *Conn)
 
 type event struct {
 	*Server
-	receivePacketEventHandles    []ReceivePacketEventHandle
-	connectionOpenedEventHandles []ConnectionOpenedEventHandle
-	connectionClosedEventHandles []ConnectionClosedEventHandle
+	connectionReceivePacketEventHandles []ConnectionReceivePacketEventHandle
+	connectionOpenedEventHandles        []ConnectionOpenedEventHandle
+	connectionClosedEventHandles        []ConnectionClosedEventHandle
 }
 
 // RegConnectionClosedEvent 在连接关闭后将立刻执行被注册的事件处理函数
@@ -44,22 +44,22 @@ func (slf *event) OnConnectionOpenedEvent(conn *Conn) {
 	}
 }
 
-// RegReceivePacketEvent 在接收到数据包时将立刻执行被注册的事件处理函数
-func (slf *event) RegReceivePacketEvent(handle ReceivePacketEventHandle) {
+// RegConnectionReceivePacketEvent 在接收到数据包时将立刻执行被注册的事件处理函数
+func (slf *event) RegConnectionReceivePacketEvent(handle ConnectionReceivePacketEventHandle) {
 	if slf.network == NetworkHttp {
 		panic(ErrNetworkIncompatibleHttp)
 	}
-	slf.receivePacketEventHandles = append(slf.receivePacketEventHandles, handle)
+	slf.connectionReceivePacketEventHandles = append(slf.connectionReceivePacketEventHandles, handle)
 }
 
-func (slf *event) OnReceivePacketEvent(conn *Conn, packet []byte) {
-	for _, handle := range slf.receivePacketEventHandles {
+func (slf *event) OnConnectionReceivePacketEvent(conn *Conn, packet []byte) {
+	for _, handle := range slf.connectionReceivePacketEventHandles {
 		handle(conn, packet)
 	}
 }
 
 func (slf *event) check() {
-	if len(slf.receivePacketEventHandles) == 0 {
-		log.Warn("Server", zap.String("ReceivePacketEvent", "Invalid server, no packets processed"))
+	if len(slf.connectionReceivePacketEventHandles) == 0 {
+		log.Warn("Server", zap.String("ConnectionReceivePacketEvent", "Invalid server, no packets processed"))
 	}
 }
diff --git a/server/server.go b/server/server.go
index 89512cb..8620a9e 100644
--- a/server/server.go
+++ b/server/server.go
@@ -186,7 +186,7 @@ func (slf *Server) dispatchMessage(msg *message) {
 	switch msg.t {
 	case MessageTypePacket:
 		conn, packet := msg.t.deconstructPacket(msg.attrs...)
-		slf.OnReceivePacketEvent(conn, packet)
+		slf.OnConnectionReceivePacketEvent(conn, packet)
 	case MessageTypeError:
 		err, action := msg.t.deconstructError(msg.attrs...)
 		switch action {