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

unfinished draft

Browse Source
This commit is contained in:
wish
2024-08-21 21:04:52 +10:00
parent 7d760bd3b4
commit c8d3fc3ead
17 changed files with 484 additions and 820 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
server/channelserver/handlers_house.go
View File

@@ -75,18 +75,18 @@ func handleMsgMhfEnumerateHouse(s *Session, p mhfpacket.MHFPacket) {
}
}
case 2:
guild, err := GetGuildInfoByCharacterId(s, s.charID)
if err != nil || guild == nil {
guild := GetGuildInfoByCharacterId(s, s.charID)
if guild.ID == 0 {
break
}
guildMembers, err := GetGuildMembers(s, guild.ID, false)
if err != nil {
guildMembers := GetGuildMembers(s, guild.ID)
if len(guildMembers) == 0 {
break
}
for _, member := range guildMembers {
house := HouseData{}
row := s.server.db.QueryRowx(houseQuery, member.CharID)
err = row.StructScan(&house)
err := row.StructScan(&house)
if err == nil {
houses = append(houses, house)
}
@@ -176,12 +176,11 @@ func handleMsgMhfLoadHouse(s *Session, p mhfpacket.MHFPacket) {
// Guild verification
if state > 3 {
ownGuild, err := GetGuildInfoByCharacterId(s, s.charID)
isApplicant, _ := ownGuild.HasApplicationForCharID(s, s.charID)
if err == nil && ownGuild != nil {
othersGuild, err := GetGuildInfoByCharacterId(s, pkt.CharID)
if err == nil && othersGuild != nil {
if othersGuild.ID == ownGuild.ID && !isApplicant {
ownGuild := GetGuildInfoByCharacterId(s, s.charID)
if ownGuild.ID != 0 && !IsGuildApplicant(s, s.charID) {
othersGuild := GetGuildInfoByCharacterId(s, pkt.CharID)
if othersGuild.ID != 0 && !IsGuildApplicant(s, pkt.CharID) {
if othersGuild.ID == ownGuild.ID {
allowed = true
}
}