1

server/imserver_new/common/types.go

@@ -83,6 +83,7 @@ type GuildMgr interface {
 	GetGuildByAccountId(string) Guild
 	GetGuildByGuildName(string) Guild
 	GetGuildJob(string) int32
+
 	AsyncCreateGuild(string, string, int32, string, func(int32, string, string))
 	AsyncGetApplyList(int64, string, func(int32, string, int64, []string))
 	AsyncApplyJoin(string, string, func(int32, string))
@@ -117,4 +118,9 @@ type DbLogMgr interface {
 	GuildClearEmptyEnd(string, string)
 	GuildCreateConsumeBegin(string, string, string)
 	GuildCreateConsumeEnd(string, string, string, int32)
+	GuildAccpetApply(string, string, string)
+	GuildLeave(string, string)
+	GuildKickout(string, string, string)
+	GuildSetJob(string, string, int32)
+	GuildDisband(string, string, int32)
 }

server/imserver_new/guild/guildmgr.go

@@ -718,14 +718,16 @@ func (this *guildMgr) AsyncUpdateGuild(accountId string, kv map[int32]string, cb
 
 func (this *guildMgr) NotifyGuildMsg(guildId string, msg proto.Message) {
 	g := this.internalGetGuildByGuildId(guildId)
-	g.traverseMembers(
-		func (m *member) bool {
-			hum := GetPlayerMgr().GetPlayerByAccountId(m.memberId)
-			if hum != nil {
-				hum.SendMsg(msg)
-			}
-			return true
-		})
+	if g != nil {
+		g.traverseMembers(
+			func (m *member) bool {
+				hum := GetPlayerMgr().GetPlayerByAccountId(m.memberId)
+				if hum != nil {
+					hum.SendMsg(msg)
+				}
+				return true
+			})
+	}
 }
 
 func (this *guildMgr) AsyncGetGuildRank(num int32, cb func(int32, string, []string)) {