Mirror/Erupe
1
0
Fork 0
mirror of https://github.com/Mezeporta/Erupe.git synced 2025-12-14 07:55:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

critical semaphore bug fix

Browse Source
This commit is contained in:
wish
2022-08-02 01:19:02 +10:00
parent 967fb8f15e
commit a020ad88d0
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/channelserver/handlers_cast_binary.go
View File

@@ -24,7 +24,7 @@ const (
const ( const (
BroadcastTypeTargeted = 0x01 BroadcastTypeTargeted = 0x01
BroadcastTypeStage = 0x03 BroadcastTypeStage = 0x03
BroadcastTypeSemaphore = 0x06 BroadcastTypeServer = 0x06
BroadcastTypeWorld = 0x0a BroadcastTypeWorld = 0x0a
) )
@@ -125,7 +125,7 @@ func handleMsgSysCastBinary(s *Session, p mhfpacket.MHFPacket) {
} else { } else {
s.stage.BroadcastMHF(resp, s) s.stage.BroadcastMHF(resp, s)
} }
case BroadcastTypeSemaphore: case BroadcastTypeServer:
if pkt.MessageType == 1 { if pkt.MessageType == 1 {
raviSema := getRaviSemaphore(s) raviSema := getRaviSemaphore(s)
if raviSema != "" { if raviSema != "" {
@@ -133,11 +133,7 @@ func handleMsgSysCastBinary(s *Session, p mhfpacket.MHFPacket) {
(*sema).BroadcastMHF(resp, s) (*sema).BroadcastMHF(resp, s)
} }
} else { } else {
s.Lock() s.server.BroadcastMHF(resp, s)
if s.stage != nil {
s.stage.BroadcastMHF(resp, s)
}
s.Unlock()
} }
case BroadcastTypeTargeted: case BroadcastTypeTargeted:
for _, targetID := range (*msgBinTargeted).TargetCharIDs { for _, targetID := range (*msgBinTargeted).TargetCharIDs {

2
server/channelserver/sys_channel_server.go
View File

@@ -355,7 +355,7 @@ func (s *Server) BroadcastRaviente(ip uint32, port uint16, stage []byte, _type u
bf.WriteBytes(make([]byte, 17)) bf.WriteBytes(make([]byte, 17))
s.WorldcastMHF(&mhfpacket.MsgSysCastedBinary{ s.WorldcastMHF(&mhfpacket.MsgSysCastedBinary{
CharID: 0x00000000, CharID: 0x00000000,
BroadcastType: BroadcastTypeSemaphore, BroadcastType: BroadcastTypeServer,
MessageType: BinaryMessageTypeChat, MessageType: BinaryMessageTypeChat,
RawDataPayload: bf.Data(), RawDataPayload: bf.Data(),
}, nil) }, nil)