Mirror/Erupe
1
0
Fork 0
mirror of https://github.com/Mezeporta/Erupe.git synced 2025-12-16 17:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix perpetual stage lock

Browse Source 
Cleanup
This commit is contained in:
Sophie
2020-03-09 07:37:16 +00:00
parent 9710f1cc43
commit 83becc4c84
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
server/channelserver/handlers.go
View File

@@ -208,16 +208,16 @@ const (
func handleMsgSysCastBinary(s *Session, p mhfpacket.MHFPacket) { func handleMsgSysCastBinary(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgSysCastBinary) pkt := p.(*mhfpacket.MsgSysCastBinary)
resp := &mhfpacket.MsgSysCastedBinary{
CharID: s.charID,
Type0: pkt.Type0,
Type1: pkt.Type1,
RawDataPayload: pkt.RawDataPayload,
}
if pkt.Type1 == BINARY_MESSAGE_TYPE_CHAT { if pkt.Type1 == BINARY_MESSAGE_TYPE_CHAT {
fmt.Println("Got chat message!") fmt.Println("Got chat message!")
resp := &mhfpacket.MsgSysCastedBinary{
CharID: s.charID,
Type0: pkt.Type0,
Type1: pkt.Type1,
RawDataPayload: pkt.RawDataPayload,
}
switch chatType := pkt.RawDataPayload[2]; chatType { switch chatType := pkt.RawDataPayload[2]; chatType {
case CHAT_TYPE_WORLD: case CHAT_TYPE_WORLD:
s.server.BroadcastMHF(resp, s) s.server.BroadcastMHF(resp, s)
@@ -268,12 +268,6 @@ func handleMsgSysCastBinary(s *Session, p mhfpacket.MHFPacket) {
// Simply forward the packet to all the other clients. // Simply forward the packet to all the other clients.
// (The client never uses Type0 upon receiving) // (The client never uses Type0 upon receiving)
// TODO(Andoryuuta): Does this broadcast need to be limited? (world, stage, guild, etc). // TODO(Andoryuuta): Does this broadcast need to be limited? (world, stage, guild, etc).
resp := &mhfpacket.MsgSysCastedBinary{
CharID: s.charID,
Type0: pkt.Type0,
Type1: pkt.Type1,
RawDataPayload: pkt.RawDataPayload,
}
s.server.BroadcastMHF(resp, s) s.server.BroadcastMHF(resp, s)
} }
} }
@@ -608,7 +602,6 @@ func handleMsgSysReserveStage(s *Session, p mhfpacket.MHFPacket) {
s.QueueAck(pkt.AckHandle, []byte{0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}) s.QueueAck(pkt.AckHandle, []byte{0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00})
} }
stage.RLock()
for _, charID := range stage.clients { for _, charID := range stage.clients {
if charID == s.charID { if charID == s.charID {
continue continue
@@ -621,7 +614,6 @@ func handleMsgSysReserveStage(s *Session, p mhfpacket.MHFPacket) {
Unk1: 0x01, Unk1: 0x01,
}) })
} }
stage.RUnlock()
// Notify players in room that player has joined a party // Notify players in room that player has joined a party
s.stage.BroadcastMHF(&binpacket.MsgBinPlayerJoinedParty{ s.stage.BroadcastMHF(&binpacket.MsgBinPlayerJoinedParty{