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

Fixed conflicts

Erupe/network/mhfpacket/msg_mhf_update_union_item.go

@@ -8,13 +8,6 @@ import (
 	"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
 type MsgMhfUpdateUnionItem struct {
 	AckHandle uint32

Erupe/server/channelserver/handlers.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"encoding/binary"
 	"encoding/hex"
-	"encoding/binary"
 
 	"fmt"
 	"io/ioutil"
@@ -203,7 +202,7 @@ func logoutPlayer(s *Session) {
 
 	if _, exists := s.server.semaphore["hs_l0u3B51J9k3"]; exists {
 		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) {}
 
-type Item struct {
-	ItemId uint16
-	Amount uint16
-}
-
 func handleMsgMhfEnumerateUnionItem(s *Session, p mhfpacket.MHFPacket) {
 	pkt := p.(*mhfpacket.MsgMhfEnumerateUnionItem)
 	var boxContents []byte