Merge pull request #144 from gab3-dev/patch-1

Fix typos in Docker README
2025-12-13 15:34:38 +01:00 · 2025-10-29 00:00:32 +11:00 · 2025-10-28 09:33:52 -03:00 · 2025-08-29 22:56:46 +10:00 · 2025-08-28 23:27:56 +10:00 · 2025-08-22 11:26:43 +10:00
48 changed files with 1278 additions and 1968 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -0,0 +1 @@
+bin/
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -10,16 +10,17 @@ on:
      - 'go.mod'
      - 'go.sum'
      - 'main.go'
+      - '.github/workflows/go.yml'

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

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

@@ -27,7 +28,7 @@ jobs:
      run: env GOOS=linux GOARCH=amd64 go build -v
        
    - name: Upload Linux-amd64 artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
      with:
        name: Linux-amd64
        path: |
@@ -42,7 +43,7 @@ jobs:
      run: env GOOS=windows GOARCH=amd64 go build -v
      
    - name: Upload Windows-amd64 artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
      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](./patch-schema) as they introduce newer schema.
+2. Run each script under [patch-schema](./schemas/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/config.json
+++ b/config.json
@@ -21,9 +21,11 @@
  "QuestCacheExpiry": 300,
  "CommandPrefix": "!",
  "AutoCreateAccount": true,
+  "LoopDelay": 50,
  "DefaultCourses": [1, 23, 24],
-  "EarthDebug": false,
-  "EarthMonsters": [116, 107, 2, 36],
+  "EarthStatus": 0,
+  "EarthID": 0,
+  "EarthMonsters": [0, 0, 0, 0],
  "SaveDumps": {
    "Enabled": true,
    "RawEnabled": false,
@@ -168,6 +170,11 @@
      "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,8 +81,10 @@ 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
-	EarthDebug             bool
+	EarthStatus            int32
+	EarthID                int32
 	EarthMonsters          []int32
 	SaveDumps              SaveDumpOptions
 	Screenshots            ScreenshotsOptions
--- 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 soruce 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 source 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,3 +64,7 @@ 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.21
+go 1.23.0

 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.17.0
+	golang.org/x/crypto v0.36.0
 	golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa
-	golang.org/x/text v0.14.0
+	golang.org/x/text v0.23.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.18.0 // indirect
-	golang.org/x/sys v0.15.0 // indirect
+	golang.org/x/net v0.38.0 // indirect
+	golang.org/x/sys v0.31.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.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
-golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
+golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
+golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
 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.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg=
-golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
+golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
+golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
 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.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
-golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
+golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 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.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
+golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
 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.G1 {
+	if _config.ErupeConfig.RealClientMode >= _config.G6 {
 		m.PointCost = bf.ReadUint32()
 	} else {
 		m.PointCost = uint32(bf.ReadUint16())
--- a/network/mhfpacket/msg_mhf_get_paper_data.go
+++ b/network/mhfpacket/msg_mhf_get_paper_data.go
@@ -1,21 +1,20 @@
 package mhfpacket

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

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

 // MsgMhfGetPaperData represents the MSG_MHF_GET_PAPER_DATA
 type MsgMhfGetPaperData struct {
 	// Communicator type, multi-format. This might be valid for only one type.
 	AckHandle uint32
-	Type      uint32
+	Unk0      uint32
 	Unk1      uint32
-	ID        uint32
+	Unk2      uint32
 }

 // Opcode returns the ID associated with this packet type.
@@ -26,10 +25,9 @@ func (m *MsgMhfGetPaperData) Opcode() network.PacketID {
 // Parse parses the packet from binary
 func (m *MsgMhfGetPaperData) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
 	m.AckHandle = bf.ReadUint32()
-	m.Type = bf.ReadUint32()
+	m.Unk0 = bf.ReadUint32()
 	m.Unk1 = bf.ReadUint32()
-	m.ID = bf.ReadUint32()
-	fmt.Printf("MsgMhfGetPaperData: Type:[%d] Unk1:[%d] ID:[%d] \n\n", m.Type, m.Unk1, m.ID)
+	m.Unk2 = bf.ReadUint32()
 	return nil
 }

--- a/network/mhfpacket/msg_mhf_get_tiny_bin.go
+++ b/network/mhfpacket/msg_mhf_get_tiny_bin.go
@@ -2,7 +2,6 @@ package mhfpacket

 import (
 	"errors"
-	"fmt"

 	"erupe-ce/common/byteframe"
 	"erupe-ce/network"
@@ -29,7 +28,6 @@ func (m *MsgMhfGetTinyBin) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientC
 	m.Unk0 = bf.ReadUint8()
 	m.Unk1 = bf.ReadUint8()
 	m.Unk2 = bf.ReadUint8()
-	fmt.Printf("MsgMhfGetTinyBin: Unk0:[%d] Unk1:[%d] Unk2:[%d] \n\n", m.Unk0, m.Unk1, m.Unk2)
 	return nil
 }

--- a/network/mhfpacket/msg_mhf_get_weekly_seibatu_ranking_reward.go
+++ b/network/mhfpacket/msg_mhf_get_weekly_seibatu_ranking_reward.go
@@ -2,7 +2,6 @@ package mhfpacket

 import (
 	"errors"
-	"fmt"

 	"erupe-ce/common/byteframe"
 	"erupe-ce/network"
@@ -11,11 +10,11 @@ import (

 // MsgMhfGetWeeklySeibatuRankingReward represents the MSG_MHF_GET_WEEKLY_SEIBATU_RANKING_REWARD
 type MsgMhfGetWeeklySeibatuRankingReward struct {
-	AckHandle    uint32
-	Unk0         uint32
-	Operation    uint32
-	ID           uint32
-	EarthMonster uint32
+	AckHandle uint32
+	Unk0      uint32
+	Unk1      uint32
+	Unk2      uint32
+	Unk3      uint32
 }

 // Opcode returns the ID associated with this packet type.
@@ -27,10 +26,9 @@ func (m *MsgMhfGetWeeklySeibatuRankingReward) Opcode() network.PacketID {
 func (m *MsgMhfGetWeeklySeibatuRankingReward) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
 	m.AckHandle = bf.ReadUint32()
 	m.Unk0 = bf.ReadUint32()
-	m.Operation = bf.ReadUint32()
-	m.ID = bf.ReadUint32()
-	m.EarthMonster = bf.ReadUint32()
-	fmt.Printf("MsgMhfGetWeeklySeibatuRankingReward: Unk0:[%d] Operation:[%d] ID:[%d] EarthMonster:[%d]\n\n", m.Unk0, m.Operation, m.ID, m.EarthMonster)
+	m.Unk1 = bf.ReadUint32()
+	m.Unk2 = bf.ReadUint32()
+	m.Unk3 = bf.ReadUint32()
 	return nil
 }

--- a/network/mhfpacket/msg_mhf_post_tiny_bin.go
+++ b/network/mhfpacket/msg_mhf_post_tiny_bin.go
@@ -2,7 +2,6 @@ package mhfpacket

 import (
 	"errors"
-	"fmt"

 	"erupe-ce/common/byteframe"
 	"erupe-ce/network"
@@ -32,7 +31,6 @@ func (m *MsgMhfPostTinyBin) Parse(bf *byteframe.ByteFrame, ctx *clientctx.Client
 	m.Unk2 = bf.ReadUint8()
 	m.Unk3 = bf.ReadUint8()
 	m.Data = bf.ReadBytes(uint(bf.ReadUint16()))
-	fmt.Printf("MsgMhfPostTinyBin: Unk0:[%d] Unk1:[%d] Unk2:[%d] Unk3:[%d]  \n\n", m.Unk0, m.Unk1, m.Unk2, m.Unk3)
 	return nil
 }

--- a/network/mhfpacket/msg_mhf_post_tower_info.go
+++ b/network/mhfpacket/msg_mhf_post_tower_info.go
@@ -20,8 +20,7 @@ type MsgMhfPostTowerInfo struct {
 	Unk6      int32
 	Unk7      int32
 	Block1    int32
-	TimeTaken int32
-	CID       int32
+	Unk9      int64
 }

 // Opcode returns the ID associated with this packet type.
@@ -41,8 +40,7 @@ func (m *MsgMhfPostTowerInfo) Parse(bf *byteframe.ByteFrame, ctx *clientctx.Clie
 	m.Unk6 = bf.ReadInt32()
 	m.Unk7 = bf.ReadInt32()
 	m.Block1 = bf.ReadInt32()
-	m.TimeTaken = bf.ReadInt32()
-	m.CID = bf.ReadInt32()
+	m.Unk9 = bf.ReadInt64()
 	return nil
 }

--- a/network/mhfpacket/msg_mhf_present_box.go
+++ b/network/mhfpacket/msg_mhf_present_box.go
@@ -2,7 +2,6 @@ package mhfpacket

 import (
 	"errors"
-	"fmt"

 	"erupe-ce/common/byteframe"
 	"erupe-ce/network"
@@ -11,15 +10,15 @@ import (

 // MsgMhfPresentBox represents the MSG_MHF_PRESENT_BOX
 type MsgMhfPresentBox struct {
-	AckHandle    uint32
-	Unk0         uint32
-	Operation    uint32
-	PresentCount uint32
-	Unk3         uint32
-	Unk4         uint32
-	Unk5         uint32
-	Unk6         uint32
-	PresentType  []uint32
+	AckHandle uint32
+	Unk0      uint32
+	Unk1      uint32
+	Unk2      uint32
+	Unk3      uint32
+	Unk4      uint32
+	Unk5      uint32
+	Unk6      uint32
+	Unk7      []uint32
 }

 // Opcode returns the ID associated with this packet type.
@@ -31,19 +30,14 @@ func (m *MsgMhfPresentBox) Opcode() network.PacketID {
 func (m *MsgMhfPresentBox) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
 	m.AckHandle = bf.ReadUint32()
 	m.Unk0 = bf.ReadUint32()
-	m.Operation = bf.ReadUint32()
-	m.PresentCount = bf.ReadUint32()
+	m.Unk1 = bf.ReadUint32()
+	m.Unk2 = bf.ReadUint32()
 	m.Unk3 = bf.ReadUint32()
 	m.Unk4 = bf.ReadUint32()
 	m.Unk5 = bf.ReadUint32()
 	m.Unk6 = bf.ReadUint32()
-	for i := uint32(0); i < m.PresentCount; i++ {
-		m.PresentType = append(m.PresentType, bf.ReadUint32())
-	}
-	fmt.Printf("MsgMhfPresentBox: Unk0:[%d] Unk1:[%d] Unk2:[%d] Unk3:[%d] Unk4:[%d] Unk5:[%d] Unk6:[%d] \n\n", m.Unk0, m.Operation, m.PresentCount, m.Unk3, m.Unk4, m.Unk5, m.Unk6)
-	for _, mdata := range m.PresentType {
-		fmt.Printf("MsgMhfPresentBox: PresentType: [%d] \n", mdata)
-
+	for i := uint32(0); i < m.Unk2; i++ {
+		m.Unk7 = append(m.Unk7, bf.ReadUint32())
 	}
 	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,13 +1,15 @@
 BEGIN;

+TRUNCATE public.cafebonus;
+
 INSERT INTO public.cafebonus (time_req, item_type, item_id, quantity)
 VALUES
-    (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);
+    (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);

 END;
--- a/schemas/bundled-schema/PaperGifts.sql
+++ b/schemas/bundled-schema/PaperGifts.sql
@@ -1,752 +0,0 @@
-BEGIN;
-
-INSERT INTO public.paper_data_gifts (gift_id, item_id, unk0,unk1,unk2) VALUES
-  
-		(6001,11159, 1, 1, 5000),
-		(6001,11160, 1, 1, 3350),
-		(6001,11161, 1, 1, 1500),
-		(6001,11162, 1, 1, 100),
-		(6001,11163, 1, 1, 50),
-		(6002,11159, 2, 1, 1800),
-		(6002,11160, 2, 1, 1200),
-		(6002,11161, 2, 1, 500),
-		(6002,11162, 1, 1, 50),
-		(6002,11037, 1, 1, 150),
-		(6002,11038, 1, 1, 150),
-		(6002,11044, 1, 1, 150),
-		(6002,11057, 1, 1, 150),
-		(6002,11059, 1, 1, 150),
-		(6002,11079, 1, 1, 150),
-		(6002,11098, 1, 1, 150),
-		(6002,11104, 1, 1, 150),
-		(6002,11117, 1, 1, 150),
-		(6002,11128, 1, 1, 150),
-		(6002,11133, 1, 1, 150),
-		(6002,11137, 1, 1, 150),
-		(6002,11143, 1, 1, 150),
-		(6002,11132, 1, 1, 150),
-		(6002,11039, 1, 1, 150),
-		(6002,11040, 1, 1, 150),
-		(6002,11049, 1, 1, 150),
-		(6002,11061, 1, 1, 150),
-		(6002,11063, 1, 1, 150),
-		(6002,11077, 1, 1, 150),
-		(6002,11099, 1, 1, 150),
-		(6002,11105, 1, 1, 150),
-		(6002,11129, 1, 1, 150),
-		(6002,11130, 1, 1, 150),
-		(6002,11131, 1, 1, 150),
-		(6002,11139, 1, 1, 150),
-		(6002,11145, 1, 1, 150),
-		(6002,11096, 1, 1, 150),
-		(6002,11041, 1, 1, 150),
-		(6002,11047, 1, 1, 150),
-		(6002,11054, 1, 1, 150),
-		(6002,11065, 1, 1, 150),
-		(6002,11068, 1, 1, 150),
-		(6002,11075, 1, 1, 150),
-		(6002,11100, 1, 1, 150),
-		(6002,11106, 1, 1, 150),
-		(6002,11119, 1, 1, 150),
-		(6002,11135, 1, 1, 150),
-		(6002,11136, 1, 1, 150),
-		(6002,11138, 1, 1, 150),
-		(6002,11088, 1, 1, 150),
-		(6002,10370, 1, 1, 150),
-		(6002,10368, 1, 1, 150),
-		(6010,11159, 1, 1, 3700),
-		(6010,11160, 1, 1, 2900),
-		(6010,11161, 1, 1, 1300),
-		(6010,11453, 1, 1, 250),
-		(6010,11454, 1, 1, 250),
-		(6010,12055, 1, 1, 250),
-		(6010,12065, 1, 1, 250),
-		(6010,12058, 1, 1, 250),
-		(6010,12068, 1, 1, 250),
-		(6010,11774, 1, 1, 200),
-		(6010,11773, 1, 1, 400),
-		(6011,11159, 1, 1, 3700),
-		(6011,11160, 1, 1, 2900),
-		(6011,11161, 1, 1, 1300),
-		(6011,11453, 1, 1, 250),
-		(6011,11454, 1, 1, 250),
-		(6011,12055, 1, 1, 250),
-		(6011,12065, 1, 1, 250),
-		(6011,12058, 1, 1, 250),
-		(6011,12068, 1, 1, 250),
-		(6011,11774, 1, 1, 200),
-		(6011,11773, 1, 1, 400),
-		(6012,11159, 2, 1, 3500),
-		(6012,11160, 2, 1, 2900),
-		(6012,11161, 2, 1, 1300),
-		(6012,12508, 1, 1, 400),
-		(6012,11453, 1, 1, 200),
-		(6012,11454, 1, 1, 200),
-		(6012,12055, 1, 1, 200),
-		(6012,12065, 1, 1, 200),
-		(6012,12058, 1, 1, 200),
-		(6012,12068, 1, 1, 200),
-		(6012,11775, 1, 1, 400),
-		(6012,11776, 1, 1, 200),
-		(6012,11777, 1, 1, 100),
-		(7001,11037, 1, 1, 290),
-		(7001,11038, 1, 1, 270),
-		(7001,11044, 1, 1, 270),
-		(7001,11057, 1, 1, 290),
-		(7001,11059, 1, 1, 290),
-		(7001,11079, 1, 1, 290),
-		(7001,11098, 1, 1, 280),
-		(7001,11104, 1, 1, 300),
-		(7001,11117, 1, 1, 280),
-		(7001,11128, 1, 1, 290),
-		(7001,11133, 1, 1, 290),
-		(7001,11137, 1, 1, 300),
-		(7001,11143, 1, 1, 290),
-		(7001,11132, 1, 1, 270),
-		(7001,11042, 1, 1, 47),
-		(7001,11045, 1, 1, 47),
-		(7001,11064, 1, 1, 47),
-		(7001,11062, 1, 1, 47),
-		(7001,11070, 1, 1, 48),
-		(7001,11101, 1, 1, 47),
-		(7001,11108, 1, 1, 47),
-		(7001,11109, 1, 1, 47),
-		(7001,11120, 1, 1, 47),
-		(7001,11122, 1, 1, 47),
-		(7001,11134, 1, 1, 47),
-		(7001,11141, 1, 1, 47),
-		(7001,11084, 1, 1, 47),
-		(7001,11087, 1, 1, 47),
-		(7001,11094, 1, 1, 47),
-		(7001,10374, 1, 1, 47),
-		(7001,10375, 1, 1, 47),
-		(7001,11051, 1, 1, 17),
-		(7001,11071, 1, 1, 16),
-		(7001,11076, 1, 1, 16),
-		(7001,11102, 1, 1, 17),
-		(7001,11124, 1, 1, 17),
-		(7001,11090, 1, 1, 17),
-		(7001,11159, 1, 1, 1200),
-		(7001,11159, 2, 1, 650),
-		(7001,11160, 1, 1, 800),
-		(7001,11160, 2, 1, 300),
-		(7001,11161, 1, 1, 100),
-		(7001,11161, 2, 1, 50),
-		(7001,11164, 1, 1, 100),
-		(7001,11162, 1, 1, 100),
-		(7001,11163, 1, 1, 100),
-		(7001,11158, 1, 1, 300),
-		(7001,11463, 1, 1, 300),
-		(7001,11356, 1, 1, 300),
-		(7001,11464, 1, 1, 300),
-		(7001,11357, 1, 1, 500),
-		(7001,11039, 1, 2, 300),
-		(7001,11040, 1, 2, 270),
-		(7001,11049, 1, 2, 300),
-		(7001,11061, 1, 2, 290),
-		(7001,11063, 1, 2, 290),
-		(7001,11077, 1, 2, 290),
-		(7001,11099, 1, 2, 280),
-		(7001,11105, 1, 2, 300),
-		(7001,11129, 1, 2, 250),
-		(7001,11130, 1, 2, 300),
-		(7001,11131, 1, 2, 280),
-		(7001,11139, 1, 2, 290),
-		(7001,11145, 1, 2, 260),
-		(7001,11096, 1, 2, 300),
-		(7001,11046, 1, 2, 47),
-		(7001,11066, 1, 2, 47),
-		(7001,11067, 1, 2, 47),
-		(7001,11072, 1, 2, 47),
-		(7001,11082, 1, 2, 47),
-		(7001,11103, 1, 2, 47),
-		(7001,11110, 1, 2, 47),
-		(7001,11112, 1, 2, 47),
-		(7001,11114, 1, 2, 47),
-		(7001,11115, 1, 2, 47),
-		(7001,11121, 1, 2, 47),
-		(7001,11144, 1, 2, 48),
-		(7001,11085, 1, 2, 47),
-		(7001,11089, 1, 2, 47),
-		(7001,11091, 1, 2, 47),
-		(7001,10376, 1, 2, 47),
-		(7001,10377, 1, 2, 47),
-		(7001,11127, 1, 2, 17),
-		(7001,11069, 1, 2, 17),
-		(7001,11142, 1, 2, 17),
-		(7001,11078, 1, 2, 17),
-		(7001,11056, 1, 2, 16),
-		(7001,11092, 1, 2, 16),
-		(7001,11159, 1, 2, 1200),
-		(7001,11159, 2, 2, 650),
-		(7001,11160, 1, 2, 800),
-		(7001,11160, 2, 2, 300),
-		(7001,11161, 1, 2, 100),
-		(7001,11161, 2, 2, 50),
-		(7001,11164, 1, 2, 100),
-		(7001,11162, 1, 2, 100),
-		(7001,11163, 1, 2, 100),
-		(7001,11158, 1, 2, 300),
-		(7001,11463, 1, 2, 300),
-		(7001,11356, 1, 2, 300),
-		(7001,11464, 1, 2, 300),
-		(7001,11357, 1, 2, 500),
-		(7001,11041, 1, 3, 266),
-		(7001,11047, 1, 3, 266),
-		(7001,11054, 1, 3, 266),
-		(7001,11065, 1, 3, 266),
-		(7001,11068, 1, 3, 266),
-		(7001,11075, 1, 3, 266),
-		(7001,11100, 1, 3, 266),
-		(7001,11106, 1, 3, 266),
-		(7001,11119, 1, 3, 266),
-		(7001,11135, 1, 3, 268),
-		(7001,11136, 1, 3, 268),
-		(7001,11138, 1, 3, 268),
-		(7001,11088, 1, 3, 268),
-		(7001,10370, 1, 3, 266),
-		(7001,10368, 1, 3, 268),
-		(7001,11043, 1, 3, 50),
-		(7001,11048, 1, 3, 50),
-		(7001,11050, 1, 3, 50),
-		(7001,11058, 1, 3, 50),
-		(7001,11060, 1, 3, 50),
-		(7001,11074, 1, 3, 50),
-		(7001,11107, 1, 3, 50),
-		(7001,11111, 1, 3, 50),
-		(7001,11113, 1, 3, 50),
-		(7001,11118, 1, 3, 50),
-		(7001,11126, 1, 3, 50),
-		(7001,11140, 1, 3, 50),
-		(7001,11086, 1, 3, 50),
-		(7001,11095, 1, 3, 50),
-		(7001,11055, 1, 3, 50),
-		(7001,10378, 1, 3, 50),
-		(7001,11052, 1, 3, 15),
-		(7001,11073, 1, 3, 15),
-		(7001,11146, 1, 3, 15),
-		(7001,11116, 1, 3, 15),
-		(7001,11123, 1, 3, 15),
-		(7001,11097, 1, 3, 15),
-		(7001,10367, 1, 3, 15),
-		(7001,10371, 1, 3, 15),
-		(7001,10373, 1, 3, 15),
-		(7001,10778, 1, 3, 375),
-		(7001,11209, 1, 3, 375),
-		(7001,10813, 1, 3, 375),
-		(7001,11389, 1, 3, 375),
-		(7001,11159, 1, 3, 1000),
-		(7001,11159, 2, 3, 250),
-		(7001,11160, 1, 3, 700),
-		(7001,11160, 2, 3, 175),
-		(7001,11161, 1, 3, 300),
-		(7001,11161, 2, 3, 75),
-		(7001,11465, 1, 3, 53),
-		(7001,11466, 1, 3, 27),
-		(7001,11467, 1, 3, 266),
-		(7001,11468, 1, 3, 533),
-		(7001,11469, 1, 3, 186),
-		(7002,11037, 1, 1, 100),
-		(7002,11038, 1, 1, 100),
-		(7002,11044, 1, 1, 100),
-		(7002,11057, 1, 1, 100),
-		(7002,11059, 1, 1, 100),
-		(7002,11079, 1, 1, 100),
-		(7002,11098, 1, 1, 100),
-		(7002,11104, 1, 1, 100),
-		(7002,11117, 1, 1, 100),
-		(7002,11128, 1, 1, 100),
-		(7002,11133, 1, 1, 100),
-		(7002,11137, 1, 1, 100),
-		(7002,11143, 1, 1, 100),
-		(7002,11132, 1, 1, 100),
-		(7002,11042, 1, 1, 60),
-		(7002,11045, 1, 1, 60),
-		(7002,11064, 1, 1, 60),
-		(7002,11062, 1, 1, 60),
-		(7002,11070, 1, 1, 60),
-		(7002,11101, 1, 1, 60),
-		(7002,11108, 1, 1, 60),
-		(7002,11109, 1, 1, 60),
-		(7002,11120, 1, 1, 60),
-		(7002,11122, 1, 1, 60),
-		(7002,11134, 1, 1, 60),
-		(7002,11141, 1, 1, 60),
-		(7002,11084, 1, 1, 60),
-		(7002,11087, 1, 1, 60),
-		(7002,11094, 1, 1, 60),
-		(7002,10374, 1, 1, 60),
-		(7002,10375, 1, 1, 60),
-		(7002,11051, 1, 1, 20),
-		(7002,11071, 1, 1, 20),
-		(7002,11076, 1, 1, 20),
-		(7002,11102, 1, 1, 20),
-		(7002,11124, 1, 1, 20),
-		(7002,11090, 1, 1, 20),
-		(7002,11164, 1, 1, 400),
-		(7002,11162, 1, 1, 200),
-		(7002,11163, 1, 1, 200),
-		(7002,11463, 1, 1, 100),
-		(7002,11464, 1, 1, 150),
-		(7002,10355, 1, 1, 150),
-		(7002,12506, 1, 1, 200),
-		(7002,12507, 1, 1, 300),
-		(7002,12508, 1, 1, 900),
-		(7002,13629, 1, 1, 350),
-		(7002,13628, 1, 1, 200),
-		(7002,11356, 1, 1, 100),
-		(7002,11357, 1, 1, 150),
-		(7002,12014, 1, 1, 250),
-		(7002,12016, 1, 1, 400),
-		(7002,12015, 1, 1, 410),
-		(7002,11159, 2, 1, 500),
-		(7002,11159, 4, 1, 500),
-		(7002,11159, 6, 1, 500),
-		(7002,11160, 2, 1, 400),
-		(7002,11160, 4, 1, 400),
-		(7002,11160, 6, 1, 400),
-		(7002,11161, 2, 1, 100),
-		(7002,11161, 4, 1, 100),
-		(7002,11161, 6, 1, 100),
-		(7002,11039, 1, 2, 100),
-		(7002,11040, 1, 2, 100),
-		(7002,11049, 1, 2, 100),
-		(7002,11061, 1, 2, 100),
-		(7002,11063, 1, 2, 100),
-		(7002,11077, 1, 2, 100),
-		(7002,11099, 1, 2, 100),
-		(7002,11105, 1, 2, 100),
-		(7002,11129, 1, 2, 100),
-		(7002,11130, 1, 2, 100),
-		(7002,11131, 1, 2, 100),
-		(7002,11139, 1, 2, 100),
-		(7002,11145, 1, 2, 100),
-		(7002,11096, 1, 2, 100),
-		(7002,11046, 1, 2, 60),
-		(7002,11066, 1, 2, 60),
-		(7002,11067, 1, 2, 60),
-		(7002,11072, 1, 2, 60),
-		(7002,11082, 1, 2, 60),
-		(7002,11103, 1, 2, 60),
-		(7002,11110, 1, 2, 60),
-		(7002,11112, 1, 2, 60),
-		(7002,11114, 1, 2, 60),
-		(7002,11115, 1, 2, 60),
-		(7002,11121, 1, 2, 60),
-		(7002,11144, 1, 2, 60),
-		(7002,11085, 1, 2, 60),
-		(7002,11089, 1, 2, 60),
-		(7002,11091, 1, 2, 60),
-		(7002,10376, 1, 2, 60),
-		(7002,10377, 1, 2, 60),
-		(7002,11127, 1, 2, 20),
-		(7002,11069, 1, 2, 20),
-		(7002,11142, 1, 2, 20),
-		(7002,11078, 1, 2, 20),
-		(7002,11056, 1, 2, 20),
-		(7002,11092, 1, 2, 20),
-		(7002,11164, 1, 2, 400),
-		(7002,11162, 1, 2, 200),
-		(7002,11163, 1, 2, 200),
-		(7002,11463, 1, 2, 250),
-		(7002,11464, 1, 2, 350),
-		(7002,12506, 1, 2, 150),
-		(7002,12507, 1, 2, 200),
-		(7002,12508, 1, 2, 350),
-		(7002,13629, 1, 2, 250),
-		(7002,13628, 1, 2, 200),
-		(7002,10355, 1, 2, 400),
-		(7002,11158, 1, 2, 100),
-		(7002,11356, 1, 2, 100),
-		(7002,11357, 1, 2, 100),
-		(7002,12014, 1, 2, 300),
-		(7002,12016, 1, 2, 450),
-		(7002,12015, 1, 2, 460),
-		(7002,11159, 2, 2, 500),
-		(7002,11159, 4, 2, 500),
-		(7002,11159, 6, 2, 500),
-		(7002,11160, 2, 2, 400),
-		(7002,11160, 4, 2, 400),
-		(7002,11160, 6, 2, 400),
-		(7002,11161, 2, 2, 100),
-		(7002,11161, 4, 2, 100),
-		(7002,11161, 6, 2, 100),
-		(7002,11041, 1, 3, 120),
-		(7002,11047, 1, 3, 120),
-		(7002,11054, 1, 3, 120),
-		(7002,11065, 1, 3, 120),
-		(7002,11068, 1, 3, 120),
-		(7002,11075, 1, 3, 120),
-		(7002,11100, 1, 3, 120),
-		(7002,11106, 1, 3, 120),
-		(7002,11119, 1, 3, 120),
-		(7002,11135, 1, 3, 120),
-		(7002,11136, 1, 3, 120),
-		(7002,11138, 1, 3, 120),
-		(7002,11088, 1, 3, 120),
-		(7002,10370, 1, 3, 120),
-		(7002,10368, 1, 3, 120),
-		(7002,11043, 1, 3, 65),
-		(7002,11048, 1, 3, 65),
-		(7002,11050, 1, 3, 65),
-		(7002,11058, 1, 3, 65),
-		(7002,11060, 1, 3, 65),
-		(7002,11074, 1, 3, 65),
-		(7002,11107, 1, 3, 65),
-		(7002,11111, 1, 3, 65),
-		(7002,11113, 1, 3, 65),
-		(7002,11118, 1, 3, 65),
-		(7002,11126, 1, 3, 65),
-		(7002,11140, 1, 3, 65),
-		(7002,11086, 1, 3, 65),
-		(7002,11095, 1, 3, 65),
-		(7002,11055, 1, 3, 65),
-		(7002,10378, 1, 3, 65),
-		(7002,11052, 1, 3, 15),
-		(7002,11073, 1, 3, 15),
-		(7002,11146, 1, 3, 15),
-		(7002,11116, 1, 3, 15),
-		(7002,11123, 1, 3, 15),
-		(7002,11097, 1, 3, 15),
-		(7002,10367, 1, 3, 15),
-		(7002,10371, 1, 3, 15),
-		(7002,10373, 1, 3, 15),
-		(7002,10778, 3, 3, 490),
-		(7002,11209, 3, 3, 490),
-		(7002,10813, 3, 3, 490),
-		(7002,11389, 3, 3, 490),
-		(7002,12046, 3, 3, 500),
-		(7002,12503, 3, 3, 500),
-		(7002,11159, 2, 3, 500),
-		(7002,11159, 4, 3, 500),
-		(7002,11159, 6, 3, 500),
-		(7002,11160, 2, 3, 400),
-		(7002,11160, 4, 3, 400),
-		(7002,11160, 6, 3, 400),
-		(7002,11161, 2, 3, 100),
-		(7002,11161, 4, 3, 100),
-		(7002,11161, 6, 3, 100),
-		(7002,11465, 1, 3, 53),
-		(7002,11466, 1, 3, 27),
-		(7002,11467, 1, 3, 266),
-		(7002,11468, 1, 3, 533),
-		(7002,11469, 1, 3, 186),
-		(7011,11037, 1, 1, 290),
-		(7011,11038, 1, 1, 270),
-		(7011,11044, 1, 1, 270),
-		(7011,11057, 1, 1, 290),
-		(7011,11059, 1, 1, 290),
-		(7011,11079, 1, 1, 290),
-		(7011,11098, 1, 1, 280),
-		(7011,11104, 1, 1, 300),
-		(7011,11117, 1, 1, 280),
-		(7011,11128, 1, 1, 290),
-		(7011,11133, 1, 1, 290),
-		(7011,11137, 1, 1, 300),
-		(7011,11143, 1, 1, 290),
-		(7011,11132, 1, 1, 270),
-		(7011,11042, 1, 1, 47),
-		(7011,11045, 1, 1, 47),
-		(7011,11064, 1, 1, 47),
-		(7011,11062, 1, 1, 47),
-		(7011,11070, 1, 1, 48),
-		(7011,11101, 1, 1, 47),
-		(7011,11108, 1, 1, 47),
-		(7011,11109, 1, 1, 47),
-		(7011,11120, 1, 1, 47),
-		(7011,11122, 1, 1, 47),
-		(7011,11134, 1, 1, 47),
-		(7011,11141, 1, 1, 47),
-		(7011,11084, 1, 1, 47),
-		(7011,11087, 1, 1, 47),
-		(7011,11094, 1, 1, 47),
-		(7011,10374, 1, 1, 47),
-		(7011,10375, 1, 1, 47),
-		(7011,11051, 1, 1, 17),
-		(7011,11071, 1, 1, 16),
-		(7011,11076, 1, 1, 16),
-		(7011,11102, 1, 1, 17),
-		(7011,11124, 1, 1, 17),
-		(7011,11090, 1, 1, 17),
-		(7011,11159, 1, 1, 1200),
-		(7011,11159, 2, 1, 650),
-		(7011,11160, 1, 1, 800),
-		(7011,11160, 2, 1, 300),
-		(7011,11161, 1, 1, 100),
-		(7011,11161, 2, 1, 50),
-		(7011,11164, 1, 1, 100),
-		(7011,11162, 1, 1, 100),
-		(7011,11163, 1, 1, 100),
-		(7011,11158, 1, 1, 300),
-		(7011,11463, 1, 1, 300),
-		(7011,11356, 1, 1, 300),
-		(7011,11464, 1, 1, 300),
-		(7011,11357, 1, 1, 500),
-		(7011,11039, 1, 2, 300),
-		(7011,11040, 1, 2, 270),
-		(7011,11049, 1, 2, 300),
-		(7011,11061, 1, 2, 290),
-		(7011,11063, 1, 2, 290),
-		(7011,11077, 1, 2, 290),
-		(7011,11099, 1, 2, 280),
-		(7011,11105, 1, 2, 300),
-		(7011,11129, 1, 2, 250),
-		(7011,11130, 1, 2, 300),
-		(7011,11131, 1, 2, 280),
-		(7011,11139, 1, 2, 290),
-		(7011,11145, 1, 2, 260),
-		(7011,11096, 1, 2, 300),
-		(7011,11046, 1, 2, 47),
-		(7011,11066, 1, 2, 47),
-		(7011,11067, 1, 2, 47),
-		(7011,11072, 1, 2, 47),
-		(7011,11082, 1, 2, 47),
-		(7011,11103, 1, 2, 47),
-		(7011,11110, 1, 2, 47),
-		(7011,11112, 1, 2, 47),
-		(7011,11114, 1, 2, 47),
-		(7011,11115, 1, 2, 47),
-		(7011,11121, 1, 2, 47),
-		(7011,11144, 1, 2, 48),
-		(7011,11085, 1, 2, 47),
-		(7011,11089, 1, 2, 47),
-		(7011,11091, 1, 2, 47),
-		(7011,10376, 1, 2, 47),
-		(7011,10377, 1, 2, 47),
-		(7011,11127, 1, 2, 17),
-		(7011,11069, 1, 2, 17),
-		(7011,11142, 1, 2, 17),
-		(7011,11078, 1, 2, 17),
-		(7011,11056, 1, 2, 16),
-		(7011,11092, 1, 2, 16),
-		(7011,11159, 1, 2, 1200),
-		(7011,11159, 2, 2, 650),
-		(7011,11160, 1, 2, 800),
-		(7011,11160, 2, 2, 300),
-		(7011,11161, 1, 2, 100),
-		(7011,11161, 2, 2, 50),
-		(7011,11164, 1, 2, 100),
-		(7011,11162, 1, 2, 100),
-		(7011,11163, 1, 2, 100),
-		(7011,11158, 1, 2, 300),
-		(7011,11463, 1, 2, 300),
-		(7011,11356, 1, 2, 300),
-		(7011,11464, 1, 2, 300),
-		(7011,11357, 1, 2, 500),
-		(7011,11041, 1, 3, 266),
-		(7011,11047, 1, 3, 266),
-		(7011,11054, 1, 3, 266),
-		(7011,11065, 1, 3, 266),
-		(7011,11068, 1, 3, 266),
-		(7011,11075, 1, 3, 266),
-		(7011,11100, 1, 3, 266),
-		(7011,11106, 1, 3, 266),
-		(7011,11119, 1, 3, 266),
-		(7011,11135, 1, 3, 268),
-		(7011,11136, 1, 3, 268),
-		(7011,11138, 1, 3, 268),
-		(7011,11088, 1, 3, 268),
-		(7011,10370, 1, 3, 266),
-		(7011,10368, 1, 3, 268),
-		(7011,11043, 1, 3, 50),
-		(7011,11048, 1, 3, 50),
-		(7011,11050, 1, 3, 50),
-		(7011,11058, 1, 3, 50),
-		(7011,11060, 1, 3, 50),
-		(7011,11074, 1, 3, 50),
-		(7011,11107, 1, 3, 50),
-		(7011,11111, 1, 3, 50),
-		(7011,11113, 1, 3, 50),
-		(7011,11118, 1, 3, 50),
-		(7011,11126, 1, 3, 50),
-		(7011,11140, 1, 3, 50),
-		(7011,11086, 1, 3, 50),
-		(7011,11095, 1, 3, 50),
-		(7011,11055, 1, 3, 50),
-		(7011,10378, 1, 3, 50),
-		(7011,11052, 1, 3, 15),
-		(7011,11073, 1, 3, 15),
-		(7011,11146, 1, 3, 15),
-		(7011,11116, 1, 3, 15),
-		(7011,11123, 1, 3, 15),
-		(7011,11097, 1, 3, 15),
-		(7011,10367, 1, 3, 15),
-		(7011,10371, 1, 3, 15),
-		(7011,10373, 1, 3, 15),
-		(7011,10778, 1, 3, 375),
-		(7011,11209, 1, 3, 375),
-		(7011,10813, 1, 3, 375),
-		(7011,11389, 1, 3, 375),
-		(7011,11159, 1, 3, 1000),
-		(7011,11159, 2, 3, 250),
-		(7011,11160, 1, 3, 700),
-		(7011,11160, 2, 3, 175),
-		(7011,11161, 1, 3, 300),
-		(7011,11161, 2, 3, 75),
-		(7011,11465, 1, 3, 53),
-		(7011,11466, 1, 3, 27),
-		(7011,11467, 1, 3, 266),
-		(7011,11468, 1, 3, 533),
-		(7011,11469, 1, 3, 186),
-		(7012,11037, 1, 1, 290),
-		(7012,11038, 1, 1, 270),
-		(7012,11044, 1, 1, 270),
-		(7012,11057, 1, 1, 290),
-		(7012,11059, 1, 1, 290),
-		(7012,11079, 1, 1, 290),
-		(7012,11098, 1, 1, 280),
-		(7012,11104, 1, 1, 300),
-		(7012,11117, 1, 1, 280),
-		(7012,11128, 1, 1, 290),
-		(7012,11133, 1, 1, 290),
-		(7012,11137, 1, 1, 300),
-		(7012,11143, 1, 1, 290),
-		(7012,11132, 1, 1, 270),
-		(7012,11042, 1, 1, 47),
-		(7012,11045, 1, 1, 47),
-		(7012,11064, 1, 1, 47),
-		(7012,11062, 1, 1, 47),
-		(7012,11070, 1, 1, 48),
-		(7012,11101, 1, 1, 47),
-		(7012,11108, 1, 1, 47),
-		(7012,11109, 1, 1, 47),
-		(7012,11120, 1, 1, 47),
-		(7012,11122, 1, 1, 47),
-		(7012,11134, 1, 1, 47),
-		(7012,11141, 1, 1, 47),
-		(7012,11084, 1, 1, 47),
-		(7012,11087, 1, 1, 47),
-		(7012,11094, 1, 1, 47),
-		(7012,10374, 1, 1, 47),
-		(7012,10375, 1, 1, 47),
-		(7012,11051, 1, 1, 17),
-		(7012,11071, 1, 1, 16),
-		(7012,11076, 1, 1, 16),
-		(7012,11102, 1, 1, 17),
-		(7012,11124, 1, 1, 17),
-		(7012,11090, 1, 1, 17),
-		(7012,11159, 1, 1, 1200),
-		(7012,11159, 2, 1, 650),
-		(7012,11160, 1, 1, 800),
-		(7012,11160, 2, 1, 300),
-		(7012,11161, 1, 1, 100),
-		(7012,11161, 2, 1, 50),
-		(7012,11164, 1, 1, 100),
-		(7012,11162, 1, 1, 100),
-		(7012,11163, 1, 1, 100),
-		(7012,11158, 1, 1, 300),
-		(7012,11463, 1, 1, 300),
-		(7012,11356, 1, 1, 300),
-		(7012,11464, 1, 1, 300),
-		(7012,11357, 1, 1, 500),
-		(7012,11039, 1, 2, 300),
-		(7012,11040, 1, 2, 270),
-		(7012,11049, 1, 2, 300),
-		(7012,11061, 1, 2, 290),
-		(7012,11063, 1, 2, 290),
-		(7012,11077, 1, 2, 290),
-		(7012,11099, 1, 2, 280),
-		(7012,11105, 1, 2, 300),
-		(7012,11129, 1, 2, 250),
-		(7012,11130, 1, 2, 300),
-		(7012,11131, 1, 2, 280),
-		(7012,11139, 1, 2, 290),
-		(7012,11145, 1, 2, 260),
-		(7012,11096, 1, 2, 300),
-		(7012,11046, 1, 2, 47),
-		(7012,11066, 1, 2, 47),
-		(7012,11067, 1, 2, 47),
-		(7012,11072, 1, 2, 47),
-		(7012,11082, 1, 2, 47),
-		(7012,11103, 1, 2, 47),
-		(7012,11110, 1, 2, 47),
-		(7012,11112, 1, 2, 47),
-		(7012,11114, 1, 2, 47),
-		(7012,11115, 1, 2, 47),
-		(7012,11121, 1, 2, 47),
-		(7012,11144, 1, 2, 48),
-		(7012,11085, 1, 2, 47),
-		(7012,11089, 1, 2, 47),
-		(7012,11091, 1, 2, 47),
-		(7012,10376, 1, 2, 47),
-		(7012,10377, 1, 2, 47),
-		(7012,11127, 1, 2, 17),
-		(7012,11069, 1, 2, 17),
-		(7012,11142, 1, 2, 17),
-		(7012,11078, 1, 2, 17),
-		(7012,11056, 1, 2, 16),
-		(7012,11092, 1, 2, 16),
-		(7012,11159, 1, 2, 1200),
-		(7012,11159, 2, 2, 650),
-		(7012,11160, 1, 2, 800),
-		(7012,11160, 2, 2, 300),
-		(7012,11161, 1, 2, 100),
-		(7012,11161, 2, 2, 50),
-		(7012,11164, 1, 2, 100),
-		(7012,11162, 1, 2, 100),
-		(7012,11163, 1, 2, 100),
-		(7012,11158, 1, 2, 300),
-		(7012,11463, 1, 2, 300),
-		(7012,11356, 1, 2, 300),
-		(7012,11464, 1, 2, 300),
-		(7012,11357, 1, 2, 500),
-		(7012,11041, 1, 3, 266),
-		(7012,11047, 1, 3, 266),
-		(7012,11054, 1, 3, 266),
-		(7012,11065, 1, 3, 266),
-		(7012,11068, 1, 3, 266),
-		(7012,11075, 1, 3, 266),
-		(7012,11100, 1, 3, 266),
-		(7012,11106, 1, 3, 266),
-		(7012,11119, 1, 3, 266),
-		(7012,11135, 1, 3, 268),
-		(7012,11136, 1, 3, 268),
-		(7012,11138, 1, 3, 268),
-		(7012,11088, 1, 3, 268),
-		(7012,10370, 1, 3, 266),
-		(7012,10368, 1, 3, 268),
-		(7012,11043, 1, 3, 50),
-		(7012,11048, 1, 3, 50),
-		(7012,11050, 1, 3, 50),
-		(7012,11058, 1, 3, 50),
-		(7012,11060, 1, 3, 50),
-		(7012,11074, 1, 3, 50),
-		(7012,11107, 1, 3, 50),
-		(7012,11111, 1, 3, 50),
-		(7012,11113, 1, 3, 50),
-		(7012,11118, 1, 3, 50),
-		(7012,11126, 1, 3, 50),
-		(7012,11140, 1, 3, 50),
-		(7012,11086, 1, 3, 50),
-		(7012,11095, 1, 3, 50),
-		(7012,11055, 1, 3, 50),
-		(7012,10378, 1, 3, 50),
-		(7012,11052, 1, 3, 15),
-		(7012,11073, 1, 3, 15),
-		(7012,11146, 1, 3, 15),
-		(7012,11116, 1, 3, 15),
-		(7012,11123, 1, 3, 15),
-		(7012,11097, 1, 3, 15),
-		(7012,10367, 1, 3, 15),
-		(7012,10371, 1, 3, 15),
-		(7012,10373, 1, 3, 15),
-		(7012,10778, 1, 3, 375),
-		(7012,11209, 1, 3, 375),
-		(7012,10813, 1, 3, 375),
-		(7012,11389, 1, 3, 375),
-		(7012,11159, 1, 3, 1000),
-		(7012,11159, 2, 3, 250),
-		(7012,11160, 1, 3, 700),
-		(7012,11160, 2, 3, 175),
-		(7012,11161, 1, 3, 300),
-		(7012,11161, 2, 3, 75),
-		(7012,11465, 1, 3, 53),
-		(7012,11466, 1, 3, 27),
-		(7012,11467, 1, 3, 266),
-		(7012,11468, 1, 3, 533),
-		(7012,11469, 1, 3, 186);
-
-
-
-END;
-
--- a/schemas/patch-schema/23-earth.sql
+++ b/schemas/patch-schema/23-earth.sql
@@ -1,6 +0,0 @@
-BEGIN;
-
-- Add 'earth' to the event_type ENUM type
-ALTER TYPE event_type ADD VALUE 'earth';
-
-END;
--- a/schemas/patch-schema/23-rework-distributions-2.sql
+++ b/schemas/patch-schema/23-rework-distributions-2.sql
@@ -0,0 +1,6 @@
+BEGIN;
+
+ALTER TABLE distribution ADD COLUMN rights INTEGER;
+ALTER TABLE distribution ADD COLUMN selection BOOLEAN;
+
+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/schemas/patch-schema/24-paperdata.sql
+++ b/schemas/patch-schema/24-paperdata.sql
@@ -1,23 +0,0 @@
-BEGIN;
-
-CREATE TABLE IF NOT EXISTS paper_data_gifts (
-   id serial PRIMARY KEY,
-   gift_id integer, 
-   item_id integer, 
-   unk0 integer,
-   unk1 integer,
-   chance integer
-);
-
-CREATE TABLE IF NOT EXISTS paper_data (
-   id serial PRIMARY KEY,
-   paper_type integer,
-   paper_id integer, 
-   option1 integer, 
-   option2 integer,
-   option3 integer,
-   option4 integer,
-   option5 integer
-);
-
-END;
--- a/schemas/patch-schema/25-fix-rasta-id.sql
+++ b/schemas/patch-schema/25-fix-rasta-id.sql
@@ -0,0 +1,5 @@
+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
@@ -0,0 +1,5 @@
+BEGIN;
+
+ALTER TABLE mail ADD COLUMN IF NOT EXISTS is_sys_message BOOLEAN NOT NULL DEFAULT false;
+
+END;
--- a/server/channelserver/handlers.go
+++ b/server/channelserver/handlers.go
@@ -30,6 +30,18 @@ func stubEnumerateNoResults(s *Session, ackHandle uint32) {
 	doAckBufSucceed(s, ackHandle, enumBf.Data())
 }

+func doAckEarthSucceed(s *Session, ackHandle uint32, data []*byteframe.ByteFrame) {
+	bf := byteframe.NewByteFrame()
+	bf.WriteUint32(uint32(s.server.erupeConfig.EarthID))
+	bf.WriteUint32(0)
+	bf.WriteUint32(0)
+	bf.WriteUint32(uint32(len(data)))
+	for i := range data {
+		bf.WriteBytes(data[i].Data())
+	}
+	doAckBufSucceed(s, ackHandle, bf.Data())
+}
+
 func doAckBufSucceed(s *Session, ackHandle uint32, data []byte) {
 	s.QueueSendMHF(&mhfpacket.MsgSysAck{
 		AckHandle:        ackHandle,
@@ -76,7 +88,7 @@ func updateRights(s *Session) {
 		Rights:              s.courses,
 		UnkSize:             0,
 	}
-	s.QueueSendMHF(update)
+	s.QueueSendMHFNonBlocking(update)
 }

 func handleMsgHead(s *Session, p mhfpacket.MHFPacket) {}
@@ -131,7 +143,6 @@ 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

@@ -181,7 +192,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.QueueSendMHF(&mhfpacket.MsgSysStageDestruct{})
+						sess.QueueSendMHFNonBlocking(&mhfpacket.MsgSysStageDestruct{})
 					}
 				}
 			}
@@ -1103,8 +1114,66 @@ func handleMsgMhfUnreserveSrg(s *Session, p mhfpacket.MHFPacket) {

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

+func handleMsgMhfGetEarthStatus(s *Session, p mhfpacket.MHFPacket) {
+	pkt := p.(*mhfpacket.MsgMhfGetEarthStatus)
+	bf := byteframe.NewByteFrame()
+	bf.WriteUint32(uint32(TimeWeekStart().Unix())) // Start
+	bf.WriteUint32(uint32(TimeWeekNext().Unix()))  // End
+	bf.WriteInt32(s.server.erupeConfig.EarthStatus)
+	bf.WriteInt32(s.server.erupeConfig.EarthID)
+	for i, m := range s.server.erupeConfig.EarthMonsters {
+		if _config.ErupeConfig.RealClientMode <= _config.G9 {
+			if i == 3 {
+				break
+			}
+		}
+		if i == 4 {
+			break
+		}
+		bf.WriteInt32(m)
+	}
+	doAckBufSucceed(s, pkt.AckHandle, bf.Data())
+}
+
 func handleMsgMhfRegistSpabiTime(s *Session, p mhfpacket.MHFPacket) {}

+func handleMsgMhfGetEarthValue(s *Session, p mhfpacket.MHFPacket) {
+	pkt := p.(*mhfpacket.MsgMhfGetEarthValue)
+	type EarthValues struct {
+		Value []uint32
+	}
+
+	var earthValues []EarthValues
+	switch pkt.ReqType {
+	case 1:
+		earthValues = []EarthValues{
+			{[]uint32{1, 312, 0, 0, 0, 0}},
+			{[]uint32{2, 99, 0, 0, 0, 0}},
+		}
+	case 2:
+		earthValues = []EarthValues{
+			{[]uint32{1, 5771, 0, 0, 0, 0}},
+			{[]uint32{2, 1847, 0, 0, 0, 0}},
+		}
+	case 3:
+		earthValues = []EarthValues{
+			{[]uint32{1001, 36, 0, 0, 0, 0}},
+			{[]uint32{9001, 3, 0, 0, 0, 0}},
+			{[]uint32{9002, 10, 300, 0, 0, 0}},
+		}
+	}
+
+	var data []*byteframe.ByteFrame
+	for _, i := range earthValues {
+		bf := byteframe.NewByteFrame()
+		for _, j := range i.Value {
+			bf.WriteUint32(j)
+		}
+		data = append(data, bf)
+	}
+	doAckEarthSucceed(s, pkt.AckHandle, data)
+}
+
 func handleMsgMhfDebugPostValue(s *Session, p mhfpacket.MHFPacket) {}

 func handleMsgMhfGetRandFromTable(s *Session, p mhfpacket.MHFPacket) {
--- 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 {
+	if err != nil || !mhfcourse.CourseExists(30, s.courses) {
 		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.QueueSendMHF(castedBin)
+	s.QueueSendMHFNonBlocking(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.QueueSend(deleteNotif.Data())
+			s.QueueSendNonBlocking(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.QueueSend(reloadNotif.Data())
+			s.QueueSendNonBlocking(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.QueueSendMHF(&mhfpacket.MsgSysCastedBinary{
+				s.QueueSendMHFNonBlocking(&mhfpacket.MsgSysCastedBinary{
 					CharID:         s.charID,
 					MessageType:    BinaryMessageTypeState,
 					RawDataPayload: payloadBytes,
@@ -407,6 +407,13 @@ 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 {
@@ -532,7 +539,7 @@ func handleMsgSysCastBinary(s *Session, p mhfpacket.MHFPacket) {
 			char := s.server.FindSessionByCharID(targetID)

 			if char != nil {
-				char.QueueSendMHF(resp)
+				char.QueueSendMHFNonBlocking(resp)
 			}
 		}
 	default:
--- a/server/channelserver/handlers_character.go
+++ b/server/channelserver/handlers_character.go
@@ -23,6 +23,7 @@ const (
 	pGalleryData          // +1748
 	pToreData             // +240
 	pGardenData           // +68
+	pPlaytime             // +4
 	pWeaponType           // +1
 	pWeaponID             // +2
 	pHR                   // +2
@@ -45,6 +46,7 @@ type CharacterSaveData struct {
 	GalleryData   []byte
 	ToreData      []byte
 	GardenData    []byte
+	Playtime      uint32
 	WeaponType    uint8
 	WeaponID      uint16
 	HR            uint16
@@ -59,6 +61,7 @@ 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
@@ -74,6 +77,7 @@ 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
@@ -87,6 +91,7 @@ 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
@@ -98,6 +103,7 @@ 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
@@ -231,6 +237,7 @@ 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
--- a/server/channelserver/handlers_distitem.go
+++ b/server/channelserver/handlers_distitem.go
@@ -13,6 +13,7 @@ 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"`
@@ -23,7 +24,7 @@ type Distribution struct {
 	MaxGR           int16     `db:"max_gr"`
 	EventName       string    `db:"event_name"`
 	Description     string    `db:"description"`
-	Data            []byte    `db:"data"`
+	Selection       bool      `db:"selection"`
 }

 func handleMsgMhfEnumerateDistItem(s *Session, p mhfpacket.MHFPacket) {
@@ -32,7 +33,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, times_acceptable,
+		SELECT d.id, event_name, description, COALESCE(rights, 0) AS rights, COALESCE(selection, false) AS selection, 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,
@@ -60,7 +61,7 @@ func handleMsgMhfEnumerateDistItem(s *Session, p mhfpacket.MHFPacket) {
 	for _, dist := range itemDists {
 		bf.WriteUint32(dist.ID)
 		bf.WriteUint32(uint32(dist.Deadline.Unix()))
-		bf.WriteUint32(0) // Unk
+		bf.WriteUint32(dist.Rights)
 		bf.WriteUint16(dist.TimesAcceptable)
 		bf.WriteUint16(dist.TimesAccepted)
 		if _config.ErupeConfig.RealClientMode >= _config.G9 {
@@ -79,7 +80,11 @@ func handleMsgMhfEnumerateDistItem(s *Session, p mhfpacket.MHFPacket) {
 			bf.WriteUint16(0) // Unk
 		}
 		if _config.ErupeConfig.RealClientMode >= _config.G8 {
-			bf.WriteUint8(0) // Unk
+			if dist.Selection {
+				bf.WriteUint8(2) // Selection
+			} else {
+				bf.WriteUint8(0)
+			}
 		}
 		if _config.ErupeConfig.RealClientMode >= _config.G7 {
 			bf.WriteUint16(0) // Unk
--- a/server/channelserver/handlers_earth.go
+++ b/server/channelserver/handlers_earth.go
@@ -1,172 +0,0 @@
-package channelserver
-
-import (
-	"erupe-ce/common/byteframe"
-	_config "erupe-ce/config"
-	"erupe-ce/network/mhfpacket"
-	"log"
-	"time"
-)
-
-func doAckEarthSucceed(s *Session, ackHandle uint32, data []*byteframe.ByteFrame) {
-	bf := byteframe.NewByteFrame()
-	bf.WriteUint32(0)
-	bf.WriteUint32(0)
-	bf.WriteUint32(0)
-	bf.WriteUint32(uint32(len(data)))
-	for i := range data {
-		bf.WriteBytes(data[i].Data())
-	}
-	doAckBufSucceed(s, ackHandle, bf.Data())
-}
-
-func handleMsgMhfGetEarthValue(s *Session, p mhfpacket.MHFPacket) {
-	pkt := p.(*mhfpacket.MsgMhfGetEarthValue)
-	type EarthValues struct {
-		Value []uint32
-	}
-
-	var earthValues []EarthValues
-	switch pkt.ReqType {
-	case 1:
-		earthValues = []EarthValues{
-			// {Block, DureSlays, Unk, Unk, Unk, Unk}
-			{[]uint32{1, 100, 0, 0, 0, 0}},
-			{[]uint32{2, 100, 0, 0, 0, 0}},
-		}
-	case 2:
-		earthValues = []EarthValues{
-			// {Block, Floors?, Unk, Unk, Unk, Unk}
-			{[]uint32{1, 5771, 0, 0, 0, 0}},
-			{[]uint32{2, 1847, 0, 0, 0, 0}},
-		}
-	case 3:
-		earthValues = []EarthValues{
-			{[]uint32{1001, 36, 0, 0, 0, 0}},   //getTouhaHistory
-			{[]uint32{9001, 3, 0, 0, 0, 0}},    //getKohouhinDropStopFlag  // something to do with ttcSetDisableFlag?
-			{[]uint32{9002, 10, 300, 0, 0, 0}}, //getKohouhinForceValue
-		}
-	}
-
-	var data []*byteframe.ByteFrame
-	for _, i := range earthValues {
-		bf := byteframe.NewByteFrame()
-		for _, j := range i.Value {
-			bf.WriteUint32(j)
-		}
-		data = append(data, bf)
-	}
-	doAckEarthSucceed(s, pkt.AckHandle, data)
-}
-func cleanupEarthStatus(s *Session) {
-	s.server.db.Exec(`DELETE FROM events WHERE event_type='earth'`)
-}
-
-func generateEarthStatusTimestamps(s *Session, start uint32, debug bool) []uint32 {
-	timestamps := make([]uint32, 4)
-	midnight := TimeMidnight()
-	if start == 0 || TimeAdjusted().Unix() > int64(start)+1814400 {
-		cleanupEarthStatus(s)
-		start = uint32(midnight.Add(24 * time.Hour).Unix())
-		s.server.db.Exec("INSERT INTO events (event_type, start_time) VALUES ('earth', to_timestamp($1)::timestamp without time zone)", start)
-	}
-	if debug {
-		timestamps[0] = uint32(TimeWeekStart().Unix())
-		timestamps[1] = uint32(TimeWeekNext().Unix())
-		timestamps[2] = uint32(TimeWeekNext().Add(time.Duration(7) * time.Hour * 24).Unix())
-		timestamps[3] = uint32(TimeWeekNext().Add(time.Duration(14) * time.Hour * 24).Unix())
-	} else {
-		timestamps[0] = start
-		timestamps[1] = timestamps[0] + 604800
-		timestamps[2] = timestamps[1] + 604800
-		timestamps[3] = timestamps[2] + 604800
-	}
-	return timestamps
-}
-func handleMsgMhfGetEarthStatus(s *Session, p mhfpacket.MHFPacket) {
-	pkt := p.(*mhfpacket.MsgMhfGetEarthStatus)
-	bf := byteframe.NewByteFrame()
-
-	var earthTimestamps []uint32
-	var debug = s.server.erupeConfig.EarthDebug
-	earthId, earthStart := int32(0x01BEEFEE), uint32(0)
-	rows, _ := s.server.db.Queryx("SELECT id, (EXTRACT(epoch FROM start_time)::int) as start_time FROM events WHERE event_type='earth'")
-	if rows == nil {
-		log.Println("No rows found")
-	} else {
-		for rows.Next() {
-			rows.Scan(&earthId, &earthStart)
-		}
-	}
-	earthTimestamps = generateEarthStatusTimestamps(s, earthStart, debug)
-
-	// Conquest
-	if uint32(TimeAdjusted().Unix()) > earthTimestamps[0] {
-		bf.WriteUint32(earthTimestamps[0]) // Start
-		bf.WriteUint32(earthTimestamps[1]) // End
-		bf.WriteInt32(1)                   //Conquest Earth Status ID //1 and 2 UNK the difference
-		bf.WriteInt32(earthId)             //ID
-	} else {
-		bf.WriteUint32(earthTimestamps[1]) // Start
-		bf.WriteUint32(earthTimestamps[2]) // End
-		bf.WriteInt32(2)                   //Conquest Earth Status ID //1 and 2 UNK the difference
-		bf.WriteInt32(earthId)             //ID
-	}
-	for i, m := range s.server.erupeConfig.EarthMonsters {
-		//Changed from G9 to G8 to get conquest working in g9.1
-		if _config.ErupeConfig.RealClientMode <= _config.G8 {
-			if i == 3 {
-				break
-			}
-		}
-		if i == 4 {
-			break
-		}
-		bf.WriteInt32(m)
-	}
-
-	// Pallone
-	if uint32(TimeAdjusted().Unix()) > earthTimestamps[1] {
-		bf.WriteUint32(earthTimestamps[1]) // Start
-		bf.WriteUint32(earthTimestamps[2]) // End
-		bf.WriteInt32(11)                  //Pallone Earth Status ID //11 is Fest //12 is Reward
-		bf.WriteInt32(earthId + 1)         //ID
-	} else {
-		bf.WriteUint32(earthTimestamps[2]) // Start
-		bf.WriteUint32(earthTimestamps[3]) // End
-		bf.WriteInt32(12)                  //Pallone Earth Status ID //11 is Fest //12 is Reward
-		bf.WriteInt32(earthId + 1)         //ID
-	}
-	for i, m := range s.server.erupeConfig.EarthMonsters {
-		//Changed from G9 to G8 to get conquest working in g9.1
-		if _config.ErupeConfig.RealClientMode <= _config.G8 {
-			if i == 3 {
-				break
-			}
-		}
-		if i == 4 {
-			break
-		}
-		bf.WriteInt32(m)
-	}
-
-	// Tower
-	if uint32(TimeAdjusted().Unix()) > earthTimestamps[2] {
-		bf.WriteUint32(earthTimestamps[2]) // Start
-		bf.WriteUint32(earthTimestamps[3]) // End
-		bf.WriteInt32(21)                  //Tower Earth Status ID
-		bf.WriteInt32(earthId + 2)         //ID
-		for i, m := range s.server.erupeConfig.EarthMonsters {
-			if _config.ErupeConfig.RealClientMode <= _config.G8 {
-				if i == 3 {
-					break
-				}
-			}
-			if i == 4 {
-				break
-			}
-			bf.WriteInt32(m)
-		}
-	}
-	doAckBufSucceed(s, pkt.AckHandle, bf.Data())
-}
--- a/server/channelserver/handlers_festa.go
+++ b/server/channelserver/handlers_festa.go
@@ -292,7 +292,7 @@ func handleMsgMhfInfoFesta(s *Session, p mhfpacket.MHFPacket) {
 	} else {
 		bf.WriteUint32(s.server.erupeConfig.GameplayOptions.MaximumFP)
 	}
-	bf.WriteUint16(500)
+	bf.WriteUint16(100) // Reward multiplier (%)

 	var temp uint32
 	bf.WriteUint16(4)
--- a/server/channelserver/handlers_guild.go
+++ b/server/channelserver/handlers_guild.go
@@ -8,7 +8,6 @@ import (
 	"erupe-ce/common/mhfitem"
 	_config "erupe-ce/config"
 	"fmt"
-	"math"
 	"sort"
 	"strings"
 	"time"
@@ -748,8 +747,7 @@ func handleMsgMhfOperateGuild(s *Session, p mhfpacket.MHFPacket) {
 	case mhfpacket.OperateGuildChangePugi3:
 		handleChangePugi(s, uint8(pkt.Data1.ReadUint32()), guild, 3)
 	case mhfpacket.OperateGuildUnlockOutfit:
-		// 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)
+		s.server.db.Exec(`UPDATE guilds SET pugi_outfits=$1 WHERE id=$2`, pkt.Data1.ReadUint32(), guild.ID)
 	case mhfpacket.OperateGuildDonateRoom:
 		quantity := uint16(pkt.Data1.ReadUint32())
 		bf.WriteBytes(handleDonateRP(s, quantity, guild, 2))
@@ -971,14 +969,21 @@ func handleMsgMhfInfoGuild(s *Session, p mhfpacket.MHFPacket) {
 		bf.WriteUint8(0)
 		bf.WriteUint8(0)

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

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

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

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

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

@@ -1526,7 +1536,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,35 +61,41 @@ func (gm *GuildMember) Save(s *Session) error {
 }

 const guildMembersSelectSQL = `
-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
+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
 		FROM guild_characters gc
-		LEFT JOIN characters c ON c.id = gc.character_id
-		LEFT JOIN guilds g ON g.id = gc.guild_id
-) AS subquery
+	) 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
 `

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

 	if err != nil {
@@ -115,7 +121,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_id=$1", guildMembersSelectSQL), charID)
+	rows, err := s.server.db.Queryx(fmt.Sprintf("%s	WHERE character.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_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.QueueSendMHF(castedBinary)
+	recipient.QueueSendMHFNonBlocking(castedBinary)
 }

 func getCharacterName(s *Session, charID uint32) string {
--- a/server/channelserver/handlers_mercenary.go
+++ b/server/channelserver/handlers_mercenary.go
@@ -21,7 +21,6 @@ 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) {
@@ -157,60 +156,60 @@ func handleMsgMhfSaveMercenary(s *Session, p mhfpacket.MHFPacket) {

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

-		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)
+	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))
 	} else {
-		resp.WriteBool(true)
-		resp.WriteBytes(data)
+		bf.WriteUint8(0)
 	}
-	resp.WriteUint32(gcp)
-	doAckBufSucceed(s, pkt.AckHandle, resp.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())
 }

 func handleMsgMhfReadMercenaryM(s *Session, p mhfpacket.MHFPacket) {
--- a/server/channelserver/handlers_quest.go
+++ b/server/channelserver/handlers_quest.go
@@ -85,6 +85,10 @@ 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
 }

@@ -238,8 +242,10 @@ 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.QueueSend(raviNotif.Data())
+			session.QueueSendNonBlocking(raviNotif.Data())
 		}
 	} else {
 		for session := range sema.clients {
 			if session.charID == s.charID {
-				session.QueueSend(raviNotif.Data())
+				session.QueueSendNonBlocking(raviNotif.Data())
 			}
 		}
 	}
--- a/server/channelserver/handlers_seibattle.go
+++ b/server/channelserver/handlers_seibattle.go
@@ -15,546 +15,31 @@ func handleMsgMhfGetBreakSeibatuLevelReward(s *Session, p mhfpacket.MHFPacket) {
 	doAckBufSucceed(s, pkt.AckHandle, bf.Data())
 }

-type WeeklySeibatuRankingRewardData struct {
-	Index0           int32  //Place Start
-	Index1           int32  //Place Finish
-	Index2           uint32 // UNK
-	DistributionType int32  //Type 7201:Item 7202:N Points 7203:Guild Contribution Points
-	ItemID           int32
-	Amount           int32
-}
-type WeeklySeibatuRankingRewards struct {
-	Unk0      int32
-	ItemID    int32
-	Amount    uint32
-	PlaceFrom int32
-	PlaceTo   int32
+type WeeklySeibatuRankingReward struct {
+	Unk0 int32
+	Unk1 int32
+	Unk2 uint32
+	Unk3 int32
+	Unk4 int32
+	Unk5 int32
 }

 func handleMsgMhfGetWeeklySeibatuRankingReward(s *Session, p mhfpacket.MHFPacket) {
 	pkt := p.(*mhfpacket.MsgMhfGetWeeklySeibatuRankingReward)
 	var data []*byteframe.ByteFrame
-	var weeklySeibatuRankingRewards []WeeklySeibatuRankingRewards
-	var weeklySeibatuRankingRewardsData []WeeklySeibatuRankingRewardData
-
-	switch pkt.Operation {
-	case 1:
-		//Conquest Data
-		switch pkt.ID { // Seems to align with EarthStatus 1 and 2 for Conquest
-		case 1:
-			switch pkt.EarthMonster {
-			case 116:
-				weeklySeibatuRankingRewards = []WeeklySeibatuRankingRewards{
-					{0, 2, 3, 1, 100},
-					{0, 2, 6, 1, 100},
-					{0, 2, 6, 1, 100},
-					{0, 2, 6, 1, 100},
-					{0, 2, 15, 1, 100},
-					{0, 2, 15, 1, 100},
-					{0, 2, 25, 1, 100},
-
-					{0, 2, 2, 101, 1000},
-					{0, 2, 4, 101, 1000},
-					{0, 2, 4, 101, 1000},
-					{0, 2, 4, 101, 1000},
-					{0, 2, 9, 101, 1000},
-					{0, 2, 9, 101, 1000},
-					{0, 2, 30, 101, 1000},
-
-					{0, 2, 2, 1000, 1001},
-					{0, 2, 4, 1000, 1001},
-					{0, 2, 4, 1000, 1001},
-					{0, 2, 4, 1000, 1001},
-					{0, 2, 6, 1000, 1001},
-					{0, 2, 6, 1000, 1001},
-				}
-			case 107:
-				weeklySeibatuRankingRewards = []WeeklySeibatuRankingRewards{
-					{0, 2, 3, 1, 100},
-					{0, 2, 6, 1, 100},
-					{0, 2, 6, 1, 100},
-					{0, 2, 6, 1, 100},
-					{0, 2, 15, 1, 100},
-					{0, 2, 15, 1, 100},
-					{0, 2, 25, 1, 100},
-
-					{0, 2, 2, 101, 1000},
-					{0, 2, 4, 101, 1000},
-					{0, 2, 4, 101, 1000},
-					{0, 2, 4, 101, 1000},
-					{0, 2, 9, 101, 1000},
-					{0, 2, 9, 101, 1000},
-					{0, 2, 30, 101, 1000},
-
-					{0, 2, 2, 1000, 1001},
-					{0, 2, 4, 1000, 1001},
-					{0, 2, 4, 1000, 1001},
-					{0, 2, 4, 1000, 1001},
-					{0, 2, 6, 1000, 1001},
-					{0, 2, 6, 1000, 1001},
-				}
-			case 2:
-				weeklySeibatuRankingRewards = []WeeklySeibatuRankingRewards{
-					{0, 2, 3, 1, 100},
-					{0, 2, 6, 1, 100},
-					{0, 2, 6, 1, 100},
-					{0, 2, 6, 1, 100},
-					{0, 2, 15, 1, 100},
-					{0, 2, 15, 1, 100},
-					{0, 2, 25, 1, 100},
-
-					{0, 2, 2, 101, 1000},
-					{0, 2, 4, 101, 1000},
-					{0, 2, 4, 101, 1000},
-					{0, 2, 4, 101, 1000},
-					{0, 2, 9, 101, 1000},
-					{0, 2, 9, 101, 1000},
-					{0, 2, 30, 101, 1000},
-
-					{0, 2, 2, 1000, 1001},
-					{0, 2, 4, 1000, 1001},
-					{0, 2, 4, 1000, 1001},
-					{0, 2, 4, 1000, 1001},
-					{0, 2, 6, 1000, 1001},
-					{0, 2, 6, 1000, 1001},
-				}
-			case 36:
-				weeklySeibatuRankingRewards = []WeeklySeibatuRankingRewards{
-					{0, 2, 3, 1, 100},
-					{0, 2, 6, 1, 100},
-					{0, 2, 6, 1, 100},
-					{0, 2, 6, 1, 100},
-					{0, 2, 15, 1, 100},
-					{0, 2, 15, 1, 100},
-					{0, 2, 25, 1, 100},
-
-					{0, 2, 2, 101, 1000},
-					{0, 2, 4, 101, 1000},
-					{0, 2, 4, 101, 1000},
-					{0, 2, 4, 101, 1000},
-					{0, 2, 9, 101, 1000},
-					{0, 2, 9, 101, 1000},
-					{0, 2, 30, 101, 1000},
-
-					{0, 2, 2, 1000, 1001},
-					{0, 2, 4, 1000, 1001},
-					{0, 2, 4, 1000, 1001},
-					{0, 2, 4, 1000, 1001},
-					{0, 2, 6, 1000, 1001},
-					{0, 2, 6, 1000, 1001},
-				}
-			}
-
-		case 2:
-			switch pkt.EarthMonster {
-			case 116:
-				weeklySeibatuRankingRewards = []WeeklySeibatuRankingRewards{
-					{0, 2, 3, 1, 100},
-					{0, 2, 6, 1, 100},
-					{0, 2, 6, 1, 100},
-					{0, 2, 6, 1, 100},
-					{0, 2, 15, 1, 100},
-					{0, 2, 15, 1, 100},
-					{0, 2, 25, 1, 100},
-
-					{0, 2, 2, 101, 1000},
-					{0, 2, 4, 101, 1000},
-					{0, 2, 4, 101, 1000},
-					{0, 2, 4, 101, 1000},
-					{0, 2, 9, 101, 1000},
-					{0, 2, 9, 101, 1000},
-					{0, 2, 30, 101, 1000},
-
-					{0, 2, 2, 1000, 1001},
-					{0, 2, 4, 1000, 1001},
-					{0, 2, 4, 1000, 1001},
-					{0, 2, 4, 1000, 1001},
-					{0, 2, 6, 1000, 1001},
-					{0, 2, 6, 1000, 1001},
-				}
-			case 107:
-				weeklySeibatuRankingRewards = []WeeklySeibatuRankingRewards{
-					{0, 2, 3, 1, 100},
-					{0, 2, 6, 1, 100},
-					{0, 2, 6, 1, 100},
-					{0, 2, 6, 1, 100},
-					{0, 2, 15, 1, 100},
-					{0, 2, 15, 1, 100},
-					{0, 2, 25, 1, 100},
-
-					{0, 2, 2, 101, 1000},
-					{0, 2, 4, 101, 1000},
-					{0, 2, 4, 101, 1000},
-					{0, 2, 4, 101, 1000},
-					{0, 2, 9, 101, 1000},
-					{0, 2, 9, 101, 1000},
-					{0, 2, 30, 101, 1000},
-
-					{0, 2, 2, 1000, 1001},
-					{0, 2, 4, 1000, 1001},
-					{0, 2, 4, 1000, 1001},
-					{0, 2, 4, 1000, 1001},
-					{0, 2, 6, 1000, 1001},
-					{0, 2, 6, 1000, 1001},
-				}
-			case 2:
-				weeklySeibatuRankingRewards = []WeeklySeibatuRankingRewards{
-					{0, 2, 3, 1, 100},
-					{0, 2, 6, 1, 100},
-					{0, 2, 6, 1, 100},
-					{0, 2, 6, 1, 100},
-					{0, 2, 15, 1, 100},
-					{0, 2, 15, 1, 100},
-					{0, 2, 25, 1, 100},
-
-					{0, 2, 2, 101, 1000},
-					{0, 2, 4, 101, 1000},
-					{0, 2, 4, 101, 1000},
-					{0, 2, 4, 101, 1000},
-					{0, 2, 9, 101, 1000},
-					{0, 2, 9, 101, 1000},
-					{0, 2, 30, 101, 1000},
-
-					{0, 2, 2, 1000, 1001},
-					{0, 2, 4, 1000, 1001},
-					{0, 2, 4, 1000, 1001},
-					{0, 2, 4, 1000, 1001},
-					{0, 2, 6, 1000, 1001},
-					{0, 2, 6, 1000, 1001},
-				}
-			case 36:
-				weeklySeibatuRankingRewards = []WeeklySeibatuRankingRewards{
-					{0, 2, 3, 1, 100},
-					{0, 2, 6, 1, 100},
-					{0, 2, 6, 1, 100},
-					{0, 2, 6, 1, 100},
-					{0, 2, 15, 1, 100},
-					{0, 2, 15, 1, 100},
-					{0, 2, 25, 1, 100},
-
-					{0, 2, 2, 101, 1000},
-					{0, 2, 4, 101, 1000},
-					{0, 2, 4, 101, 1000},
-					{0, 2, 4, 101, 1000},
-					{0, 2, 9, 101, 1000},
-					{0, 2, 9, 101, 1000},
-					{0, 2, 30, 101, 1000},
-
-					{0, 2, 2, 1000, 1001},
-					{0, 2, 4, 1000, 1001},
-					{0, 2, 4, 1000, 1001},
-					{0, 2, 4, 1000, 1001},
-					{0, 2, 6, 1000, 1001},
-					{0, 2, 6, 1000, 1001},
-				}
-			}
-
-		}
-	case 3:
-		//Pallone Festival Data
-		weeklySeibatuRankingRewardsData = []WeeklySeibatuRankingRewardData{
-
-			//Unk0
-			//Unk1
-			//Unk2
-			//Unk3,
-			//ROUTE, (Crashes if it doesnt exist be careful with values )
-			//Status 1 = Only Now !  2= Unk 3= Disabled}
-
-			//Route 0
-			{0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0},
-			//Route 1
-			{0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0},
-			//Route 2
-			{0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0},
-			//Route 3
-			{0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0},
-			//Route 4
-			{0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0},
-			//Route 5
-			{0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0},
-			//Route 6
-			{0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0},
-			//Route 7
-			{0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0},
-			//Route 8
-			{0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0},
-			//Route 9
-			{0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0},
-			//Route 10
-			{0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0},
-		}
-
-		// 0 = Max 7 Routes so value 6
-		//ZZ looks like it only works up to Route 2
-
-	case 5:
-		//Event Reward Data
-		switch pkt.ID {
-		//243400 = Route 0
-		//243401 = Route 1
-		//I have a sneaky suspicion that the above massive array is feeding into this somehow....
-		case 240031:
-			weeklySeibatuRankingRewardsData = []WeeklySeibatuRankingRewardData{
-				{1, 1, 1, 7201, 12068, 1}}
-		case 240041:
-			weeklySeibatuRankingRewardsData = []WeeklySeibatuRankingRewardData{
-				{0, 0, 1, 7201, 12068, 1}}
-		case 240042:
-			weeklySeibatuRankingRewardsData = []WeeklySeibatuRankingRewardData{
-				{0, 0, 2, 7201, 12068, 1}}
-		case 240051:
-			weeklySeibatuRankingRewardsData = []WeeklySeibatuRankingRewardData{
-				{0, 0, 1, 7201, 12068, 1}}
-		case 240052:
-			weeklySeibatuRankingRewardsData = []WeeklySeibatuRankingRewardData{
-				{1, 1, 1, 7201, 12068, 1},
-			}
-		case 260001:
-			//Tower Dure Kill Reward
-			weeklySeibatuRankingRewardsData = []WeeklySeibatuRankingRewardData{
-
-				//Can only have 10 in each dist (It disapears otherwise) Looks like up to dist 4 is implemented
-				//This is claimable for every Dure Kill, Make cliamable in bulk or mandatory claim per kill
-				//{unk,unk,dist,seiabtuType,ItemID,Value}
-				{0, 0, 1, 7201, 11463, 1},
-				{0, 0, 1, 7201, 11464, 1},
-				{0, 0, 1, 7201, 11163, 1},
-				{0, 0, 1, 7201, 11159, 5},
-				{0, 0, 1, 7201, 11160, 5},
-				{0, 0, 1, 7201, 11161, 5},
-
-				{0, 0, 2, 7201, 12506, 1},
-				{0, 0, 2, 7201, 10355, 1},
-				{0, 0, 2, 7201, 11163, 1},
-				{0, 0, 2, 7201, 11159, 5},
-				{0, 0, 2, 7201, 11160, 5},
-				{0, 0, 2, 7201, 11161, 5},
-			}
-		case 260003:
-			//Tower Floor Reward
-			weeklySeibatuRankingRewardsData = []WeeklySeibatuRankingRewardData{
-				//Adjust Floors done in database to make blue
-				//This is claimable for every Floor Climbed across dist 1 and 2
-				//{Floor,unk,unk,seiabtuType,ItemID,Value}
-
-				{1, 0, 0, 7201, 11158, 1},
-				{2, 0, 0, 7201, 11173, 1},
-				{3, 0, 0, 7201, 10813, 3},
-				{4, 0, 0, 7201, 11163, 1},
-				{5, 0, 0, 7201, 11164, 1},
-				{6, 0, 0, 7201, 11389, 3},
-				{6, 0, 0, 7201, 11381, 1},
-				{7, 0, 0, 7201, 11384, 1},
-				{8, 0, 0, 7201, 11159, 10},
-				{9, 0, 0, 7201, 11160, 10},
-				{10, 0, 0, 7201, 11161, 10},
-				{11, 0, 0, 7201, 11265, 2},
-				{11, 0, 0, 7201, 7279, 2},
-				{12, 0, 0, 7201, 11381, 1},
-				{13, 0, 0, 7201, 11384, 1},
-				{14, 0, 0, 7201, 11381, 1},
-				{15, 0, 0, 7201, 11384, 1},
-				{15, 0, 0, 7201, 11464, 1},
-				{16, 0, 0, 7201, 11381, 1},
-				{17, 0, 0, 7201, 11384, 1},
-				{18, 0, 0, 7201, 11381, 1},
-				{19, 0, 0, 7201, 11384, 1},
-				{20, 0, 0, 7201, 10778, 3},
-				{21, 0, 0, 7201, 11265, 2},
-				{21, 0, 0, 7201, 7279, 2},
-				{22, 0, 0, 7201, 11381, 1},
-				{23, 0, 0, 7201, 11384, 1},
-				{24, 0, 0, 7201, 11381, 1},
-				{25, 0, 0, 7201, 11389, 3},
-				{25, 0, 0, 7201, 11286, 4},
-				{26, 0, 0, 7201, 11384, 1},
-				{27, 0, 0, 7201, 11381, 1},
-				{28, 0, 0, 7201, 11384, 1},
-				{29, 0, 0, 7201, 11381, 1},
-				{30, 0, 0, 7201, 11209, 3},
-				{31, 0, 0, 7201, 11265, 2},
-				{31, 0, 0, 7201, 7279, 2},
-				{32, 0, 0, 7201, 11159, 10},
-				{33, 0, 0, 7201, 11463, 1},
-				{34, 0, 0, 7201, 11160, 10},
-				{35, 0, 0, 7201, 11286, 4},
-				{36, 0, 0, 7201, 11161, 10},
-				{38, 0, 0, 7201, 11384, 1},
-				{39, 0, 0, 7201, 11164, 1},
-				{40, 0, 0, 7201, 10813, 3},
-				{41, 0, 0, 7201, 11265, 2},
-				{41, 0, 0, 7201, 7280, 2},
-				{43, 0, 0, 7201, 11381, 1},
-				{45, 0, 0, 7201, 11286, 4},
-				{47, 0, 0, 7201, 11384, 1},
-				{48, 0, 0, 7201, 11358, 1},
-				{50, 0, 0, 7201, 11356, 1},
-				{51, 0, 0, 7201, 11265, 2},
-				{51, 0, 0, 7201, 7280, 2},
-				{53, 0, 0, 7201, 11381, 2},
-				{55, 0, 0, 7201, 11357, 1},
-				{57, 0, 0, 7201, 11384, 1},
-				{60, 0, 0, 7201, 11286, 4},
-				{61, 0, 0, 7201, 11265, 2},
-				{61, 0, 0, 7201, 7280, 2},
-				{63, 0, 0, 7201, 11381, 2},
-				{66, 0, 0, 7201, 11463, 1},
-				{67, 0, 0, 7201, 11384, 1},
-				{70, 0, 0, 7201, 11286, 4},
-				{71, 0, 0, 7201, 11265, 2},
-				{71, 0, 0, 7201, 7280, 2},
-				{73, 0, 0, 7201, 11381, 2},
-				{77, 0, 0, 7201, 11384, 1},
-				{79, 0, 0, 7201, 11164, 1},
-				{80, 0, 0, 7201, 11286, 6},
-				{81, 0, 0, 7201, 11265, 2},
-				{81, 0, 0, 7201, 7281, 1},
-				{83, 0, 0, 7201, 11381, 2},
-				{85, 0, 0, 7201, 11464, 1},
-				{87, 0, 0, 7201, 11384, 1},
-				{90, 0, 0, 7201, 11286, 6},
-				{91, 0, 0, 7201, 11265, 2},
-				{91, 0, 0, 7201, 7281, 1},
-				{93, 0, 0, 7201, 11381, 2},
-				{95, 0, 0, 7201, 10778, 3},
-				{97, 0, 0, 7201, 11384, 1},
-				{99, 0, 0, 7201, 11463, 1},
-				{100, 0, 0, 7201, 11286, 6},
-				{101, 0, 0, 7201, 11265, 2},
-				{101, 0, 0, 7201, 7281, 1},
-				{103, 0, 0, 7201, 11381, 2},
-				{107, 0, 0, 7201, 11384, 1},
-				{110, 0, 0, 7201, 11286, 6},
-				{113, 0, 0, 7201, 11381, 2},
-				{115, 0, 0, 7201, 11164, 1},
-				{117, 0, 0, 7201, 11384, 1},
-				{120, 0, 0, 7201, 11286, 12},
-				{123, 0, 0, 7201, 11381, 2},
-				{127, 0, 0, 7201, 11384, 1},
-				{130, 0, 0, 7201, 11286, 12},
-				{132, 0, 0, 7201, 11381, 2},
-				{134, 0, 0, 7201, 11384, 1},
-				{136, 0, 0, 7201, 11381, 2},
-				{138, 0, 0, 7201, 11384, 1},
-				{140, 0, 0, 7201, 11286, 12},
-				{142, 0, 0, 7201, 11382, 1},
-				{144, 0, 0, 7201, 11385, 1},
-				{145, 0, 0, 7201, 11464, 1},
-				{146, 0, 0, 7201, 11382, 1},
-				{148, 0, 0, 7201, 11385, 1},
-				{150, 0, 0, 7201, 11164, 1},
-				{155, 0, 0, 7201, 11382, 1},
-				{160, 0, 0, 7201, 11209, 3},
-				{165, 0, 0, 7201, 11385, 1},
-				{170, 0, 0, 7201, 11159, 10},
-				{175, 0, 0, 7201, 11382, 1},
-				{180, 0, 0, 7201, 11160, 10},
-				{185, 0, 0, 7201, 11385, 1},
-				{190, 0, 0, 7201, 11161, 10},
-				{195, 0, 0, 7201, 11382, 1},
-				{200, 0, 0, 7201, 11159, 15},
-				{210, 0, 0, 7201, 11160, 15},
-				{220, 0, 0, 7201, 11385, 1},
-				{235, 0, 0, 7201, 11382, 2},
-				{250, 0, 0, 7201, 11161, 15},
-				{265, 0, 0, 7201, 11159, 20},
-				{280, 0, 0, 7201, 11385, 1},
-				{300, 0, 0, 7201, 11160, 20},
-				{315, 0, 0, 7201, 11382, 2},
-				{330, 0, 0, 7201, 11385, 1},
-				{350, 0, 0, 7201, 11161, 20},
-				{365, 0, 0, 7201, 11382, 2},
-				{380, 0, 0, 7201, 11385, 1},
-				{400, 0, 0, 7201, 11159, 25},
-				{415, 0, 0, 7201, 11382, 2},
-				{430, 0, 0, 7201, 11385, 1},
-				{450, 0, 0, 7201, 11160, 25},
-				{465, 0, 0, 7201, 11382, 2},
-				{480, 0, 0, 7201, 11385, 1},
-				{500, 0, 0, 7201, 11161, 25},
-				{525, 0, 0, 7201, 11382, 2},
-				{550, 0, 0, 7201, 11385, 1},
-				{575, 0, 0, 7201, 11159, 25},
-				{600, 0, 0, 7201, 11382, 2},
-				{625, 0, 0, 7201, 11385, 1},
-				{650, 0, 0, 7201, 11160, 25},
-				{675, 0, 0, 7201, 11382, 2},
-				{700, 0, 0, 7201, 11385, 1},
-				{725, 0, 0, 7201, 11161, 25},
-				{750, 0, 0, 7201, 11382, 2},
-				{775, 0, 0, 7201, 11385, 1},
-				{800, 0, 0, 7201, 11159, 25},
-				{825, 0, 0, 7201, 11382, 2},
-				{850, 0, 0, 7201, 11385, 1},
-				{875, 0, 0, 7201, 11160, 25},
-				{900, 0, 0, 7201, 11382, 2},
-				{925, 0, 0, 7201, 11385, 1},
-				{950, 0, 0, 7201, 11161, 25},
-				{975, 0, 0, 7201, 11382, 2},
-				{1000, 0, 0, 7201, 11385, 1},
-				{1025, 0, 0, 7201, 11159, 25},
-				{1050, 0, 0, 7201, 11382, 2},
-				{1075, 0, 0, 7201, 11385, 1},
-				{1100, 0, 0, 7201, 11160, 25},
-				{1125, 0, 0, 7201, 11382, 2},
-				{1150, 0, 0, 7201, 11385, 1},
-				{1200, 0, 0, 7201, 11161, 25},
-				{1235, 0, 0, 7201, 11382, 2},
-				{1270, 0, 0, 7201, 11385, 1},
-				{1305, 0, 0, 7201, 11159, 25},
-				{1340, 0, 0, 7201, 11382, 2},
-				{1375, 0, 0, 7201, 11385, 1},
-				{1410, 0, 0, 7201, 11160, 25},
-				{1445, 0, 0, 7201, 11382, 2},
-				{1480, 0, 0, 7201, 11385, 1},
-				{1500, 0, 0, 7201, 11161, 25},
-			}
-		default:
-			//Covers all Pallone Requests... for now
-			weeklySeibatuRankingRewardsData = []WeeklySeibatuRankingRewardData{
-				//1st
-				{1, 0, 0, 7202, 10, 10000},
-				{1, 1, 0, 7201, 10, 30},
-				{1, 1, 0, 7201, 10, 18},
-				{1, 1, 0, 7201, 10, 18},
-				//2nd - 3rd
-				{2, 3, 0, 7202, 10, 6000},
-				{2, 3, 0, 7201, 10, 15},
-				{2, 3, 0, 7201, 10, 9},
-				{2, 3, 0, 7201, 10, 9},
-				//4th -10th
-				{4, 10, 0, 7202, 10, 5500},
-				{4, 10, 0, 7201, 10, 12},
-				{4, 10, 0, 7201, 10, 9},
-			}
-
-		}
-
+	weeklySeibatuRankingRewards := []WeeklySeibatuRankingReward{
+		{0, 0, 0, 0, 0, 0},
 	}
-	if pkt.Operation == 1 {
-		for _, seibatuData := range weeklySeibatuRankingRewards {
-			bf := byteframe.NewByteFrame()
-			bf.WriteInt32(seibatuData.Unk0)
-			bf.WriteInt32(seibatuData.ItemID)
-			bf.WriteUint32(seibatuData.Amount)
-			bf.WriteInt32(seibatuData.PlaceFrom)
-			bf.WriteInt32(seibatuData.PlaceTo)
-			data = append(data, bf)
-		}
-	} else {
-		for _, seibatuData := range weeklySeibatuRankingRewardsData {
-			bf := byteframe.NewByteFrame()
-			bf.WriteInt32(seibatuData.Index0)
-			bf.WriteInt32(seibatuData.Index1)
-			bf.WriteUint32(seibatuData.Index2)
-			bf.WriteInt32(seibatuData.DistributionType)
-			bf.WriteInt32(seibatuData.ItemID)
-			bf.WriteInt32(seibatuData.Amount)
-			data = append(data, bf)
-		}
+	for _, reward := range weeklySeibatuRankingRewards {
+		bf := byteframe.NewByteFrame()
+		bf.WriteInt32(reward.Unk0)
+		bf.WriteInt32(reward.Unk1)
+		bf.WriteUint32(reward.Unk2)
+		bf.WriteInt32(reward.Unk3)
+		bf.WriteInt32(reward.Unk4)
+		bf.WriteInt32(reward.Unk5)
+		data = append(data, bf)
 	}
-
 	doAckEarthSucceed(s, pkt.AckHandle, data)
 }

--- a/server/channelserver/handlers_semaphore.go
+++ b/server/channelserver/handlers_semaphore.go
@@ -65,6 +65,15 @@ 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()
@@ -77,7 +86,7 @@ func handleMsgSysCreateAcquireSemaphore(s *Session, p mhfpacket.MHFPacket) {
 				maxPlayers: 127,
 			}
 		} else {
-			s.server.semaphore[SemaphoreID] = NewSemaphore(s.server, SemaphoreID, 1)
+			s.server.semaphore[SemaphoreID] = NewSemaphore(s, SemaphoreID, 1)
 		}
 		newSemaphore = s.server.semaphore[SemaphoreID]
 		s.server.semaphoreLock.Unlock()
@@ -103,7 +112,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.clients[s] = s.charID
+		sema.host = s
 		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.QueueSendMHF(&mhfpacket.MsgSysCleanupObject{})
+	s.QueueSendMHFNonBlocking(&mhfpacket.MsgSysCleanupObject{})

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

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

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

@@ -362,7 +361,7 @@ func handleMsgSysWaitStageBinary(s *Session, p mhfpacket.MHFPacket) {
 			doAckBufSucceed(s, pkt.AckHandle, []byte{0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00})
 			return
 		}
-		for {
+		for i := 0; i < 10; i++ {
 			s.logger.Debug("MsgSysWaitStageBinary before lock and get stage")
 			stage.Lock()
 			stageBinary, gotBinary := stage.rawBinaryData[stageBinaryKey{pkt.BinaryType0, pkt.BinaryType1}]
@@ -370,13 +369,15 @@ func handleMsgSysWaitStageBinary(s *Session, p mhfpacket.MHFPacket) {
 			s.logger.Debug("MsgSysWaitStageBinary after lock and get stage")
 			if gotBinary {
 				doAckBufSucceed(s, pkt.AckHandle, stageBinary)
-				break
+				return
 			} 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/handlers_tower.go
+++ b/server/channelserver/handlers_tower.go
@@ -3,11 +3,10 @@ package channelserver
 import (
 	_config "erupe-ce/config"
 	"fmt"
+	"go.uber.org/zap"
 	"strings"
 	"time"

-	"go.uber.org/zap"
-
 	"erupe-ce/common/byteframe"
 	"erupe-ce/common/stringsupport"
 	"erupe-ce/network/mhfpacket"
@@ -24,15 +23,8 @@ type TowerInfoSkill struct {
 }

 type TowerInfoHistory struct {
-	Unk0 TowerHistory // 5
-	Unk1 TowerHistory // 5
-}
-type TowerHistory struct {
-	Unk0 int16
-	Unk1 int16
-	Unk2 int16
-	Unk3 int16
-	Unk4 int16
+	Unk0 []int16 // 5
+	Unk1 []int16 // 5
 }

 type TowerInfoLevel struct {
@@ -59,25 +51,12 @@ func handleMsgMhfGetTowerInfo(s *Session, p mhfpacket.MHFPacket) {
 		History []TowerInfoHistory
 		Level   []TowerInfoLevel
 	}
-	history1 := TowerHistory{
-		Unk0: 1,
-		Unk1: 2,
-		Unk2: 3,
-		Unk3: 4,
-		Unk4: 5,
-	}
-	history2 := TowerHistory{
-		Unk0: 1,
-		Unk1: 2,
-		Unk2: 3,
-		Unk3: 4,
-		Unk4: 5,
-	}
+
 	towerInfo := TowerInfo{
 		TRP:     []TowerInfoTRP{{0, 0}},
 		Skill:   []TowerInfoSkill{{0, make([]int16, 64)}},
-		History: []TowerInfoHistory{{history1, history2}},
-		Level:   []TowerInfoLevel{{0, 5, 5, 5}, {0, 5, 5, 5}},
+		History: []TowerInfoHistory{{make([]int16, 5), make([]int16, 5)}},
+		Level:   []TowerInfoLevel{{0, 0, 0, 0}, {0, 0, 0, 0}},
 	}

 	var tempSkills string
@@ -115,17 +94,12 @@ func handleMsgMhfGetTowerInfo(s *Session, p mhfpacket.MHFPacket) {
 	case 4:
 		for _, history := range towerInfo.History {
 			bf := byteframe.NewByteFrame()
-			bf.WriteInt16(history.Unk0.Unk0)
-			bf.WriteInt16(history.Unk0.Unk1)
-			bf.WriteInt16(history.Unk0.Unk2)
-			bf.WriteInt16(history.Unk0.Unk3)
-			bf.WriteInt16(history.Unk0.Unk4)
-
-			bf.WriteInt16(history.Unk1.Unk0)
-			bf.WriteInt16(history.Unk1.Unk1)
-			bf.WriteInt16(history.Unk1.Unk2)
-			bf.WriteInt16(history.Unk1.Unk3)
-			bf.WriteInt16(history.Unk1.Unk4)
+			for i := range history.Unk0 {
+				bf.WriteInt16(history.Unk0[i])
+			}
+			for i := range history.Unk1 {
+				bf.WriteInt16(history.Unk1[i])
+			}
 			data = append(data, bf)
 		}
 	case 3, 5:
@@ -156,8 +130,7 @@ func handleMsgMhfPostTowerInfo(s *Session, p mhfpacket.MHFPacket) {
 			zap.Int32("Unk6", pkt.Unk6),
 			zap.Int32("Unk7", pkt.Unk7),
 			zap.Int32("Block1", pkt.Block1),
-			zap.Int32("TimeTaken", pkt.TimeTaken),
-			zap.Int32("CID", pkt.CID),
+			zap.Int64("Unk9", pkt.Unk9),
 		)
 	}

@@ -415,88 +388,23 @@ func handleMsgMhfPostTenrouirai(s *Session, p mhfpacket.MHFPacket) {
 	}
 }

-type PresentBox struct {
-	ItemClaimIndex   uint32
-	PresentType      int32
-	Unk2             int32
-	Unk3             int32
-	Unk4             int32
-	Unk5             int32
-	Unk6             int32
-	Unk7             int32
-	DistributionType int32 //Same as Siabatu Distribution Type 7201:Item 7202:N Points 7203:Guild Contribution Points
-	ItemID           int32
-	Amount           int32
-}
-
 func handleMsgMhfPresentBox(s *Session, p mhfpacket.MHFPacket) {
 	pkt := p.(*mhfpacket.MsgMhfPresentBox)
 	var data []*byteframe.ByteFrame
-	var presents []PresentBox
-	//On Open Operation 1 and 3
-	//On Accept Operation 1 and 2 (Stop player from reclaiming I assume (Needs a database flag)
-	switch pkt.Operation {
-	case 1:
-		// When Operation is 1, populate presents based on PresentType in packet
-
-		//Placed it in a dynamic array for now
-		//Empty Array shows the No Items to claim message!
-		for _, presentType := range pkt.PresentType {
-
-			presents = []PresentBox{
-				{1, int32(presentType), 0, 0, 0, 0, 0, 0, 7201, 12893, 1},
-				{2, int32(presentType), 0, 0, 0, 0, 0, 0, 7201, 12893, 1},
-				{3, int32(presentType), 0, 0, 0, 0, 0, 0, 7201, 12893, 1},
-				{4, int32(presentType), 0, 0, 0, 0, 0, 0, 7201, 12893, 1},
-				{5, int32(presentType), 0, 0, 0, 0, 0, 0, 7201, 12895, 8},
-				{6, int32(presentType), 0, 0, 0, 0, 0, 0, 7202, 12893, 1},
-				{7, int32(presentType), 0, 0, 0, 0, 0, 0, 7203, 12895, 8},
-			}
-
-		}
-	case 2:
-		// When Operation is 2, populate presents for claiming items
-
-		//ItemClaimIndex in Option 1 of the Present Box Call populates pkt.PresentType which triggers this packet notice PresentType is Populated with ItemClaimIndex for a 1 to 1 Relationship
-		presents = []PresentBox{
-			{0, 1, 0, 0, 0, 0, 0, 0, 7201, 12893, 1},
-			{0, 2, 0, 0, 0, 0, 0, 0, 7201, 12893, 1},
-			{0, 3, 0, 0, 0, 0, 0, 0, 7201, 12893, 1},
-			{0, 4, 0, 0, 0, 0, 0, 0, 7201, 12893, 1},
-			{0, 5, 0, 0, 0, 0, 0, 0, 7201, 12895, 8},
-			{0, 6, 0, 0, 0, 0, 0, 0, 7202, 12893, 1},
-			{0, 7, 0, 0, 0, 0, 0, 0, 7203, 12895, 8},
-		}
-	case 3:
-		// When Operation is 3, send an empty byte frame (Possibly a better response here)
-		bf := byteframe.NewByteFrame()
-		doAckBufSucceed(s, pkt.AckHandle, bf.Data())
-		return
-	default:
-		s.logger.Info("request for unknown type", zap.Uint32("Unk1", pkt.Operation))
-
-	}
-
-	// Construct and send the response data based on the presents
-	for _, present := range presents {
-		bf := byteframe.NewByteFrame()
-		bf.WriteUint32(present.ItemClaimIndex)
-		bf.WriteInt32(present.PresentType)
-		bf.WriteInt32(present.Unk2)
-		bf.WriteInt32(present.Unk3)
-		bf.WriteInt32(present.Unk4)
-		bf.WriteInt32(present.Unk5)
-		bf.WriteInt32(present.Unk6)
-		bf.WriteInt32(present.Unk7)
-		bf.WriteInt32(present.DistributionType)
-		bf.WriteInt32(present.ItemID)
-		bf.WriteInt32(present.Amount)
-		data = append(data, bf)
-	}
-
-	// Send the accumulated data
+	/*
+		bf.WriteUint32(0)
+		bf.WriteInt32(0)
+		bf.WriteInt32(0)
+		bf.WriteInt32(0)
+		bf.WriteInt32(0)
+		bf.WriteInt32(0)
+		bf.WriteInt32(0)
+		bf.WriteInt32(0)
+		bf.WriteInt32(0)
+		bf.WriteInt32(0)
+		bf.WriteInt32(0)
+	*/
 	doAckEarthSucceed(s, pkt.AckHandle, data)
-
 }

 type GemInfo struct {
--- a/server/channelserver/sys_channel_server.go
+++ b/server/channelserver/sys_channel_server.go
@@ -75,6 +75,7 @@ type Server struct {

 	raviente *Raviente

+	questCacheLock sync.RWMutex
 	questCacheData map[int][]byte
 	questCacheTime map[int]time.Time
 }
@@ -207,6 +208,7 @@ 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 {
@@ -278,6 +280,21 @@ 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.
@@ -424,24 +441,13 @@ func (s *Server) FindObjectByChar(charID uint32) *Object {
 	return nil
 }

-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
+func (s *Server) HasSemaphore(ses *Session) bool {
+	for _, semaphore := range s.semaphore {
+		if semaphore.host == ses {
+			return true
 		}
 	}
-	return s.semaphoreIndex
+	return false
 }

 func (s *Server) Season() uint8 {
--- a/server/channelserver/sys_language.go
+++ b/server/channelserver/sys_language.go
@@ -10,6 +10,7 @@ type i18n struct {
 		noOp     string
 		disabled string
 		reload   string
+		playtime string
 		kqf      struct {
 			get string
 			set struct {
@@ -175,6 +176,8 @@ 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,15 +22,18 @@ type Semaphore struct {

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

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

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

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

 	// A stack containing the stage movement history (push on enter/move, pop on back)
 	stageMoveStack *stringstack.StringStack
@@ -79,6 +86,7 @@ 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
@@ -96,22 +104,9 @@ 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)
-	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}
+	err := s.cryptConn.SendPacket(append(data, []byte{0x00, 0x10}...))
+	if err != nil {
+		s.logger.Warn("Failed to send packet")
 	}
 }

@@ -138,6 +133,19 @@ 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()
@@ -150,26 +158,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
-			err := s.cryptConn.SendPacket(append(pkt.data, []byte{0x00, 0x10}...))
+			buf = append(buf, pkt.data...)
+		}
+		if len(buf) > 0 {
+			err := s.cryptConn.SendPacket(append(buf, []byte{0x00, 0x10}...))
 			if err != nil {
 				s.logger.Warn("Failed to send packet")
 			}
 		}
-		time.Sleep(5 * time.Millisecond)
+		time.Sleep(time.Duration(_config.ErupeConfig.LoopDelay) * 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
@@ -185,7 +193,7 @@ func (s *Session) recvLoop() {
 			return
 		}
 		s.handlePacketGroup(pkt)
-		time.Sleep(5 * time.Millisecond)
+		time.Sleep(time.Duration(_config.ErupeConfig.LoopDelay) * time.Millisecond)
 	}
 }

@@ -272,7 +280,7 @@ func (s *Session) logMessage(opcode uint16, data []byte, sender string, recipien
 	} else {
 		fmt.Printf("[%s] -> [%s]\n", sender, recipient)
 	}
-	fmt.Printf("Opcode: %s\n", opcodePID)
+	fmt.Printf("Opcode: (Dec: %d Hex: 0x%04X Name: %s) \n", opcode, opcode, 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))
@@ -310,6 +318,14 @@ 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(60)
+	bf.WriteUint32(uint32(s.erupeConfig.GameplayOptions.ClanMemberLimits[len(s.erupeConfig.GameplayOptions.ClanMemberLimits)-1][1]))
 	return bf.Data()
 }
Author	SHA1	Message	Date
wish	5f265ee291	Merge pull request #144 from gab3-dev/patch-1 Fix typos in Docker README	2025-10-29 00:00:32 +11:00
Gabriel Henrique	2a297e693f	Fix typos in Docker README "soruce" to "source"	2025-10-28 09:33:52 -03:00
wish	531b3d2fa6	Remove unused import 'math' from handlers_guild.go Removed unused 'math' import from handlers_guild.go	2025-08-29 22:56:46 +10:00
wish	7459dede49	fix guild poogie outfit unlock	2025-08-28 23:27:56 +10:00
wish	b2768e5af8	Merge pull request #138 from Mezeporta/dependabot/go_modules/golang.org/x/net-0.38.0	2025-08-22 11:26:43 +10:00
dependabot[bot]	c13d6e6116	Bump golang.org/x/net from 0.33.0 to 0.38.0 Bumps [golang.org/x/net](https://github.com/golang/net) from 0.33.0 to 0.38.0. - [Commits](https://github.com/golang/net/compare/v0.33.0...v0.38.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-version: 0.38.0 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2025-08-22 01:11:38 +00:00
wish	425a245af5	Merge pull request #137 from Mezeporta/dependabot/go_modules/golang.org/x/crypto-0.35.0	2025-08-22 11:10:30 +10:00
dependabot[bot]	da43ad0cad	Bump golang.org/x/crypto from 0.31.0 to 0.35.0 Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.31.0 to 0.35.0. - [Commits](https://github.com/golang/crypto/compare/v0.31.0...v0.35.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-version: 0.35.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2025-08-22 01:09:07 +00:00
wish	8f3624d589	Update README.md	2025-05-16 18:10:13 +10:00
wish	8d1c6a79e2	S6 compatibility fix	2025-05-04 01:47:30 +10:00
wish	d83c784452	Create 26-fix-mail.sql	2025-04-10 23:35:59 +10:00
wish	ee7b099deb	Create 25-fix-rasta-id.sql	2025-04-10 23:33:40 +10:00
wish	ef3212da11	Rename fix-weekly-stamps.sql to 24-fix-weekly-stamps.sql	2025-04-10 23:33:08 +10:00
wish	3d0114ce22	fix MhfAcquireCafeItem cost in G1-G5.2	2025-04-01 20:58:33 +11:00
wish	c539905c1d	implement SysWaitStageBinary timeout	2025-03-16 23:04:42 +11:00
wish	69a2a7ca3b	MhfReadMercenaryW changes	2025-03-16 15:51:10 +11:00
wish	7e58a26693	Merge remote-tracking branch 'origin/main'	2025-03-10 11:38:23 +11:00
wish	8c219be30f	fix InfoGuild response on <G10	2025-03-10 11:38:00 +11:00
wish	f9cfb07760	Merge pull request #134 from ZeruLight/fix/packet-queue fix/packet-queue	2025-03-09 14:41:10 +11:00
wish	f2862ea4b8	prevent concurrent map write to questCache	2025-03-08 11:41:57 +11:00
wish	3e71c308f4	minor MhfInfoGuild changes	2025-03-06 23:01:22 +11:00
wish	3c0d29ed41	fix invalidateSessions	2025-02-27 20:06:05 +11:00
wish	09f09e230d	Merge pull request #133 from ZeruLight/main	2025-02-24 12:28:10 +11:00
wish	5028355cfc	prevent nil pointer in MhfGetGuildManageRight	2025-02-23 21:46:00 +11:00
wish	ba04b79bd8	partially revert guildMembers query	2025-02-23 19:29:02 +11:00
wish	06c01153f6	Merge branch 'main' into fix/packet-queue	2025-02-18 03:27:01 +11:00
wish	296bc36dbc	Merge pull request #131 from ZeruLight/dependabot/go_modules/golang.org/x/net-0.33.0 Bump golang.org/x/net from 0.23.0 to 0.33.0	2025-02-18 03:23:19 +11:00
wish	79b65281f9	Merge branch 'main' into fix/packet-queue	2025-02-18 03:21:11 +11:00
wish	d17d97fefc	update workflow	2025-02-18 03:20:43 +11:00
dependabot[bot]	0bf39b9caf	Bump golang.org/x/net from 0.23.0 to 0.33.0 Bumps [golang.org/x/net](https://github.com/golang/net) from 0.23.0 to 0.33.0. - [Commits](https://github.com/golang/net/compare/v0.23.0...v0.33.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2025-02-17 16:19:53 +00:00
wish	51ae16541f	update workflow	2025-02-18 03:18:54 +11:00
wish	d86f50bd29	Merge branch 'main' into fix/packet-queue	2025-02-18 03:16:41 +11:00
wish	7c61f70590	add invalidateSessions	2025-02-18 03:16:18 +11:00
wish	d1dfc3fbb1	packet queue fix proposal	2025-02-18 03:12:09 +11:00
wish	b3305d1185	Update handlers_cafe.go	2025-01-15 00:38:12 +11:00
wish	4eed6a9738	add playtime chat command	2024-11-09 18:20:49 +11:00
wish	ab7bb0d004	revert packet concatenation	2024-11-09 17:39:14 +11:00
wish	7bf2fd5b8f	revert packet concatenation	2024-11-09 17:22:43 +11:00
wish	366ec833d5	Merge pull request #130 from Brentdbr/ncafe modified NetcafeDefaults to contain the retail Netcafe point rewards.	2024-10-20 11:32:58 +11:00
Brentdbr	a4fa55f9c9	modified NetcafeDefaults to contain the retail Netcafe point rewards.	2024-10-20 02:26:47 +02:00
wish	2215afca2b	Merge pull request #121 from ZeruLight/dependabot/go_modules/golang.org/x/net-0.23.0 Bump golang.org/x/net from 0.18.0 to 0.23.0	2024-10-20 11:08:30 +11:00
wish	4348aa02a8	temporarily fix rasta expiration	2024-10-09 00:51:51 +11:00
wish	8191994acb	add LoopDelay config option	2024-10-08 22:26:00 +11:00
wish	436e30f83d	remove duplicate updateRights call	2024-10-08 21:07:13 +11:00
wish	34e84f31df	ignore empty packet buffer	2024-10-08 21:06:52 +11:00
wish	1432e8f2b8	Merge remote-tracking branch 'origin/main'	2024-10-08 20:43:20 +11:00
wish	edd357fe50	concatenate packets during send	2024-10-08 20:42:42 +11:00
stratic-dev	ae32951671	Add troubleshooting for setup on docker and add opcode dec and hex to logger	2024-10-05 22:56:53 +01:00
stratic-dev	2d48d63263	added ./bin to ignore when building dockerfile	2024-10-05 04:36:37 +01:00
wish	b20969ddc6	emulate retail semaphore logic	2024-10-03 21:56:06 +10:00
wish	8f68e10f1d	Merge remote-tracking branch 'origin/main'	2024-10-01 23:02:08 +10:00
wish	2c5896814f	update ico resources	2024-10-01 23:01:15 +10:00
wish	8a55c5ff89	fix inflated festa rewards	2024-09-27 01:12:16 +10:00
wish	7d760bd3b4	fix EntranceServer clan member list limits	2024-08-08 22:16:39 +10:00
wish	04008fceb8	rewrite ReadMercenaryW handler	2024-08-08 22:16:09 +10:00
wish	1ab6940b01	add extra fields to Distributions	2024-08-08 22:14:35 +10:00
dependabot[bot]	ef99cc7659	Bump golang.org/x/net from 0.18.0 to 0.23.0 Bumps [golang.org/x/net](https://github.com/golang/net) from 0.18.0 to 0.23.0. - [Commits](https://github.com/golang/net/compare/v0.18.0...v0.23.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2024-04-19 12:40:55 +00:00