Merge branch 'refs/heads/main' into feature/hunting-tournament

fix EnumerateOrder
fix EnumerateOrder & TournamentEvent struct
2025-12-13 15:34:38 +01:00 · 2024-06-25 22:51:21 +10:00 · 2024-06-25 22:24:44 +10:00 · 2024-06-25 21:49:41 +10:00 · 2024-06-25 21:04:51 +10:00 · 2024-06-25 21:00:47 +10:00
41 changed files with 388 additions and 632 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -1 +0,0 @@
-bin/
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -10,17 +10,16 @@ on:
      - 'go.mod'
      - 'go.sum'
      - 'main.go'
-      - '.github/workflows/go.yml'

 jobs:
  build:
    runs-on: ubuntu-latest
    
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3

    - name: Set up Go
-      uses: actions/setup-go@v5
+      uses: actions/setup-go@v3
      with:
        go-version: '1.21'

@@ -28,7 +27,7 @@ jobs:
      run: env GOOS=linux GOARCH=amd64 go build -v
        
    - name: Upload Linux-amd64 artifacts
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
      with:
        name: Linux-amd64
        path: |
@@ -43,7 +42,7 @@ jobs:
      run: env GOOS=windows GOARCH=amd64 go build -v
      
    - name: Upload Windows-amd64 artifacts
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
      with:
        name: Windows-amd64
        path: |
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ If you want to modify or compile Erupe yourself, please read on.
 ## Installation

 1. Bring up a fresh database by using the [backup file attached with the latest release](https://github.com/ZeruLight/Erupe/releases/latest/download/SCHEMA.sql).
-2. Run each script under [patch-schema](./schemas/patch-schema) as they introduce newer schema.
+2. Run each script under [patch-schema](./patch-schema) as they introduce newer schema.
 3. Edit [config.json](./config.json) such that the database password matches your PostgreSQL setup.
 4. Run `go build` or `go run .` to compile Erupe.

--- a/common/stringsupport/string_convert.go
+++ b/common/stringsupport/string_convert.go
@@ -29,23 +29,6 @@ func SJISToUTF8(b []byte) string {
 	return string(result)
 }

-func ToNGWord(x string) []uint16 {
-	var w []uint16
-	for _, r := range []rune(x) {
-		if r > 0xFF {
-			t := UTF8ToSJIS(string(r))
-			if len(t) > 1 {
-				w = append(w, uint16(t[1])<<8|uint16(t[0]))
-			} else {
-				w = append(w, uint16(t[0]))
-			}
-		} else {
-			w = append(w, uint16(r))
-		}
-	}
-	return w
-}
-
 func PaddedString(x string, size uint, t bool) []byte {
 	if t {
 		e := japanese.ShiftJIS.NewEncoder()
--- a/config.json
+++ b/config.json
@@ -21,7 +21,6 @@
  "QuestCacheExpiry": 300,
  "CommandPrefix": "!",
  "AutoCreateAccount": true,
-  "LoopDelay": 50,
  "DefaultCourses": [1, 23, 24],
  "EarthStatus": 0,
  "EarthID": 0,
@@ -170,11 +169,6 @@
      "Enabled": true,
      "Description": "Toggle the Quest timer",
      "Prefix": "timer"
-    }, {
-      "Name": "Playtime",
-      "Enabled": true,
-      "Description": "Show your playtime",
-      "Prefix": "playtime"
    }
  ],
  "Courses": [
--- a/config/config.go
+++ b/config/config.go
@@ -81,7 +81,6 @@ type Config struct {
 	QuestCacheExpiry       int    // Number of seconds to keep quest data cached
 	CommandPrefix          string // The prefix for commands
 	AutoCreateAccount      bool   // Automatically create accounts if they don't exist
-	LoopDelay              int    // Delay in milliseconds between each loop iteration
 	DefaultCourses         []uint16
 	EarthStatus            int32
 	EarthID                int32
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,7 +1,7 @@
 # Docker for erupe

 ## Building the container
-Run the following from the route of the source folder. In this example we give it the tag of dev to seperate it from any other container verions. 
+Run the following from the route of the soruce folder. In this example we give it the tag of dev to seperate it from any other container verions. 
 ```bash
 docker build . -t erupe:dev
 ```
@@ -64,7 +64,3 @@ if you want all the logs and you want it to be in an attached state
 ```bash
 docker-compose up
 ```
-
-
-# Troubleshooting
-Q: My Postgres will not populate. A: You're setup.sh is maybe saved as CRLF it needs to be saved as LF. 
--- a/erupe.ico
+++ b/erupe.ico
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module erupe-ce

-go 1.24.0
+go 1.21

 require (
 	github.com/bwmarrin/discordgo v0.27.1
@@ -10,9 +10,9 @@ require (
 	github.com/lib/pq v1.10.9
 	github.com/spf13/viper v1.17.0
 	go.uber.org/zap v1.26.0
-	golang.org/x/crypto v0.45.0
+	golang.org/x/crypto v0.17.0
 	golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa
-	golang.org/x/text v0.31.0
+	golang.org/x/text v0.14.0
 )

 require (
@@ -31,8 +31,8 @@ require (
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/net v0.47.0 // indirect
-	golang.org/x/sys v0.38.0 // indirect
+	golang.org/x/net v0.18.0 // indirect
+	golang.org/x/sys v0.15.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -220,8 +220,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
-golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
+golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
+golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -289,8 +289,8 @@ golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
-golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
+golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg=
+golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -345,8 +345,8 @@ golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
-golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
+golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -356,8 +356,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
-golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
--- a/network/mhfpacket/msg_mhf_acquire_cafe_item.go
+++ b/network/mhfpacket/msg_mhf_acquire_cafe_item.go
@@ -31,7 +31,7 @@ func (m *MsgMhfAcquireCafeItem) Parse(bf *byteframe.ByteFrame, ctx *clientctx.Cl
 	m.ItemType = bf.ReadUint16()
 	m.ItemID = bf.ReadUint16()
 	m.Quant = bf.ReadUint16()
-	if _config.ErupeConfig.RealClientMode >= _config.G6 {
+	if _config.ErupeConfig.RealClientMode >= _config.G1 {
 		m.PointCost = bf.ReadUint32()
 	} else {
 		m.PointCost = uint32(bf.ReadUint16())
--- a/network/mhfpacket/msg_mhf_enumerate_order.go
+++ b/network/mhfpacket/msg_mhf_enumerate_order.go
@@ -1,18 +1,18 @@
 package mhfpacket

-import ( 
- "errors" 
+import (
+	"errors"

- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )

 // MsgMhfEnumerateOrder represents the MSG_MHF_ENUMERATE_ORDER
 type MsgMhfEnumerateOrder struct {
 	AckHandle uint32
-	Unk0      uint32
-	Unk1      uint32
+	EventID   uint32
+	ClanID    uint32
 }

 // Opcode returns the ID associated with this packet type.
@@ -23,8 +23,8 @@ func (m *MsgMhfEnumerateOrder) Opcode() network.PacketID {
 // Parse parses the packet from binary
 func (m *MsgMhfEnumerateOrder) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
 	m.AckHandle = bf.ReadUint32()
-	m.Unk0 = bf.ReadUint32()
-	m.Unk1 = bf.ReadUint32()
+	m.EventID = bf.ReadUint32()
+	m.ClanID = bf.ReadUint32()
 	return nil
 }

--- a/network/mhfpacket/msg_mhf_stampcard_stamp.go
+++ b/network/mhfpacket/msg_mhf_stampcard_stamp.go
@@ -37,16 +37,13 @@ func (m *MsgMhfStampcardStamp) Parse(bf *byteframe.ByteFrame, ctx *clientctx.Cli
 	}
 	m.Stamps = bf.ReadUint16()
 	bf.ReadUint16() // Zeroed
-	if _config.ErupeConfig.RealClientMode >= _config.Z2 {
+	if _config.ErupeConfig.RealClientMode > _config.Z1 {
 		m.Reward1 = uint16(bf.ReadUint32())
 		m.Reward2 = uint16(bf.ReadUint32())
 		m.Item1 = uint16(bf.ReadUint32())
 		m.Item2 = uint16(bf.ReadUint32())
 		m.Quantity1 = uint16(bf.ReadUint32())
 		m.Quantity2 = uint16(bf.ReadUint32())
-	} else {
-		m.Reward1 = 10
-		m.Reward2 = 10
 	}
 	return nil
 }
--- a/rsrc_windows_amd64.syso
+++ b/rsrc_windows_amd64.syso
--- a/schemas/bundled-schema/NetcafeDefaults.sql
+++ b/schemas/bundled-schema/NetcafeDefaults.sql
@@ -1,15 +1,13 @@
 BEGIN;

-TRUNCATE public.cafebonus;
-
 INSERT INTO public.cafebonus (time_req, item_type, item_id, quantity)
 VALUES
-    (1800, 17, 0, 50),
-    (3600, 17, 0, 100),
-    (7200, 17, 0, 200),
-    (10800, 17, 0, 300),
-    (18000, 17, 0, 350),
-    (28800, 17, 0, 500),
-    (43200, 17, 0, 500);
+    (1800, 17, 0, 250),
+    (3600, 17, 0, 500),
+    (7200, 17, 0, 1000),
+    (10800, 17, 0, 1500),
+    (18000, 17, 0, 1750),
+    (28800, 17, 0, 3000),
+    (43200, 17, 0, 4000);

 END;
--- a/schemas/patch-schema/23-rework-distributions-2.sql
+++ b/schemas/patch-schema/23-rework-distributions-2.sql
@@ -1,6 +0,0 @@
-BEGIN;
-
-ALTER TABLE distribution ADD COLUMN rights INTEGER;
-ALTER TABLE distribution ADD COLUMN selection BOOLEAN;
-
-END;
--- a/schemas/patch-schema/25-fix-rasta-id.sql
+++ b/schemas/patch-schema/25-fix-rasta-id.sql
@@ -1,5 +0,0 @@
-BEGIN;
-
-CREATE SEQUENCE IF NOT EXISTS public.rasta_id_seq;
-
-END;
--- a/schemas/patch-schema/26-fix-mail.sql
+++ b/schemas/patch-schema/26-fix-mail.sql
@@ -1,5 +0,0 @@
-BEGIN;
-
-ALTER TABLE mail ADD COLUMN IF NOT EXISTS is_sys_message BOOLEAN NOT NULL DEFAULT false;
-
-END;
--- a/schemas/patch-schema/24-fix-weekly-stamps.sql
+++ b/schemas/patch-schema/24-fix-weekly-stamps.sql
@@ -3,4 +3,4 @@ BEGIN;
 ALTER TABLE IF EXISTS public.stamps RENAME hl_next TO hl_checked;
 ALTER TABLE IF EXISTS public.stamps RENAME ex_next TO ex_checked;

-END;
+END;
--- a/server/channelserver/handlers.go
+++ b/server/channelserver/handlers.go
@@ -88,7 +88,7 @@ func updateRights(s *Session) {
 		Rights:              s.courses,
 		UnkSize:             0,
 	}
-	s.QueueSendMHFNonBlocking(update)
+	s.QueueSendMHF(update)
 }

 func handleMsgHead(s *Session, p mhfpacket.MHFPacket) {}
@@ -143,6 +143,7 @@ func handleMsgSysLogin(s *Session, p mhfpacket.MHFPacket) {
 	s.token = pkt.LoginTokenString
 	s.Unlock()

+	updateRights(s)
 	bf := byteframe.NewByteFrame()
 	bf.WriteUint32(uint32(TimeAdjusted().Unix())) // Unix timestamp

@@ -192,7 +193,7 @@ func logoutPlayer(s *Session) {
 			for _, sess := range s.server.sessions {
 				for rSlot := range stage.reservedClientSlots {
 					if sess.charID == rSlot && sess.stage != nil && sess.stage.id[3:5] != "Qs" {
-						sess.QueueSendMHFNonBlocking(&mhfpacket.MsgSysStageDestruct{})
+						sess.QueueSendMHF(&mhfpacket.MsgSysStageDestruct{})
 					}
 				}
 			}
@@ -810,11 +811,6 @@ func handleMsgMhfEnumeratePrice(s *Session, p mhfpacket.MHFPacket) {
 	doAckBufSucceed(s, pkt.AckHandle, bf.Data())
 }

-func handleMsgMhfEnumerateOrder(s *Session, p mhfpacket.MHFPacket) {
-	pkt := p.(*mhfpacket.MsgMhfEnumerateOrder)
-	stubEnumerateNoResults(s, pkt.AckHandle)
-}
-
 func handleMsgMhfGetExtraInfo(s *Session, p mhfpacket.MHFPacket) {}

 func userGetItems(s *Session) []mhfitem.MHFItemStack {
@@ -1050,58 +1046,32 @@ func handleMsgMhfUpdateEtcPoint(s *Session, p mhfpacket.MHFPacket) {

 func handleMsgMhfStampcardStamp(s *Session, p mhfpacket.MHFPacket) {
 	pkt := p.(*mhfpacket.MsgMhfStampcardStamp)
-
-	rewards := []struct {
-		HR        uint16
-		Item1     uint16
-		Quantity1 uint16
-		Item2     uint16
-		Quantity2 uint16
-	}{
-		{0, 6164, 1, 6164, 2},
-		{50, 6164, 2, 6164, 3},
-		{100, 6164, 3, 5392, 1},
-		{300, 5392, 1, 5392, 3},
-		{999, 5392, 1, 5392, 4},
-	}
-	if _config.ErupeConfig.RealClientMode <= _config.Z1 {
-		for _, reward := range rewards {
-			if pkt.HR >= reward.HR {
-				pkt.Item1 = reward.Item1
-				pkt.Quantity1 = reward.Quantity1
-				pkt.Item2 = reward.Item2
-				pkt.Quantity2 = reward.Quantity2
-			}
-		}
-	}
-
 	bf := byteframe.NewByteFrame()
 	bf.WriteUint16(pkt.HR)
+	var stamps uint16
+	_ = s.server.db.QueryRow(`SELECT stampcard FROM characters WHERE id = $1`, s.charID).Scan(&stamps)
 	if _config.ErupeConfig.RealClientMode >= _config.G1 {
 		bf.WriteUint16(pkt.GR)
 	}
-	var stamps, rewardTier, rewardUnk uint16
-	reward := mhfitem.MHFItemStack{Item: mhfitem.MHFItem{}}
-	s.server.db.QueryRow(`UPDATE characters SET stampcard = stampcard + $1 WHERE id = $2 RETURNING stampcard`, pkt.Stamps, s.charID).Scan(&stamps)
-	bf.WriteUint16(stamps - pkt.Stamps)
 	bf.WriteUint16(stamps)
-
-	if stamps/30 > (stamps-pkt.Stamps)/30 {
-		rewardTier = 2
-		rewardUnk = pkt.Reward2
-		reward = mhfitem.MHFItemStack{Item: mhfitem.MHFItem{ItemID: pkt.Item2}, Quantity: pkt.Quantity2}
-		addWarehouseItem(s, reward)
-	} else if stamps/15 > (stamps-pkt.Stamps)/15 {
-		rewardTier = 1
-		rewardUnk = pkt.Reward1
-		reward = mhfitem.MHFItemStack{Item: mhfitem.MHFItem{ItemID: pkt.Item1}, Quantity: pkt.Quantity1}
-		addWarehouseItem(s, reward)
+	stamps += pkt.Stamps
+	bf.WriteUint16(stamps)
+	s.server.db.Exec(`UPDATE characters SET stampcard = $1 WHERE id = $2`, stamps, s.charID)
+	if stamps%30 == 0 {
+		bf.WriteUint16(2)
+		bf.WriteUint16(pkt.Reward2)
+		bf.WriteUint16(pkt.Item2)
+		bf.WriteUint16(pkt.Quantity2)
+		addWarehouseItem(s, mhfitem.MHFItemStack{Item: mhfitem.MHFItem{ItemID: pkt.Item2}, Quantity: pkt.Quantity2})
+	} else if stamps%15 == 0 {
+		bf.WriteUint16(1)
+		bf.WriteUint16(pkt.Reward1)
+		bf.WriteUint16(pkt.Item1)
+		bf.WriteUint16(pkt.Quantity1)
+		addWarehouseItem(s, mhfitem.MHFItemStack{Item: mhfitem.MHFItem{ItemID: pkt.Item1}, Quantity: pkt.Quantity1})
+	} else {
+		bf.WriteBytes(make([]byte, 8))
 	}
-
-	bf.WriteUint16(rewardTier)
-	bf.WriteUint16(rewardUnk)
-	bf.WriteUint16(reward.Item.ItemID)
-	bf.WriteUint16(reward.Quantity)
 	doAckBufSucceed(s, pkt.AckHandle, bf.Data())
 }

--- a/server/channelserver/handlers_cafe.go
+++ b/server/channelserver/handlers_cafe.go
@@ -166,7 +166,7 @@ func handleMsgMhfReceiveCafeDurationBonus(s *Session, p mhfpacket.MHFPacket) {
 		FROM characters ch
 		WHERE ch.id = $1 
 	) >= time_req`, s.charID, TimeAdjusted().Unix()-s.sessionStart)
-	if err != nil || !mhfcourse.CourseExists(30, s.courses) {
+	if err != nil {
 		doAckBufSucceed(s, pkt.AckHandle, bf.Data())
 	} else {
 		for rows.Next() {
--- a/server/channelserver/handlers_cast_binary.go
+++ b/server/channelserver/handlers_cast_binary.go
@@ -82,7 +82,7 @@ func sendServerChatMessage(s *Session, message string) {
 		RawDataPayload: bf.Data(),
 	}

-	s.QueueSendMHFNonBlocking(castedBin)
+	s.QueueSendMHF(castedBin)
 }

 func parseChatCommand(s *Session, command string) {
@@ -198,7 +198,7 @@ func parseChatCommand(s *Session, command string) {
 				temp.Build(deleteNotif, s.clientContext)
 			}
 			deleteNotif.WriteUint16(uint16(network.MSG_SYS_END))
-			s.QueueSendNonBlocking(deleteNotif.Data())
+			s.QueueSend(deleteNotif.Data())
 			time.Sleep(500 * time.Millisecond)
 			reloadNotif := byteframe.NewByteFrame()
 			for _, session := range s.server.sessions {
@@ -233,7 +233,7 @@ func parseChatCommand(s *Session, command string) {
 				temp.Build(reloadNotif, s.clientContext)
 			}
 			reloadNotif.WriteUint16(uint16(network.MSG_SYS_END))
-			s.QueueSendNonBlocking(reloadNotif.Data())
+			s.QueueSend(reloadNotif.Data())
 		} else {
 			sendDisabledCommandMessage(s, commands["Reload"])
 		}
@@ -381,7 +381,7 @@ func parseChatCommand(s *Session, command string) {
 				payload.WriteInt16(int16(x)) // X
 				payload.WriteInt16(int16(y)) // Y
 				payloadBytes := payload.Data()
-				s.QueueSendMHFNonBlocking(&mhfpacket.MsgSysCastedBinary{
+				s.QueueSendMHF(&mhfpacket.MsgSysCastedBinary{
 					CharID:         s.charID,
 					MessageType:    BinaryMessageTypeState,
 					RawDataPayload: payloadBytes,
@@ -407,13 +407,6 @@ func parseChatCommand(s *Session, command string) {
 		} else {
 			sendDisabledCommandMessage(s, commands["Discord"])
 		}
-	case commands["Playtime"].Prefix:
-		if commands["Playtime"].Enabled || s.isOp() {
-			playtime := s.playtime + uint32(time.Now().Sub(s.playtimeTime).Seconds())
-			sendServerChatMessage(s, fmt.Sprintf(s.server.i18n.commands.playtime, playtime/60/60, playtime/60%60, playtime%60))
-		} else {
-			sendDisabledCommandMessage(s, commands["Playtime"])
-		}
 	case commands["Help"].Prefix:
 		if commands["Help"].Enabled || s.isOp() {
 			for _, command := range commands {
@@ -539,7 +532,7 @@ func handleMsgSysCastBinary(s *Session, p mhfpacket.MHFPacket) {
 			char := s.server.FindSessionByCharID(targetID)

 			if char != nil {
-				char.QueueSendMHFNonBlocking(resp)
+				char.QueueSendMHF(resp)
 			}
 		}
 	default:
--- a/server/channelserver/handlers_character.go
+++ b/server/channelserver/handlers_character.go
@@ -23,7 +23,6 @@ const (
 	pGalleryData          // +1748
 	pToreData             // +240
 	pGardenData           // +68
-	pPlaytime             // +4
 	pWeaponType           // +1
 	pWeaponID             // +2
 	pHR                   // +2
@@ -46,7 +45,6 @@ type CharacterSaveData struct {
 	GalleryData   []byte
 	ToreData      []byte
 	GardenData    []byte
-	Playtime      uint32
 	WeaponType    uint8
 	WeaponID      uint16
 	HR            uint16
@@ -61,7 +59,6 @@ func getPointers() map[SavePointer]int {
 	pointers := map[SavePointer]int{pGender: 81, lBookshelfData: 5576}
 	switch _config.ErupeConfig.RealClientMode {
 	case _config.ZZ:
-		pointers[pPlaytime] = 128356
 		pointers[pWeaponID] = 128522
 		pointers[pWeaponType] = 128789
 		pointers[pHouseTier] = 129900
@@ -77,7 +74,6 @@ func getPointers() map[SavePointer]int {
 	case _config.Z2, _config.Z1, _config.G101, _config.G10, _config.G91, _config.G9, _config.G81, _config.G8,
 		_config.G7, _config.G61, _config.G6, _config.G52, _config.G51, _config.G5, _config.GG, _config.G32, _config.G31,
 		_config.G3, _config.G2, _config.G1:
-		pointers[pPlaytime] = 92356
 		pointers[pWeaponID] = 92522
 		pointers[pWeaponType] = 92789
 		pointers[pHouseTier] = 93900
@@ -91,7 +87,6 @@ func getPointers() map[SavePointer]int {
 		pointers[pRP] = 106614
 		pointers[pKQF] = 110720
 	case _config.F5, _config.F4:
-		pointers[pPlaytime] = 60356
 		pointers[pWeaponID] = 60522
 		pointers[pWeaponType] = 60789
 		pointers[pHouseTier] = 61900
@@ -103,7 +98,6 @@ func getPointers() map[SavePointer]int {
 		pointers[pGardenData] = 74424
 		pointers[pRP] = 74614
 	case _config.S6:
-		pointers[pPlaytime] = 12356
 		pointers[pWeaponID] = 12522
 		pointers[pWeaponType] = 12789
 		pointers[pHouseTier] = 13900
@@ -237,7 +231,6 @@ func (save *CharacterSaveData) updateStructWithSaveData() {
 			save.GalleryData = save.decompSave[save.Pointers[pGalleryData] : save.Pointers[pGalleryData]+1748]
 			save.ToreData = save.decompSave[save.Pointers[pToreData] : save.Pointers[pToreData]+240]
 			save.GardenData = save.decompSave[save.Pointers[pGardenData] : save.Pointers[pGardenData]+68]
-			save.Playtime = binary.LittleEndian.Uint32(save.decompSave[save.Pointers[pPlaytime] : save.Pointers[pPlaytime]+4])
 			save.WeaponType = save.decompSave[save.Pointers[pWeaponType]]
 			save.WeaponID = binary.LittleEndian.Uint16(save.decompSave[save.Pointers[pWeaponID] : save.Pointers[pWeaponID]+2])
 			save.HR = binary.LittleEndian.Uint16(save.decompSave[save.Pointers[pHR] : save.Pointers[pHR]+2])
--- a/server/channelserver/handlers_data.go
+++ b/server/channelserver/handlers_data.go
@@ -54,9 +54,6 @@ func handleMsgMhfSavedata(s *Session, p mhfpacket.MHFPacket) {
 	}
 	characterSaveData.updateStructWithSaveData()

-	s.playtime = characterSaveData.Playtime
-	s.playtimeTime = time.Now()
-
 	// Bypass name-checker if new
 	if characterSaveData.IsNewCharacter == true {
 		s.Name = characterSaveData.Name
--- a/server/channelserver/handlers_distitem.go
+++ b/server/channelserver/handlers_distitem.go
@@ -13,7 +13,6 @@ import (
 type Distribution struct {
 	ID              uint32    `db:"id"`
 	Deadline        time.Time `db:"deadline"`
-	Rights          uint32    `db:"rights"`
 	TimesAcceptable uint16    `db:"times_acceptable"`
 	TimesAccepted   uint16    `db:"times_accepted"`
 	MinHR           int16     `db:"min_hr"`
@@ -24,7 +23,7 @@ type Distribution struct {
 	MaxGR           int16     `db:"max_gr"`
 	EventName       string    `db:"event_name"`
 	Description     string    `db:"description"`
-	Selection       bool      `db:"selection"`
+	Data            []byte    `db:"data"`
 }

 func handleMsgMhfEnumerateDistItem(s *Session, p mhfpacket.MHFPacket) {
@@ -33,7 +32,7 @@ func handleMsgMhfEnumerateDistItem(s *Session, p mhfpacket.MHFPacket) {
 	var itemDists []Distribution
 	bf := byteframe.NewByteFrame()
 	rows, err := s.server.db.Queryx(`
-		SELECT d.id, event_name, description, COALESCE(rights, 0) AS rights, COALESCE(selection, false) AS selection, times_acceptable,
+		SELECT d.id, event_name, description, times_acceptable,
 		COALESCE(min_hr, -1) AS min_hr, COALESCE(max_hr, -1) AS max_hr,
 		COALESCE(min_sr, -1) AS min_sr, COALESCE(max_sr, -1) AS max_sr,
 		COALESCE(min_gr, -1) AS min_gr, COALESCE(max_gr, -1) AS max_gr,
@@ -61,7 +60,7 @@ func handleMsgMhfEnumerateDistItem(s *Session, p mhfpacket.MHFPacket) {
 	for _, dist := range itemDists {
 		bf.WriteUint32(dist.ID)
 		bf.WriteUint32(uint32(dist.Deadline.Unix()))
-		bf.WriteUint32(dist.Rights)
+		bf.WriteUint32(0) // Unk
 		bf.WriteUint16(dist.TimesAcceptable)
 		bf.WriteUint16(dist.TimesAccepted)
 		if _config.ErupeConfig.RealClientMode >= _config.G9 {
@@ -80,11 +79,7 @@ func handleMsgMhfEnumerateDistItem(s *Session, p mhfpacket.MHFPacket) {
 			bf.WriteUint16(0) // Unk
 		}
 		if _config.ErupeConfig.RealClientMode >= _config.G8 {
-			if dist.Selection {
-				bf.WriteUint8(2) // Selection
-			} else {
-				bf.WriteUint8(0)
-			}
+			bf.WriteUint8(0) // Unk
 		}
 		if _config.ErupeConfig.RealClientMode >= _config.G7 {
 			bf.WriteUint16(0) // Unk
--- a/server/channelserver/handlers_festa.go
+++ b/server/channelserver/handlers_festa.go
@@ -3,6 +3,7 @@ package channelserver
 import (
 	"erupe-ce/common/byteframe"
 	ps "erupe-ce/common/pascalstring"
+	"erupe-ce/common/stringsupport"
 	"erupe-ce/common/token"
 	_config "erupe-ce/config"
 	"erupe-ce/network/mhfpacket"
@@ -33,62 +34,180 @@ func handleMsgMhfLoadMezfesData(s *Session, p mhfpacket.MHFPacket) {
 	doAckBufSucceed(s, pkt.AckHandle, bf.Data())
 }

+func generateTournamentTimestamps(start uint32, debug bool) []uint32 {
+	timestamps := make([]uint32, 4)
+	midnight := TimeMidnight()
+	if debug && start <= 3 {
+		midnight := uint32(midnight.Unix())
+		switch start {
+		case 1:
+			timestamps[0] = midnight
+			timestamps[1] = timestamps[0] + 259200
+			timestamps[2] = timestamps[1] + 766800
+			timestamps[3] = timestamps[2] + 604800
+		case 2:
+			timestamps[0] = midnight - 259200
+			timestamps[1] = midnight
+			timestamps[2] = timestamps[1] + 766800
+			timestamps[3] = timestamps[2] + 604800
+		case 3:
+			timestamps[0] = midnight - 1026000
+			timestamps[1] = midnight - 766800
+			timestamps[2] = midnight
+			timestamps[3] = timestamps[2] + 604800
+		}
+		return timestamps
+	}
+	timestamps[0] = start
+	timestamps[1] = timestamps[0] + 259200
+	timestamps[2] = timestamps[1] + 766800
+	timestamps[3] = timestamps[2] + 604800
+	return timestamps
+}
+
+type TournamentEvent struct {
+	ID           uint32
+	CupGroup     uint16
+	EventSubType int16
+	QuestFileID  uint32
+	Name         string
+}
+
+type TournamentCup struct {
+	ID          uint32
+	CupGroup    uint16
+	Type        uint16
+	Unk         uint16
+	Name        string
+	Description string
+}
+
 func handleMsgMhfEnumerateRanking(s *Session, p mhfpacket.MHFPacket) {
 	pkt := p.(*mhfpacket.MsgMhfEnumerateRanking)
 	bf := byteframe.NewByteFrame()
-	state := s.server.erupeConfig.DebugOptions.TournamentOverride
-	// Unk
-	// Unk
-	// Start?
-	// End?
-	midnight := TimeMidnight()
-	switch state {
-	case 1:
-		bf.WriteUint32(uint32(midnight.Unix()))
-		bf.WriteUint32(uint32(midnight.Add(3 * 24 * time.Hour).Unix()))
-		bf.WriteUint32(uint32(midnight.Add(13 * 24 * time.Hour).Unix()))
-		bf.WriteUint32(uint32(midnight.Add(20 * 24 * time.Hour).Unix()))
-	case 2:
-		bf.WriteUint32(uint32(midnight.Add(-3 * 24 * time.Hour).Unix()))
-		bf.WriteUint32(uint32(midnight.Unix()))
-		bf.WriteUint32(uint32(midnight.Add(10 * 24 * time.Hour).Unix()))
-		bf.WriteUint32(uint32(midnight.Add(17 * 24 * time.Hour).Unix()))
-	case 3:
-		bf.WriteUint32(uint32(midnight.Add(-13 * 24 * time.Hour).Unix()))
-		bf.WriteUint32(uint32(midnight.Add(-10 * 24 * time.Hour).Unix()))
-		bf.WriteUint32(uint32(midnight.Unix()))
-		bf.WriteUint32(uint32(midnight.Add(7 * 24 * time.Hour).Unix()))
-	default:
+
+	id, start := uint32(0xBEEFDEAD), uint32(0)
+	rows, _ := s.server.db.Queryx("SELECT id, (EXTRACT(epoch FROM start_time)::int) as start_time FROM events WHERE event_type='festa'")
+	for rows.Next() {
+		rows.Scan(&id, &start)
+	}
+
+	var timestamps []uint32
+	if s.server.erupeConfig.DebugOptions.TournamentOverride >= 0 {
+		if s.server.erupeConfig.DebugOptions.TournamentOverride == 0 {
+			bf.WriteBytes(make([]byte, 16))
+			bf.WriteUint32(uint32(TimeAdjusted().Unix()))
+			bf.WriteUint8(0)
+			ps.Uint8(bf, "", true)
+			bf.WriteUint16(0)
+			bf.WriteUint8(0)
+			doAckBufSucceed(s, pkt.AckHandle, bf.Data())
+			return
+		}
+		timestamps = generateTournamentTimestamps(uint32(s.server.erupeConfig.DebugOptions.TournamentOverride), true)
+	} else {
+		timestamps = generateTournamentTimestamps(start, false)
+	}
+
+	if timestamps[0] > uint32(TimeAdjusted().Unix()) {
 		bf.WriteBytes(make([]byte, 16))
-		bf.WriteUint32(uint32(TimeAdjusted().Unix())) // TS Current Time
-		bf.WriteUint8(3)
-		bf.WriteBytes(make([]byte, 4))
+		bf.WriteUint32(uint32(TimeAdjusted().Unix()))
+		bf.WriteUint8(0)
+		ps.Uint8(bf, "", true)
+		bf.WriteUint16(0)
+		bf.WriteUint8(0)
 		doAckBufSucceed(s, pkt.AckHandle, bf.Data())
 		return
 	}
-	bf.WriteUint32(uint32(TimeAdjusted().Unix())) // TS Current Time
-	bf.WriteUint8(3)
-	ps.Uint8(bf, "", false)
-	bf.WriteUint16(0) // numEvents
-	bf.WriteUint8(0)  // numCups

-	/*
-		struct event
-		uint32 eventID
-		uint16 unk
-		uint16 unk
-		uint32 unk
-		psUint8 name
+	for _, timestamp := range timestamps {
+		bf.WriteUint32(timestamp)
+	}
+	bf.WriteUint32(uint32(TimeAdjusted().Unix()))
+	bf.WriteUint8(1) // TODO: Make this dynamic depending on timestamp
+	ps.Uint8(bf, "第150回公式狩猟大会", true)

-		struct cup
-		uint32 cupID
-		uint16 unk
-		uint16 unk
-		uint16 unk
-		psUint8 name
-		psUint16 desc
-	*/
+	// Temp direct port
+	tournamentEvents := []TournamentEvent{
+		{2644, 16, 0, 60691, "爆霧竜討伐！"},
+		{2645, 16, 1, 60691, "爆霧竜討伐！"},
+		{2646, 16, 2, 60691, "爆霧竜討伐！"},
+		{2647, 16, 3, 60691, "爆霧竜討伐！"},
+		{2648, 16, 4, 60691, "爆霧竜討伐！"},
+		{2649, 16, 5, 60691, "爆霧竜討伐！"},
+		{2650, 16, 6, 60691, "爆霧竜討伐！"},
+		{2651, 16, 7, 60691, "爆霧竜討伐！"},
+		{2652, 16, 8, 60691, "爆霧竜討伐！"},
+		{2653, 16, 9, 60691, "爆霧竜討伐！"},
+		{2654, 16, 10, 60691, "爆霧竜討伐！"},
+		{2655, 16, 11, 60691, "爆霧竜討伐！"},
+		{2656, 16, 12, 60691, "爆霧竜討伐！"},
+		{2657, 16, 13, 60691, "爆霧竜討伐！"},
+		{2658, 17, -1, 60690, "みんなで爆霧竜討伐！"},
+		{2659, 6, 234, 0, "キレアジ"},
+		{2660, 6, 237, 0, "ハリマグロ"},
+		{2661, 6, 239, 0, "カクサンデメキン"},
+	}
+	tournamentCups := []TournamentCup{
+		{569, 6, 6, 0, "個人 巨大魚杯", "~C05【競技内容】\n~C00クエストで釣った魚のサイズを競う\n~C04【対象魚】\n~C00キレアジ、\nハリマグロ、カクサンデメキン\n~C07【入賞賞品】\n~C00魚杯のしるし、タルネコ生産券、\nグーク生産券、グーク足生産券、\nグーク解放券(1〜3位)\n/猟団ポイント(1〜100位)\n/匠チケット＋ハーフチケット白\n(1〜500位)\n~C03【開催期間】\n~C002019年11月22日 14:00から\n2019年11月25日 14:00まで"},
+		{570, 17, 7, 0, "猟団 Ｇ級韋駄天杯", "~C05【競技内容】\n~C00≪みんなで爆霧竜討伐！≫を\n同じ猟団に所属する4人までの\n猟団員でいかに早くクリアするか\nを競う\n\n~C07【入賞賞品】\n~C00第147回狩人祭の魂(1〜200位)\n\n~C03【開催期間】\n~C002019年11月22日 14:00から\n2019年11月25日 14:00まで\n\n"},
+		{571, 16, 7, 0, "個人 Ｇ級韋駄天杯", "~C05【競技内容】\n~C00≪爆霧竜討伐！≫を\nいかに早くクリアするかを競う\n\n~C07【入賞賞品】\n~C00王者のメダル(1位)\n/公式のしるし、タルネコ生産券、\nグーク生産券、グーク足生産券、\nグーク解放券(1〜3位)\n/猟団ポイント(1〜100位)\n/匠チケット＋ハーフチケット白\n(1〜500位)\n~C03【開催期間】\n~C002019年11月22日 14:00から\n2019年11月25日 14:00まで"},
+	}

+	bf.WriteUint16(uint16(len(tournamentEvents)))
+	for _, event := range tournamentEvents {
+		bf.WriteUint32(event.ID)
+		bf.WriteUint16(event.CupGroup)
+		bf.WriteInt16(event.EventSubType)
+		bf.WriteUint32(event.QuestFileID)
+		ps.Uint8(bf, event.Name, true)
+	}
+	bf.WriteUint8(uint8(len(tournamentCups)))
+	for _, cup := range tournamentCups {
+		bf.WriteUint32(cup.ID)
+		bf.WriteUint16(cup.CupGroup)
+		bf.WriteUint16(cup.Type)
+		bf.WriteUint16(cup.Unk)
+		ps.Uint8(bf, cup.Name, true)
+		ps.Uint16(bf, cup.Description, true)
+	}
+	doAckBufSucceed(s, pkt.AckHandle, bf.Data())
+}
+
+type TournamentRank struct {
+	CID       uint32
+	Rank      uint32
+	Grade     uint16
+	HR        uint16
+	GR        uint16
+	CharName  string
+	GuildName string
+}
+
+func handleMsgMhfEnumerateOrder(s *Session, p mhfpacket.MHFPacket) {
+	pkt := p.(*mhfpacket.MsgMhfEnumerateOrder)
+	bf := byteframe.NewByteFrame()
+	bf.WriteUint32(pkt.EventID)
+	bf.WriteUint32(uint32(TimeAdjusted().Unix()))
+
+	tournamentRanks := []TournamentRank{}
+	bf.WriteUint16(uint16(len(tournamentRanks)))
+	bf.WriteUint16(0) // Unk
+	for _, rank := range tournamentRanks {
+		bf.WriteUint32(rank.CID)
+		bf.WriteUint32(rank.Rank)
+		bf.WriteUint16(rank.Grade)
+		bf.WriteUint16(0)
+		bf.WriteUint16(rank.HR)
+		if _config.ErupeConfig.RealClientMode >= _config.G10 {
+			bf.WriteUint16(rank.GR)
+		}
+		bf.WriteUint16(0)
+		bf.WriteUint8(uint8(len(rank.CharName) + 1))
+		bf.WriteUint8(uint8(len(rank.GuildName) + 1))
+		bf.WriteNullTerminatedBytes(stringsupport.UTF8ToSJIS(rank.CharName))
+		bf.WriteNullTerminatedBytes(stringsupport.UTF8ToSJIS(rank.GuildName))
+	}
 	doAckBufSucceed(s, pkt.AckHandle, bf.Data())
 }

@@ -127,10 +246,10 @@ func generateFestaTimestamps(s *Session, start uint32, debug bool) []uint32 {
 		}
 		return timestamps
 	}
-	if start == 0 || TimeAdjusted().Unix() > int64(start)+2977200 {
+	if start == 0 || TimeAdjusted().Unix() > int64(start)+3024000 {
 		cleanupFesta(s)
-		// Generate a new festa, starting midnight tomorrow
-		start = uint32(midnight.Add(24 * time.Hour).Unix())
+		// Generate a new festa, starting 11am tomorrow
+		start = uint32(midnight.Add(35 * time.Hour).Unix())
 		s.server.db.Exec("INSERT INTO events (event_type, start_time) VALUES ('festa', to_timestamp($1)::timestamp without time zone)", start)
 	}
 	timestamps[0] = start
@@ -292,7 +411,7 @@ func handleMsgMhfInfoFesta(s *Session, p mhfpacket.MHFPacket) {
 	} else {
 		bf.WriteUint32(s.server.erupeConfig.GameplayOptions.MaximumFP)
 	}
-	bf.WriteUint16(100) // Reward multiplier (%)
+	bf.WriteUint16(500)

 	var temp uint32
 	bf.WriteUint16(4)
--- a/server/channelserver/handlers_guild.go
+++ b/server/channelserver/handlers_guild.go
@@ -8,6 +8,7 @@ import (
 	"erupe-ce/common/mhfitem"
 	_config "erupe-ce/config"
 	"fmt"
+	"math"
 	"sort"
 	"strings"
 	"time"
@@ -747,7 +748,8 @@ func handleMsgMhfOperateGuild(s *Session, p mhfpacket.MHFPacket) {
 	case mhfpacket.OperateGuildChangePugi3:
 		handleChangePugi(s, uint8(pkt.Data1.ReadUint32()), guild, 3)
 	case mhfpacket.OperateGuildUnlockOutfit:
-		s.server.db.Exec(`UPDATE guilds SET pugi_outfits=$1 WHERE id=$2`, pkt.Data1.ReadUint32(), guild.ID)
+		// TODO: This doesn't implement blocking, if someone unlocked the same outfit at the same time
+		s.server.db.Exec(`UPDATE guilds SET pugi_outfits=pugi_outfits+$1 WHERE id=$2`, int(math.Pow(float64(pkt.Data1.ReadUint32()), 2)), guild.ID)
 	case mhfpacket.OperateGuildDonateRoom:
 		quantity := uint16(pkt.Data1.ReadUint32())
 		bf.WriteBytes(handleDonateRP(s, quantity, guild, 2))
@@ -969,21 +971,14 @@ func handleMsgMhfInfoGuild(s *Session, p mhfpacket.MHFPacket) {
 		bf.WriteUint8(0)
 		bf.WriteUint8(0)

-		flags := uint8(0)
-		if !guild.Recruiting {
-			flags |= 0x01
-		}
-		//if guild.Suspended {
-		//	flags |= 0x02
-		//}
-		bf.WriteUint8(flags)
+		bf.WriteBool(!guild.Recruiting)

 		if characterGuildData == nil || characterGuildData.IsApplicant {
-			bf.WriteUint16(0)
+			bf.WriteUint16(0x00)
 		} else if guild.LeaderCharID == s.charID {
-			bf.WriteUint16(1)
+			bf.WriteUint16(0x01)
 		} else {
-			bf.WriteUint16(2)
+			bf.WriteUint16(0x02)
 		}

 		bf.WriteUint32(uint32(guild.CreatedAt.Unix()))
@@ -1103,25 +1098,20 @@ func handleMsgMhfInfoGuild(s *Session, p mhfpacket.MHFPacket) {
 				bf.WriteUint32(applicant.CharID)
 				bf.WriteUint32(0)
 				bf.WriteUint16(applicant.HR)
-				if s.server.erupeConfig.RealClientMode >= _config.G10 {
-					bf.WriteUint16(applicant.GR)
-				}
+				bf.WriteUint16(applicant.GR)
 				ps.Uint8(bf, applicant.Name, true)
 			}
 		}

-		type Activity struct {
-			Pass uint8
+		type UnkGuildInfo struct {
+			Unk0 uint8
 			Unk1 uint8
 			Unk2 uint8
 		}
-		activity := []Activity{
-			// 1,0,0 = ok
-			// 0,0,0 = ng
-		}
-		bf.WriteUint8(uint8(len(activity)))
-		for _, info := range activity {
-			bf.WriteUint8(info.Pass)
+		unkGuildInfo := []UnkGuildInfo{}
+		bf.WriteUint8(uint8(len(unkGuildInfo)))
+		for _, info := range unkGuildInfo {
+			bf.WriteUint8(info.Unk0)
 			bf.WriteUint8(info.Unk1)
 			bf.WriteUint8(info.Unk2)
 		}
@@ -1169,7 +1159,7 @@ func handleMsgMhfInfoGuild(s *Session, p mhfpacket.MHFPacket) {

 		doAckBufSucceed(s, pkt.AckHandle, bf.Data())
 	} else {
-		doAckBufSucceed(s, pkt.AckHandle, make([]byte, 4))
+		doAckBufSucceed(s, pkt.AckHandle, make([]byte, 5))
 	}
 }

@@ -1536,7 +1526,7 @@ func handleMsgMhfGetGuildManageRight(s *Session, p mhfpacket.MHFPacket) {
 	pkt := p.(*mhfpacket.MsgMhfGetGuildManageRight)

 	guild, err := GetGuildInfoByCharacterId(s, s.charID)
-	if guild == nil || s.prevGuildID != 0 {
+	if guild == nil && s.prevGuildID != 0 {
 		guild, err = GetGuildInfoByID(s, s.prevGuildID)
 		s.prevGuildID = 0
 		if guild == nil || err != nil {
--- a/server/channelserver/handlers_guild_member.go
+++ b/server/channelserver/handlers_guild_member.go
@@ -61,41 +61,35 @@ func (gm *GuildMember) Save(s *Session) error {
 }

 const guildMembersSelectSQL = `
-SELECT
-	COALESCE(g.id, 0) AS guild_id,
-	joined_at,
-	COALESCE((SELECT SUM(souls) FROM festa_submissions fs WHERE fs.character_id=c.id), 0) AS souls,
-	COALESCE(rp_today, 0) AS rp_today,
-	COALESCE(rp_yesterday, 0) AS rp_yesterday,
-	c.name,
-	c.id AS character_id,
-	COALESCE(order_index, 0) AS order_index,
-	c.last_login,
-	COALESCE(recruiter, false) AS recruiter,
-	COALESCE(avoid_leadership, false) AS avoid_leadership,
-	c.hr,
-	c.gr,
-	c.weapon_id,
-	c.weapon_type,
-	CASE WHEN g.leader_id = c.id THEN true ELSE false END AS is_leader,
-	character.is_applicant
-	FROM (
-		SELECT character_id, true as is_applicant, guild_id
-		FROM guild_applications ga
-		WHERE ga.application_type = 'applied'
-		UNION
-		SELECT character_id, false as is_applicant, guild_id
+SELECT * FROM (
+	SELECT
+		g.id AS guild_id,
+		joined_at,
+		COALESCE((SELECT SUM(souls) FROM festa_submissions fs WHERE fs.character_id=c.id), 0) AS souls,
+		COALESCE(rp_today, 0) AS rp_today,
+		COALESCE(rp_yesterday, 0) AS rp_yesterday,
+		c.name,
+		c.id AS character_id,
+		COALESCE(order_index, 0) AS order_index,
+		c.last_login,
+		COALESCE(recruiter, false) AS recruiter,
+		COALESCE(avoid_leadership, false) AS avoid_leadership,
+		c.hr,
+		c.gr,
+		c.weapon_id,
+		c.weapon_type,
+		EXISTS(SELECT 1 FROM guild_applications ga WHERE ga.character_id=c.id AND application_type='applied') AS is_applicant,
+		CASE WHEN g.leader_id = c.id THEN true ELSE false END AS is_leader
 		FROM guild_characters gc
-	) character
-	JOIN characters c on character.character_id = c.id
-	LEFT JOIN guild_characters gc ON gc.character_id = character.character_id
-	LEFT JOIN guilds g ON g.id = gc.guild_id
+		LEFT JOIN characters c ON c.id = gc.character_id
+		LEFT JOIN guilds g ON g.id = gc.guild_id
+) AS subquery
 `

 func GetGuildMembers(s *Session, guildID uint32, applicants bool) ([]*GuildMember, error) {
 	rows, err := s.server.db.Queryx(fmt.Sprintf(`
 			%s
-			WHERE character.guild_id = $1 AND is_applicant = $2
+			WHERE guild_id = $1 AND is_applicant = $2
 	`, guildMembersSelectSQL), guildID, applicants)

 	if err != nil {
@@ -121,7 +115,7 @@ func GetGuildMembers(s *Session, guildID uint32, applicants bool) ([]*GuildMembe
 }

 func GetCharacterGuildData(s *Session, charID uint32) (*GuildMember, error) {
-	rows, err := s.server.db.Queryx(fmt.Sprintf("%s	WHERE character.character_id=$1", guildMembersSelectSQL), charID)
+	rows, err := s.server.db.Queryx(fmt.Sprintf("%s	WHERE character_id=$1", guildMembersSelectSQL), charID)

 	if err != nil {
 		s.logger.Error(fmt.Sprintf("failed to retrieve membership data for character '%d'", charID))
--- a/server/channelserver/handlers_house.go
+++ b/server/channelserver/handlers_house.go
@@ -367,17 +367,13 @@ func handleMsgMhfAcquireTitle(s *Session, p mhfpacket.MHFPacket) {

 func handleMsgMhfResetTitle(s *Session, p mhfpacket.MHFPacket) {}

-func initializeWarehouse(s *Session) {
+func handleMsgMhfOperateWarehouse(s *Session, p mhfpacket.MHFPacket) {
+	pkt := p.(*mhfpacket.MsgMhfOperateWarehouse)
 	var t int
 	err := s.server.db.QueryRow("SELECT character_id FROM warehouse WHERE character_id=$1", s.charID).Scan(&t)
 	if err != nil {
 		s.server.db.Exec("INSERT INTO warehouse (character_id) VALUES ($1)", s.charID)
 	}
-}
-
-func handleMsgMhfOperateWarehouse(s *Session, p mhfpacket.MHFPacket) {
-	pkt := p.(*mhfpacket.MsgMhfOperateWarehouse)
-	initializeWarehouse(s)
 	bf := byteframe.NewByteFrame()
 	bf.WriteUint8(pkt.Operation)
 	switch pkt.Operation {
@@ -450,7 +446,6 @@ func addWarehouseEquipment(s *Session, equipment mhfitem.MHFEquipment) {
 }

 func warehouseGetItems(s *Session, index uint8) []mhfitem.MHFItemStack {
-	initializeWarehouse(s)
 	var data []byte
 	var items []mhfitem.MHFItemStack
 	s.server.db.QueryRow(fmt.Sprintf(`SELECT item%d FROM warehouse WHERE character_id=$1`, index), s.charID).Scan(&data)
--- a/server/channelserver/handlers_mail.go
+++ b/server/channelserver/handlers_mail.go
@@ -185,7 +185,7 @@ func SendMailNotification(s *Session, m *Mail, recipient *Session) {

 	castedBinary.Build(bf, s.clientContext)

-	recipient.QueueSendMHFNonBlocking(castedBinary)
+	recipient.QueueSendMHF(castedBinary)
 }

 func getCharacterName(s *Session, charID uint32) string {
--- a/server/channelserver/handlers_mercenary.go
+++ b/server/channelserver/handlers_mercenary.go
@@ -21,6 +21,7 @@ func handleMsgMhfLoadPartner(s *Session, p mhfpacket.MHFPacket) {
 		data = make([]byte, 9)
 	}
 	doAckBufSucceed(s, pkt.AckHandle, data)
+	doAckSimpleSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x00})
 }

 func handleMsgMhfSavePartner(s *Session, p mhfpacket.MHFPacket) {
@@ -156,60 +157,60 @@ func handleMsgMhfSaveMercenary(s *Session, p mhfpacket.MHFPacket) {

 func handleMsgMhfReadMercenaryW(s *Session, p mhfpacket.MHFPacket) {
 	pkt := p.(*mhfpacket.MsgMhfReadMercenaryW)
-	bf := byteframe.NewByteFrame()
+	if pkt.Op > 0 {
+		bf := byteframe.NewByteFrame()
+		var pactID uint32
+		var name string
+		var cid uint32

-	var pactID, cid uint32
-	var name string
-	s.server.db.QueryRow("SELECT pact_id FROM characters WHERE id=$1", s.charID).Scan(&pactID)
-	if pactID > 0 {
-		s.server.db.QueryRow("SELECT name, id FROM characters WHERE rasta_id = $1", pactID).Scan(&name, &cid)
-		bf.WriteUint8(1) // numLends
-		bf.WriteUint32(pactID)
-		bf.WriteUint32(cid)
-		bf.WriteBool(true) // Escort enabled
-		bf.WriteUint32(uint32(TimeAdjusted().Unix()))
-		bf.WriteUint32(uint32(TimeAdjusted().Add(time.Hour * 24 * 7).Unix()))
-		bf.WriteBytes(stringsupport.PaddedString(name, 18, true))
+		s.server.db.QueryRow("SELECT pact_id FROM characters WHERE id=$1", s.charID).Scan(&pactID)
+		if pactID > 0 {
+			s.server.db.QueryRow("SELECT name, id FROM characters WHERE rasta_id = $1", pactID).Scan(&name, &cid)
+			bf.WriteUint8(1) // numLends
+			bf.WriteUint32(pactID)
+			bf.WriteUint32(cid)
+			bf.WriteBool(false) // ?
+			bf.WriteUint32(uint32(TimeAdjusted().Add(time.Hour * 24 * -8).Unix()))
+			bf.WriteUint32(uint32(TimeAdjusted().Add(time.Hour * 24 * -1).Unix()))
+			bf.WriteBytes(stringsupport.PaddedString(name, 18, true))
+		} else {
+			bf.WriteUint8(0)
+		}
+
+		if pkt.Op < 2 {
+			var loans uint8
+			temp := byteframe.NewByteFrame()
+			rows, _ := s.server.db.Query("SELECT name, id, pact_id FROM characters WHERE pact_id=(SELECT rasta_id FROM characters WHERE id=$1)", s.charID)
+			for rows.Next() {
+				loans++
+				rows.Scan(&name, &cid, &pactID)
+				temp.WriteUint32(pactID)
+				temp.WriteUint32(cid)
+				temp.WriteUint32(uint32(TimeAdjusted().Add(time.Hour * 24 * -8).Unix()))
+				temp.WriteUint32(uint32(TimeAdjusted().Add(time.Hour * 24 * -1).Unix()))
+				temp.WriteBytes(stringsupport.PaddedString(name, 18, true))
+			}
+			bf.WriteUint8(loans)
+			bf.WriteBytes(temp.Data())
+		}
+		doAckBufSucceed(s, pkt.AckHandle, bf.Data())
+		return
+	}
+	var data []byte
+	var gcp uint32
+	s.server.db.QueryRow("SELECT savemercenary FROM characters WHERE id=$1", s.charID).Scan(&data)
+	s.server.db.QueryRow("SELECT COALESCE(gcp, 0) FROM characters WHERE id=$1", s.charID).Scan(&gcp)
+
+	resp := byteframe.NewByteFrame()
+	resp.WriteUint16(0)
+	if len(data) == 0 {
+		resp.WriteBool(false)
 	} else {
-		bf.WriteUint8(0)
+		resp.WriteBool(true)
+		resp.WriteBytes(data)
 	}
-
-	if pkt.Op != 2 && pkt.Op != 5 {
-		var loans uint8
-		temp := byteframe.NewByteFrame()
-		rows, _ := s.server.db.Query("SELECT name, id, pact_id FROM characters WHERE pact_id=(SELECT rasta_id FROM characters WHERE id=$1)", s.charID)
-		for rows.Next() {
-			err := rows.Scan(&name, &cid, &pactID)
-			if err != nil {
-				continue
-			}
-			loans++
-			temp.WriteUint32(pactID)
-			temp.WriteUint32(cid)
-			temp.WriteUint32(uint32(TimeAdjusted().Unix()))
-			temp.WriteUint32(uint32(TimeAdjusted().Add(time.Hour * 24 * 7).Unix()))
-			temp.WriteBytes(stringsupport.PaddedString(name, 18, true))
-		}
-		bf.WriteUint8(loans)
-		bf.WriteBytes(temp.Data())
-
-		if pkt.Op != 1 && pkt.Op != 4 {
-			var data []byte
-			var gcp uint32
-			s.server.db.QueryRow("SELECT savemercenary FROM characters WHERE id=$1", s.charID).Scan(&data)
-			s.server.db.QueryRow("SELECT COALESCE(gcp, 0) FROM characters WHERE id=$1", s.charID).Scan(&gcp)
-
-			if len(data) == 0 {
-				bf.WriteBool(false)
-			} else {
-				bf.WriteBool(true)
-				bf.WriteBytes(data)
-			}
-			bf.WriteUint32(gcp)
-		}
-	}
-
-	doAckBufSucceed(s, pkt.AckHandle, bf.Data())
+	resp.WriteUint32(gcp)
+	doAckBufSucceed(s, pkt.AckHandle, resp.Data())
 }

 func handleMsgMhfReadMercenaryM(s *Session, p mhfpacket.MHFPacket) {
--- a/server/channelserver/handlers_quest.go
+++ b/server/channelserver/handlers_quest.go
@@ -85,10 +85,6 @@ func BackportQuest(data []byte) []byte {
 			}
 		}
 	}
-
-	if _config.ErupeConfig.RealClientMode <= _config.S6 {
-		binary.LittleEndian.PutUint32(data[16:20], binary.LittleEndian.Uint32(data[8:12]))
-	}
 	return data
 }

@@ -242,10 +238,8 @@ func loadQuestFile(s *Session, questId int) []byte {
 	}
 	questBody.WriteBytes(newStrings.Data())

-	s.server.questCacheLock.Lock()
 	s.server.questCacheData[questId] = questBody.Data()
 	s.server.questCacheTime[questId] = time.Now()
-	s.server.questCacheLock.Unlock()
 	return questBody.Data()
 }

--- a/server/channelserver/handlers_register.go
+++ b/server/channelserver/handlers_register.go
@@ -129,12 +129,12 @@ func (s *Session) notifyRavi() {
 	raviNotif.WriteUint16(0x0010) // End it.
 	if s.server.erupeConfig.GameplayOptions.LowLatencyRaviente {
 		for session := range sema.clients {
-			session.QueueSendNonBlocking(raviNotif.Data())
+			session.QueueSend(raviNotif.Data())
 		}
 	} else {
 		for session := range sema.clients {
 			if session.charID == s.charID {
-				session.QueueSendNonBlocking(raviNotif.Data())
+				session.QueueSend(raviNotif.Data())
 			}
 		}
 	}
--- a/server/channelserver/handlers_semaphore.go
+++ b/server/channelserver/handlers_semaphore.go
@@ -65,15 +65,6 @@ func handleMsgSysCreateAcquireSemaphore(s *Session, p mhfpacket.MHFPacket) {
 	pkt := p.(*mhfpacket.MsgSysCreateAcquireSemaphore)
 	SemaphoreID := pkt.SemaphoreID

-	if s.server.HasSemaphore(s) {
-		s.semaphoreMode = !s.semaphoreMode
-	}
-	if s.semaphoreMode {
-		s.semaphoreID[1]++
-	} else {
-		s.semaphoreID[0]++
-	}
-
 	newSemaphore, exists := s.server.semaphore[SemaphoreID]
 	if !exists {
 		s.server.semaphoreLock.Lock()
@@ -86,7 +77,7 @@ func handleMsgSysCreateAcquireSemaphore(s *Session, p mhfpacket.MHFPacket) {
 				maxPlayers: 127,
 			}
 		} else {
-			s.server.semaphore[SemaphoreID] = NewSemaphore(s, SemaphoreID, 1)
+			s.server.semaphore[SemaphoreID] = NewSemaphore(s.server, SemaphoreID, 1)
 		}
 		newSemaphore = s.server.semaphore[SemaphoreID]
 		s.server.semaphoreLock.Unlock()
@@ -112,7 +103,7 @@ func handleMsgSysCreateAcquireSemaphore(s *Session, p mhfpacket.MHFPacket) {
 func handleMsgSysAcquireSemaphore(s *Session, p mhfpacket.MHFPacket) {
 	pkt := p.(*mhfpacket.MsgSysAcquireSemaphore)
 	if sema, exists := s.server.semaphore[pkt.SemaphoreID]; exists {
-		sema.host = s
+		sema.clients[s] = s.charID
 		bf := byteframe.NewByteFrame()
 		bf.WriteUint32(sema.id)
 		doAckSimpleSucceed(s, pkt.AckHandle, bf.Data())
--- a/server/channelserver/handlers_stage.go
+++ b/server/channelserver/handlers_stage.go
@@ -59,7 +59,7 @@ func doStageTransfer(s *Session, ackHandle uint32, stageID string) {
 	s.Unlock()

 	// Tell the client to cleanup its current stage objects.
-	s.QueueSendMHFNonBlocking(&mhfpacket.MsgSysCleanupObject{})
+	s.QueueSendMHF(&mhfpacket.MsgSysCleanupObject{})

 	// Confirm the stage entry.
 	doAckSimpleSucceed(s, ackHandle, []byte{0x00, 0x00, 0x00, 0x00})
@@ -112,8 +112,9 @@ func doStageTransfer(s *Session, ackHandle uint32, stageID string) {
 		s.stage.RUnlock()
 	}

+	newNotif.WriteUint16(0x0010) // End it.
 	if len(newNotif.Data()) > 2 {
-		s.QueueSendNonBlocking(newNotif.Data())
+		s.QueueSend(newNotif.Data())
 	}
 }

@@ -237,7 +238,7 @@ func handleMsgSysUnlockStage(s *Session, p mhfpacket.MHFPacket) {
 		for charID := range s.reservationStage.reservedClientSlots {
 			session := s.server.FindSessionByCharID(charID)
 			if session != nil {
-				session.QueueSendMHFNonBlocking(&mhfpacket.MsgSysStageDestruct{})
+				session.QueueSendMHF(&mhfpacket.MsgSysStageDestruct{})
 			}
 		}

@@ -361,7 +362,7 @@ func handleMsgSysWaitStageBinary(s *Session, p mhfpacket.MHFPacket) {
 			doAckBufSucceed(s, pkt.AckHandle, []byte{0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00})
 			return
 		}
-		for i := 0; i < 10; i++ {
+		for {
 			s.logger.Debug("MsgSysWaitStageBinary before lock and get stage")
 			stage.Lock()
 			stageBinary, gotBinary := stage.rawBinaryData[stageBinaryKey{pkt.BinaryType0, pkt.BinaryType1}]
@@ -369,15 +370,13 @@ func handleMsgSysWaitStageBinary(s *Session, p mhfpacket.MHFPacket) {
 			s.logger.Debug("MsgSysWaitStageBinary after lock and get stage")
 			if gotBinary {
 				doAckBufSucceed(s, pkt.AckHandle, stageBinary)
-				return
+				break
 			} else {
 				s.logger.Debug("Waiting stage binary", zap.Uint8("BinaryType0", pkt.BinaryType0), zap.Uint8("pkt.BinaryType1", pkt.BinaryType1))
 				time.Sleep(1 * time.Second)
 				continue
 			}
 		}
-		s.logger.Warn("MsgSysWaitStageBinary stage binary timeout")
-		doAckBufSucceed(s, pkt.AckHandle, []byte{})
 	} else {
 		s.logger.Warn("Failed to get stage", zap.String("StageID", pkt.StageID))
 	}
--- a/server/channelserver/sys_channel_server.go
+++ b/server/channelserver/sys_channel_server.go
@@ -75,7 +75,6 @@ type Server struct {

 	raviente *Raviente

-	questCacheLock sync.RWMutex
 	questCacheData map[int][]byte
 	questCacheTime map[int]time.Time
 }
@@ -208,7 +207,6 @@ func (s *Server) Start() error {

 	go s.acceptClients()
 	go s.manageSessions()
-	go s.invalidateSessions()

 	// Start the discord bot for chat integration.
 	if s.erupeConfig.Discord.Enabled && s.discordBot != nil {
@@ -280,21 +278,6 @@ func (s *Server) manageSessions() {
 	}
 }

-func (s *Server) invalidateSessions() {
-	for {
-		if s.isShuttingDown {
-			break
-		}
-		for _, sess := range s.sessions {
-			if time.Now().Sub(sess.lastPacket) > time.Second*time.Duration(30) {
-				s.logger.Info("session timeout", zap.String("Name", sess.Name))
-				logoutPlayer(sess)
-			}
-		}
-		time.Sleep(time.Second * 10)
-	}
-}
-
 // BroadcastMHF queues a MHFPacket to be sent to all sessions.
 func (s *Server) BroadcastMHF(pkt mhfpacket.MHFPacket, ignoredSession *Session) {
 	// Broadcast the data.
@@ -441,13 +424,24 @@ func (s *Server) FindObjectByChar(charID uint32) *Object {
 	return nil
 }

-func (s *Server) HasSemaphore(ses *Session) bool {
-	for _, semaphore := range s.semaphore {
-		if semaphore.host == ses {
-			return true
+func (s *Server) NextSemaphoreID() uint32 {
+	for {
+		exists := false
+		s.semaphoreIndex = s.semaphoreIndex + 1
+		if s.semaphoreIndex > 0xFFFF {
+			s.semaphoreIndex = 1
+		}
+		for _, semaphore := range s.semaphore {
+			if semaphore.id == s.semaphoreIndex {
+				exists = true
+				break
+			}
+		}
+		if !exists {
+			break
 		}
 	}
-	return false
+	return s.semaphoreIndex
 }

 func (s *Server) Season() uint8 {
--- a/server/channelserver/sys_language.go
+++ b/server/channelserver/sys_language.go
@@ -10,7 +10,6 @@ type i18n struct {
 		noOp     string
 		disabled string
 		reload   string
-		playtime string
 		kqf      struct {
 			get string
 			set struct {
@@ -176,8 +175,6 @@ func getLangStrings(s *Server) i18n {
 		i.commands.noOp = "You don't have permission to use this command"
 		i.commands.disabled = "%s command is disabled"
 		i.commands.reload = "Reloading players..."
-		i.commands.playtime = "Playtime: %d hours %d minutes %d seconds"
-
 		i.commands.kqf.get = "KQF: %x"
 		i.commands.kqf.set.error = "Error in command. Format: %s set xxxxxxxxxxxxxxxx"
 		i.commands.kqf.set.success = "KQF set, please switch Land/World"
--- a/server/channelserver/sys_semaphore.go
+++ b/server/channelserver/sys_semaphore.go
@@ -22,18 +22,15 @@ type Semaphore struct {

 	// Max Players for Semaphore
 	maxPlayers uint16
-
-	host *Session
 }

 // NewSemaphore creates a new Semaphore with intialized values
-func NewSemaphore(s *Session, ID string, MaxPlayers uint16) *Semaphore {
+func NewSemaphore(s *Server, ID string, MaxPlayers uint16) *Semaphore {
 	sema := &Semaphore{
 		name:       ID,
-		id:         s.GetSemaphoreID(),
+		id:         s.NextSemaphoreID(),
 		clients:    make(map[*Session]uint32),
 		maxPlayers: MaxPlayers,
-		host:       s,
 	}
 	return sema
 }
--- a/server/channelserver/sys_session.go
+++ b/server/channelserver/sys_session.go
@@ -4,7 +4,6 @@ import (
 	"encoding/binary"
 	"encoding/hex"
 	"erupe-ce/common/mhfcourse"
-	_config "erupe-ce/config"
 	"fmt"
 	"io"
 	"net"
@@ -16,7 +15,6 @@ import (
 	"erupe-ce/network"
 	"erupe-ce/network/clientctx"
 	"erupe-ce/network/mhfpacket"
-
 	"go.uber.org/zap"
 )

@@ -50,12 +48,7 @@ type Session struct {
 	kqf              []byte
 	kqfOverride      bool

-	playtime     uint32
-	playtimeTime time.Time
-
-	semaphore     *Semaphore // Required for the stateful MsgSysUnreserveStage packet.
-	semaphoreMode bool
-	semaphoreID   []uint16
+	semaphore *Semaphore // Required for the stateful MsgSysUnreserveStage packet.

 	// A stack containing the stage movement history (push on enter/move, pop on back)
 	stageMoveStack *stringstack.StringStack
@@ -86,7 +79,6 @@ func NewSession(server *Server, conn net.Conn) *Session {
 		sessionStart:   TimeAdjusted().Unix(),
 		stageMoveStack: stringstack.New(),
 		ackStart:       make(map[uint32]time.Time),
-		semaphoreID:    make([]uint16, 2),
 	}
 	s.SetObjectID()
 	return s
@@ -104,9 +96,22 @@ func (s *Session) Start() {
 // QueueSend queues a packet (raw []byte) to be sent.
 func (s *Session) QueueSend(data []byte) {
 	s.logMessage(binary.BigEndian.Uint16(data[0:2]), data, "Server", s.Name)
-	err := s.cryptConn.SendPacket(append(data, []byte{0x00, 0x10}...))
-	if err != nil {
-		s.logger.Warn("Failed to send packet")
+	select {
+	case s.sendPackets <- packet{data, false}:
+		// Enqueued data
+	default:
+		s.logger.Warn("Packet queue too full, flushing!")
+		var tempPackets []packet
+		for len(s.sendPackets) > 0 {
+			tempPacket := <-s.sendPackets
+			if !tempPacket.nonBlocking {
+				tempPackets = append(tempPackets, tempPacket)
+			}
+		}
+		for _, tempPacket := range tempPackets {
+			s.sendPackets <- tempPacket
+		}
+		s.sendPackets <- packet{data, false}
 	}
 }

@@ -133,19 +138,6 @@ func (s *Session) QueueSendMHF(pkt mhfpacket.MHFPacket) {
 	s.QueueSend(bf.Data())
 }

-// QueueSendMHFNonBlocking queues a MHFPacket to be sent, dropping the packet entirely if the queue is full.
-func (s *Session) QueueSendMHFNonBlocking(pkt mhfpacket.MHFPacket) {
-	// Make the header
-	bf := byteframe.NewByteFrame()
-	bf.WriteUint16(uint16(pkt.Opcode()))
-
-	// Build the packet onto the byteframe.
-	pkt.Build(bf, s.clientContext)
-
-	// Queue it.
-	s.QueueSendNonBlocking(bf.Data())
-}
-
 // QueueAck is a helper function to queue an MSG_SYS_ACK with the given ack handle and data.
 func (s *Session) QueueAck(ackHandle uint32, data []byte) {
 	bf := byteframe.NewByteFrame()
@@ -158,26 +150,26 @@ func (s *Session) QueueAck(ackHandle uint32, data []byte) {
 func (s *Session) sendLoop() {
 	var pkt packet
 	for {
-		var buf []byte
 		if s.closed {
 			return
 		}
 		for len(s.sendPackets) > 0 {
 			pkt = <-s.sendPackets
-			buf = append(buf, pkt.data...)
-		}
-		if len(buf) > 0 {
-			err := s.cryptConn.SendPacket(append(buf, []byte{0x00, 0x10}...))
+			err := s.cryptConn.SendPacket(append(pkt.data, []byte{0x00, 0x10}...))
 			if err != nil {
 				s.logger.Warn("Failed to send packet")
 			}
 		}
-		time.Sleep(time.Duration(_config.ErupeConfig.LoopDelay) * time.Millisecond)
+		time.Sleep(5 * time.Millisecond)
 	}
 }

 func (s *Session) recvLoop() {
 	for {
+		if time.Now().Add(-30 * time.Second).After(s.lastPacket) {
+			logoutPlayer(s)
+			return
+		}
 		if s.closed {
 			logoutPlayer(s)
 			return
@@ -193,7 +185,7 @@ func (s *Session) recvLoop() {
 			return
 		}
 		s.handlePacketGroup(pkt)
-		time.Sleep(time.Duration(_config.ErupeConfig.LoopDelay) * time.Millisecond)
+		time.Sleep(5 * time.Millisecond)
 	}
 }

@@ -280,7 +272,7 @@ func (s *Session) logMessage(opcode uint16, data []byte, sender string, recipien
 	} else {
 		fmt.Printf("[%s] -> [%s]\n", sender, recipient)
 	}
-	fmt.Printf("Opcode: (Dec: %d Hex: 0x%04X Name: %s) \n", opcode, opcode, opcodePID)
+	fmt.Printf("Opcode: %s\n", opcodePID)
 	if s.server.erupeConfig.DebugOptions.LogMessageData {
 		if len(data) <= s.server.erupeConfig.DebugOptions.MaxHexdumpLength {
 			fmt.Printf("Data [%d bytes]:\n%s\n", len(data), hex.Dump(data))
@@ -318,14 +310,6 @@ func (s *Session) NextObjectID() uint32 {
 	return bf.ReadUint32()
 }

-func (s *Session) GetSemaphoreID() uint32 {
-	if s.semaphoreMode {
-		return 0x000E0000 + uint32(s.semaphoreID[1])
-	} else {
-		return 0x000F0000 + uint32(s.semaphoreID[0])
-	}
-}
-
 func (s *Session) isOp() bool {
 	var op bool
 	err := s.server.db.QueryRow(`SELECT op FROM users u WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$1)`, s.charID).Scan(&op)
--- a/server/entranceserver/make_resp.go
+++ b/server/entranceserver/make_resp.go
@@ -86,7 +86,7 @@ func encodeServerInfo(config *_config.Config, s *Server, local bool) []byte {
 		}
 	}
 	bf.WriteUint32(uint32(channelserver.TimeAdjusted().Unix()))
-	bf.WriteUint32(uint32(s.erupeConfig.GameplayOptions.ClanMemberLimits[len(s.erupeConfig.GameplayOptions.ClanMemberLimits)-1][1]))
+	bf.WriteUint32(60)
 	return bf.Data()
 }

--- a/server/signserver/dsgn_resp.go
+++ b/server/signserver/dsgn_resp.go
@@ -135,203 +135,7 @@ func (s *Session) makeSignResponse(uid uint32) []byte {

 	bf.WriteUint32(s.server.getLastCID(uid))
 	bf.WriteUint32(s.server.getUserRights(uid))
-
-	namNGWords := []string{}
-	msgNGWords := []string{}
-
-	filters := byteframe.NewByteFrame()
-	filters.SetLE()
-	filters.WriteNullTerminatedBytes([]byte("smc"))
-	smc := byteframe.NewByteFrame()
-	smc.SetLE()
-	smcData := []struct {
-		charGroup [][]rune
-	}{
-		{[][]rune{{'='}, {'＝'}}},
-		{[][]rune{{')'}, {'）'}}},
-		{[][]rune{{'('}, {'（'}}},
-		{[][]rune{{'!'}, {'！'}}},
-		{[][]rune{{'/'}, {'／'}}},
-		{[][]rune{{'+'}, {'＋'}}},
-		{[][]rune{{'&'}, {'＆'}}},
-		{[][]rune{{'ぼ'}, {'ボ'}, {'ﾎ', 'ﾞ'}, {'ほ', 'ﾞ'}, {'ホ', 'ﾞ'}, {'ほ', '゛'}, {'ホ', '゛'}, {'ﾎ', '゛'}}},
-		{[][]rune{{'べ'}, {'ベ'}, {'ﾍ', 'ﾞ'}, {'へ', 'ﾞ'}, {'ヘ', 'ﾞ'}, {'へ', '゛'}, {'ﾍ', '゛'}, {'ヘ', '゛'}}},
-		{[][]rune{{'で'}, {'デ'}, {'ﾃ', 'ﾞ'}, {'て', 'ﾞ'}, {'テ', 'ﾞ'}, {'て', '゛'}, {'テ', '゛'}, {'ﾃ', '゛'}, {'〒', '゛'}, {'〒', 'ﾞ'}, {'乙', 'ﾞ'}, {'乙', '゛'}}},
-		{[][]rune{{'び'}, {'ビ'}, {'ﾋ', 'ﾞ'}, {'ひ', 'ﾞ'}, {'ヒ', 'ﾞ'}, {'ひ', '゛'}, {'ヒ', '゛'}, {'ﾋ', '゛'}}},
-		{[][]rune{{'ど'}, {'ド'}, {'ﾄ', 'ﾞ'}, {'と', 'ﾞ'}, {'ト', 'ﾞ'}, {'と', '゛'}, {'ト', '゛'}, {'ﾄ', '゛'}, {'┣', 'ﾞ'}, {'┣', '゛'}, {'├', 'ﾞ'}, {'├', '゛'}}},
-		{[][]rune{{'ば'}, {'バ'}, {'ﾊ', 'ﾞ'}, {'は', 'ﾞ'}, {'ハ', 'ﾞ'}, {'八', 'ﾞ'}, {'は', '゛'}, {'ハ', '゛'}, {'ﾊ', '゛'}, {'八', '゛'}}},
-		{[][]rune{{'つ', 'ﾞ'}, {'ヅ'}, {'ツ', 'ﾞ'}, {'つ', '゛'}, {'ツ', '゛'}, {'ﾂ', 'ﾞ'}, {'ﾂ', '゛'}, {'づ'}, {'っ', 'ﾞ'}, {'ッ', 'ﾞ'}, {'ｯ', 'ﾞ'}, {'っ', '゛'}, {'ッ', '゛'}, {'ｯ', '゛'}}},
-		{[][]rune{{'ぶ'}, {'ブ'}, {'ﾌ', 'ﾞ'}, {'ヴ'}, {'ｳ', 'ﾞ'}, {'う', '゛'}, {'う', 'ﾞ'}, {'ウ', 'ﾞ'}, {'ｩ', 'ﾞ'}, {'ぅ', 'ﾞ'}, {'ふ', 'ﾞ'}, {'フ', 'ﾞ'}, {'ﾌ', '゛'}}},
-		{[][]rune{{'ぢ'}, {'ヂ'}, {'ﾁ', 'ﾞ'}, {'ち', 'ﾞ'}, {'チ', 'ﾞ'}, {'ち', '゛'}, {'チ', '゛'}, {'ﾁ', '゛'}, {'千', '゛'}, {'千', 'ﾞ'}}},
-		{[][]rune{{'だ'}, {'ダ'}, {'ﾀ', 'ﾞ'}, {'た', 'ﾞ'}, {'タ', 'ﾞ'}, {'夕', 'ﾞ'}, {'た', '゛'}, {'タ', '゛'}, {'ﾀ', '゛'}, {'夕', '゛'}}},
-		{[][]rune{{'ぞ'}, {'ゾ'}, {'ｿ', 'ﾞ'}, {'そ', 'ﾞ'}, {'ソ', 'ﾞ'}, {'そ', '゛'}, {'ソ', '゛'}, {'ｿ', '゛'}, {'ン', 'ﾞ'}, {'ン', '゛'}, {'ﾝ', '゛'}, {'ﾝ', 'ﾞ'}, {'リ', 'ﾞ'}, {'ﾘ', 'ﾞ'}, {'ﾘ', '゛'}, {'リ', '゛'}}},
-		{[][]rune{{'ぜ'}, {'ｾ', 'ﾞ'}, {'せ', 'ﾞ'}, {'セ', 'ﾞ'}, {'せ', '゛'}, {'セ', '゛'}, {'ｾ', '゛'}, {'ゼ'}}},
-		{[][]rune{{'ず'}, {'ズ'}, {'ｽ', 'ﾞ'}, {'す', 'ﾞ'}, {'ス', 'ﾞ'}, {'す', '゛'}, {'ス', '゛'}, {'ｽ', '゛'}}},
-		{[][]rune{{'じ'}, {'ジ'}, {'ｼ', 'ﾞ'}, {'し', 'ﾞ'}, {'シ', 'ﾞ'}, {'し', '゛'}, {'シ', '゛'}, {'ｼ', '゛'}}},
-		{[][]rune{{'ざ'}, {'ザ'}, {'ｻ', 'ﾞ'}, {'さ', 'ﾞ'}, {'サ', 'ﾞ'}, {'さ', '゛'}, {'サ', '゛'}, {'ｻ', '゛'}}},
-		{[][]rune{{'ご'}, {'ゴ'}, {'ｺ', 'ﾞ'}, {'こ', 'ﾞ'}, {'コ', 'ﾞ'}, {'こ', '゛'}, {'コ', '゛'}, {'ｺ', '゛'}}},
-		{[][]rune{{'げ'}, {'ゲ'}, {'ｹ', 'ﾞ'}, {'け', 'ﾞ'}, {'ケ', 'ﾞ'}, {'け', '゛'}, {'ケ', '゛'}, {'ｹ', '゛'}, {'ヶ', 'ﾞ'}, {'ヶ', '゛'}}},
-		{[][]rune{{'ぐ'}, {'グ'}, {'ｸ', 'ﾞ'}, {'く', 'ﾞ'}, {'ク', 'ﾞ'}, {'く', '゛'}, {'ク', '゛'}, {'ｸ', '゛'}}},
-		{[][]rune{{'ぎ'}, {'ギ'}, {'ｷ', 'ﾞ'}, {'き', 'ﾞ'}, {'キ', 'ﾞ'}, {'き', '゛'}, {'キ', '゛'}, {'ｷ', '゛'}}},
-		{[][]rune{{'が'}, {'ガ'}, {'ｶ', 'ﾞ'}, {'ヵ', 'ﾞ'}, {'カ', 'ﾞ'}, {'か', 'ﾞ'}, {'力', 'ﾞ'}, {'ヵ', '゛'}, {'カ', '゛'}, {'か', '゛'}, {'力', '゛'}, {'ｶ', '゛'}}},
-		{[][]rune{{'を'}, {'ヲ'}, {'ｦ'}}},
-		{[][]rune{{'わ'}, {'ワ'}, {'ﾜ'}, {'ヮ'}}},
-		{[][]rune{{'ろ'}, {'ロ'}, {'ﾛ'}, {'□'}, {'口'}}},
-		{[][]rune{{'れ'}, {'レ'}, {'ﾚ'}}},
-		{[][]rune{{'る'}, {'ル'}, {'ﾙ'}}},
-		{[][]rune{{'り'}, {'リ'}, {'ﾘ'}}},
-		{[][]rune{{'ら'}, {'ラ'}, {'ﾗ'}}},
-		{[][]rune{{'よ'}, {'ヨ'}, {'ﾖ'}, {'ｮ'}, {'ょ'}, {'ョ'}}},
-		{[][]rune{{'ゆ'}, {'ユ'}, {'ﾕ'}, {'ｭ'}, {'ゅ'}, {'ュ'}}},
-		{[][]rune{{'や'}, {'ヤ'}, {'ﾔ'}, {'ｬ'}, {'ゃ'}, {'ャ'}}},
-		{[][]rune{{'も'}, {'モ'}, {'ﾓ'}}},
-		{[][]rune{{'め'}, {'メ'}, {'ﾒ'}, {'M', 'E'}}},
-		{[][]rune{{'む'}, {'ム'}, {'ﾑ'}}},
-		{[][]rune{{'み'}, {'ミ'}, {'ﾐ'}}},
-		{[][]rune{{'ま'}, {'マ'}, {'ﾏ'}}},
-		{[][]rune{{'ほ'}, {'ホ'}, {'ﾎ'}}},
-		{[][]rune{{'へ'}, {'ヘ'}, {'ﾍ'}}},
-		{[][]rune{{'ふ'}, {'フ'}, {'ﾌ'}}},
-		{[][]rune{{'ひ'}, {'ヒ'}, {'ﾋ'}}},
-		{[][]rune{{'は'}, {'ハ'}, {'ﾊ'}, {'八'}}},
-		{[][]rune{{'の'}, {'ノ'}, {'ﾉ'}}},
-		{[][]rune{{'ね'}, {'ネ'}, {'ﾈ'}}},
-		{[][]rune{{'ぬ'}, {'ヌ'}, {'ﾇ'}}},
-		{[][]rune{{'に'}, {'ニ'}, {'ﾆ'}, {'二'}}},
-		{[][]rune{{'な'}, {'ナ'}, {'ﾅ'}}},
-		{[][]rune{{'と'}, {'ト'}, {'ﾄ'}, {'┣'}, {'├'}}},
-		{[][]rune{{'て'}, {'テ'}, {'ﾃ'}, {'〒'}, {'乙'}}},
-		{[][]rune{{'つ'}, {'ツ'}, {'ﾂ'}, {'っ'}, {'ッ'}, {'ｯ'}}},
-		{[][]rune{{'ち'}, {'チ'}, {'ﾁ'}, {'千'}}},
-		{[][]rune{{'た'}, {'タ'}, {'ﾀ'}, {'夕'}}},
-		{[][]rune{{'そ'}, {'ソ'}, {'ｿ'}}},
-		{[][]rune{{'せ'}, {'セ'}, {'ｾ'}}},
-		{[][]rune{{'す'}, {'ス'}, {'ｽ'}}},
-		{[][]rune{{'し'}, {'シ'}, {'ｼ'}}},
-		{[][]rune{{'さ'}, {'サ'}, {'ｻ'}}},
-		{[][]rune{{'こ'}, {'コ'}, {'ｺ'}}},
-		{[][]rune{{'け'}, {'ケ'}, {'ｹ'}, {'ヶ'}}},
-		{[][]rune{{'く'}, {'ク'}, {'ｸ'}}},
-		{[][]rune{{'き'}, {'キ'}, {'ｷ'}}},
-		{[][]rune{{'か'}, {'カ'}, {'ｶ'}, {'ヵ'}, {'力'}}},
-		{[][]rune{{'お'}, {'オ'}, {'ｵ'}, {'ｫ'}, {'ぉ'}, {'ォ'}}},
-		{[][]rune{{'え'}, {'エ'}, {'ｴ'}, {'ｪ'}, {'ぇ'}, {'ェ'}, {'工'}}},
-		{[][]rune{{'う'}, {'ウ'}, {'ｳ'}, {'ｩ'}, {'ぅ'}, {'ゥ'}}},
-		{[][]rune{{'い'}, {'イ'}, {'ｲ'}, {'ｨ'}, {'ぃ'}, {'ィ'}}},
-		{[][]rune{{'あ'}, {'ア'}, {'ｧ'}, {'ｱ'}, {'ぁ'}, {'ァ'}}},
-		{[][]rune{{'ー'}, {'―'}, {'‐'}, {'-'}, {'－'}, {'ｰ'}, {'一'}}},
-		{[][]rune{{'9'}, {'９'}}},
-		{[][]rune{{'8'}, {'８'}}},
-		{[][]rune{{'7'}, {'７'}}},
-		{[][]rune{{'6'}, {'６'}}},
-		{[][]rune{{'5'}, {'５'}}},
-		{[][]rune{{'4'}, {'４'}}},
-		{[][]rune{{'3'}, {'３'}}},
-		{[][]rune{{'2'}, {'２'}}},
-		{[][]rune{{'1'}, {'１'}}},
-		{[][]rune{{'ぽ'}, {'ポ'}, {'ﾎ', 'ﾟ'}, {'ほ', 'ﾟ'}, {'ホ', 'ﾟ'}, {'ホ', '°'}, {'ほ', '°'}, {'ﾎ', '°'}}},
-		{[][]rune{{'ぺ'}, {'ペ'}, {'ﾍ', 'ﾟ'}, {'へ', 'ﾟ'}, {'ヘ', 'ﾟ'}, {'ヘ', '°'}, {'へ', '°'}, {'ﾍ', '°'}}},
-		{[][]rune{{'ぷ'}, {'プ'}, {'ﾌ', 'ﾟ'}, {'ふ', 'ﾟ'}, {'フ', 'ﾟ'}, {'フ', '°'}, {'ふ', '°'}, {'ﾌ', '°'}}},
-		{[][]rune{{'ぴ'}, {'ピ'}, {'ﾋ', 'ﾟ'}, {'ひ', 'ﾟ'}, {'ヒ', 'ﾟ'}, {'ヒ', '°'}, {'ひ', '°'}, {'ﾋ', '°'}}},
-		{[][]rune{{'ぱ'}, {'パ'}, {'ﾊ', 'ﾟ'}, {'は', 'ﾟ'}, {'ハ', 'ﾟ'}, {'ハ', '°'}, {'は', '°'}, {'ﾊ', '°'}, {'八', 'ﾟ'}, {'八', '゜'}}},
-		{[][]rune{{'z'}, {'ｚ'}, {'Z'}, {'Ｚ'}, {'Ζ'}}},
-		{[][]rune{{'y'}, {'ｙ'}, {'Y'}, {'Ｙ'}, {'Υ'}, {'У'}, {'у'}}},
-		{[][]rune{{'x'}, {'ｘ'}, {'X'}, {'Ｘ'}, {'Χ'}, {'χ'}, {'Х'}, {'×'}, {'х'}}},
-		{[][]rune{{'w'}, {'ｗ'}, {'W'}, {'Ｗ'}, {'ω'}, {'Ш'}, {'ш'}, {'щ'}}},
-		{[][]rune{{'v'}, {'ｖ'}, {'V'}, {'Ｖ'}, {'ν'}, {'υ'}}},
-		{[][]rune{{'u'}, {'ｕ'}, {'U'}, {'Ｕ'}, {'μ'}, {'∪'}}},
-		{[][]rune{{'t'}, {'ｔ'}, {'T'}, {'Ｔ'}, {'Τ'}, {'τ'}, {'Т'}, {'т'}}},
-		{[][]rune{{'s'}, {'ｓ'}, {'S'}, {'Ｓ'}, {'∫'}, {'＄'}, {'$'}}},
-		{[][]rune{{'r'}, {'ｒ'}, {'R'}, {'Ｒ'}, {'Я'}, {'я'}}},
-		{[][]rune{{'q'}, {'ｑ'}, {'Q'}, {'Ｑ'}}},
-		{[][]rune{{'p'}, {'ｐ'}, {'P'}, {'Ｐ'}, {'Ρ'}, {'ρ'}, {'Р'}, {'р'}}},
-		{[][]rune{{'o'}, {'ｏ'}, {'O'}, {'Ｏ'}, {'○'}, {'Ο'}, {'ο'}, {'О'}, {'о'}, {'◯'}, {'〇'}, {'0'}, {'０'}}},
-		{[][]rune{{'n'}, {'ｎ'}, {'N'}, {'Ｎ'}, {'Ν'}, {'η'}, {'ﾝ'}, {'ん'}, {'ン'}}},
-		{[][]rune{{'m'}, {'ｍ'}, {'M'}, {'Ｍ'}, {'Μ'}, {'М'}, {'м'}}},
-		{[][]rune{{'l'}, {'ｌ'}, {'L'}, {'Ｌ'}, {'|'}}},
-		{[][]rune{{'k'}, {'ｋ'}, {'K'}, {'Ｋ'}, {'Κ'}, {'κ'}, {'К'}, {'к'}}},
-		{[][]rune{{'j'}, {'ｊ'}, {'J'}, {'Ｊ'}}},
-		{[][]rune{{'i'}, {'ｉ'}, {'I'}, {'Ｉ'}, {'Ι'}}},
-		{[][]rune{{'h'}, {'ｈ'}, {'H'}, {'Ｈ'}, {'Η'}, {'Н'}, {'н'}}},
-		{[][]rune{{'f'}, {'ｆ'}, {'F'}, {'Ｆ'}}},
-		{[][]rune{{'g'}, {'ｇ'}, {'G'}, {'Ｇ'}}},
-		{[][]rune{{'e'}, {'ｅ'}, {'E'}, {'Ｅ'}, {'Ε'}, {'ε'}, {'Е'}, {'Ё'}, {'е'}, {'ё'}, {'∈'}}},
-		{[][]rune{{'d'}, {'ｄ'}, {'D'}, {'Ｄ'}}},
-		{[][]rune{{'c'}, {'ｃ'}, {'C'}, {'С'}, {'с'}, {'Ｃ'}, {'℃'}}},
-		{[][]rune{{'b'}, {'Ｂ'}, {'ｂ'}, {'B'}, {'β'}, {'Β'}, {'В'}, {'в'}, {'ъ'}, {'ь'}, {'♭'}}},
-		{[][]rune{{'\''}, {'’'}}},
-		{[][]rune{{'a'}, {'Ａ'}, {'ａ'}, {'A'}, {'α'}, {'@'}, {'＠'}, {'а'}, {'Å'}, {'А'}, {'Α'}}},
-		{[][]rune{{'"'}, {'”'}}},
-		{[][]rune{{'%'}, {'％'}}},
-	}
-	for _, smcGroup := range smcData {
-		for _, smcPair := range smcGroup.charGroup {
-			smc.WriteUint16(stringsupport.ToNGWord(string(smcPair[0]))[0])
-			if len(smcPair) > 1 {
-				smc.WriteUint16(stringsupport.ToNGWord(string(smcPair[1]))[0])
-			} else {
-				smc.WriteUint16(0)
-			}
-		}
-		smc.WriteUint32(0)
-	}
-
-	filters.WriteUint32(uint32(len(smc.Data())))
-	filters.WriteBytes(smc.Data())
-
-	filters.WriteNullTerminatedBytes([]byte("nam"))
-	nam := byteframe.NewByteFrame()
-	nam.SetLE()
-	for _, word := range namNGWords {
-		parts := stringsupport.ToNGWord(word)
-		nam.WriteUint32(uint32(len(parts)))
-		for _, part := range parts {
-			nam.WriteUint16(part)
-			var i int16
-			j := int16(-1)
-			for _, smcGroup := range smcData {
-				if rune(part) == rune(stringsupport.ToNGWord(string(smcGroup.charGroup[0][0]))[0]) {
-					j = i
-					break
-				}
-				i += int16(len(smcGroup.charGroup) + 1)
-			}
-			nam.WriteInt16(j)
-		}
-		nam.WriteUint16(0)
-		nam.WriteInt16(-1)
-	}
-	filters.WriteUint32(uint32(len(nam.Data())))
-	filters.WriteBytes(nam.Data())
-
-	filters.WriteNullTerminatedBytes([]byte("msg"))
-	msg := byteframe.NewByteFrame()
-	msg.SetLE()
-	for _, word := range msgNGWords {
-		parts := stringsupport.ToNGWord(word)
-		msg.WriteUint32(uint32(len(parts)))
-		for _, part := range parts {
-			msg.WriteUint16(part)
-			var i int16
-			j := int16(-1)
-			for _, smcGroup := range smcData {
-				if rune(part) == rune(stringsupport.ToNGWord(string(smcGroup.charGroup[0][0]))[0]) {
-					j = i
-					break
-				}
-				i += int16(len(smcGroup.charGroup) + 1)
-			}
-			msg.WriteInt16(j)
-		}
-		msg.WriteUint16(0)
-		msg.WriteInt16(-1)
-	}
-	filters.WriteUint32(uint32(len(msg.Data())))
-	filters.WriteBytes(msg.Data())
-
-	bf.WriteUint16(uint16(len(filters.Data())))
-	bf.WriteBytes(filters.Data())
-
+	ps.Uint16(bf, "", false) // filters
 	if s.client == VITA || s.client == PS3 || s.client == PS4 {
 		var psnUser string
 		s.server.db.QueryRow("SELECT psn_id FROM users WHERE id = $1", uid).Scan(&psnUser)
Author	SHA1	Message	Date
wish	e412592745	Merge branch 'refs/heads/main' into feature/hunting-tournament	2024-06-25 22:51:21 +10:00
wish	94e0f20682	fix EnumerateOrder	2024-06-25 22:24:44 +10:00
wish	79dce0bc52	fix EnumerateOrder & TournamentEvent struct	2024-06-25 21:49:41 +10:00
wish	4c485ef55a	update branch, handle EnumerateOrder	2024-06-25 21:04:51 +10:00
wish	fe1052a517	Merge branch 'refs/heads/main' into feature/hunting-tournament	2024-06-25 21:00:47 +10:00
stratic-dev	687ad05172	Merge branch 'main' into feature/hunting-tournament	2024-02-24 22:45:45 +00:00
wish	38f4399cab	initial hunting-tournament commit	2023-09-05 23:58:39 +10:00