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

Merge pull request #16 from straticspaff/feature/fix-conflicts

Browse Source 
Fixed conflicts
This commit is contained in:
xl3lackout
2022-05-03 21:43:46 -04:00
committed by GitHub
parent 7a115f3d6c 276afbc218
commit ef061ac25d
2 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Erupe/network/mhfpacket/msg_mhf_update_union_item.go
View File

@@ -8,13 +8,6 @@ import (
"github.com/Solenataris/Erupe/network/clientctx" "github.com/Solenataris/Erupe/network/clientctx"
) )
type Item struct {
Unk0 uint32
ItemId uint16
Amount uint16
Unk1 uint32
}
// MsgMhfUpdateUnionItem represents the MSG_MHF_UPDATE_UNION_ITEM // MsgMhfUpdateUnionItem represents the MSG_MHF_UPDATE_UNION_ITEM
type MsgMhfUpdateUnionItem struct { type MsgMhfUpdateUnionItem struct {
AckHandle uint32 AckHandle uint32

8
Erupe/server/channelserver/handlers.go
View File

@@ -4,7 +4,6 @@ import (
"bytes" "bytes"
"encoding/binary" "encoding/binary"
"encoding/hex" "encoding/hex"
"encoding/binary"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
@@ -203,7 +202,7 @@ func logoutPlayer(s *Session) {
if _, exists := s.server.semaphore["hs_l0u3B51J9k3"]; exists { if _, exists := s.server.semaphore["hs_l0u3B51J9k3"]; exists {
if _, ok := s.server.semaphore["hs_l0u3B51J9k3"].reservedClientSlots[s.charID]; ok { if _, ok := s.server.semaphore["hs_l0u3B51J9k3"].reservedClientSlots[s.charID]; ok {
removeSessionFromSemaphore(s) removeSessionFromSemaphore(s)
} }
} }
@@ -407,11 +406,6 @@ func handleMsgMhfAcquireTitle(s *Session, p mhfpacket.MHFPacket) {}
func handleMsgMhfEnumerateTitle(s *Session, p mhfpacket.MHFPacket) {} func handleMsgMhfEnumerateTitle(s *Session, p mhfpacket.MHFPacket) {}
type Item struct {
ItemId uint16
Amount uint16
}
func handleMsgMhfEnumerateUnionItem(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfEnumerateUnionItem(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgMhfEnumerateUnionItem) pkt := p.(*mhfpacket.MsgMhfEnumerateUnionItem)
var boxContents []byte var boxContents []byte