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

correct minutes->seconds

Browse Source
This commit is contained in:
wish
2022-08-13 17:23:33 +10:00
parent 3bb0ab6295
commit ac90c2dd09
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
patch-schema/netcafe.sql
View File

@@ -6,7 +6,7 @@ ALTER TABLE IF EXISTS public.characters
CREATE TABLE IF NOT EXISTS public.cafebonus CREATE TABLE IF NOT EXISTS public.cafebonus
( (
id integer NOT NULL PRIMARY KEY, id integer NOT NULL PRIMARY KEY,
minutes_req integer NOT NULL, seconds_req integer NOT NULL,
item_type integer NOT NULL, item_type integer NOT NULL,
item_id integer NOT NULL, item_id integer NOT NULL,
quantity integer NOT NULL quantity integer NOT NULL

10
server/channelserver/handlers_cafe.go
View File

@@ -85,7 +85,7 @@ func handleMsgMhfGetCafeDuration(s *Session, p mhfpacket.MHFPacket) {
type CafeBonus struct { type CafeBonus struct {
ID uint32 `db:"id"` ID uint32 `db:"id"`
Minutes uint32 `db:"minutes_req"` Seconds uint32 `db:"time_req"`
ItemType uint32 `db:"item_type"` ItemType uint32 `db:"item_type"`
ItemID uint32 `db:"item_id"` ItemID uint32 `db:"item_id"`
Quantity uint32 `db:"quantity"` Quantity uint32 `db:"quantity"`
@@ -98,7 +98,7 @@ func handleMsgMhfGetCafeDurationBonusInfo(s *Session, p mhfpacket.MHFPacket) {
var count uint32 var count uint32
rows, err := s.server.db.Queryx(` rows, err := s.server.db.Queryx(`
SELECT cb.id, minutes_req, item_type, item_id, quantity, SELECT cb.id, seconds_req, item_type, item_id, quantity,
( (
SELECT count(*) SELECT count(*)
FROM cafe_accepted ca FROM cafe_accepted ca
@@ -116,7 +116,7 @@ func handleMsgMhfGetCafeDurationBonusInfo(s *Session, p mhfpacket.MHFPacket) {
if err != nil { if err != nil {
s.logger.Error("Error scanning cafebonus", zap.Error(err)) s.logger.Error("Error scanning cafebonus", zap.Error(err))
} }
bf.WriteUint32(cafeBonus.Minutes) bf.WriteUint32(cafeBonus.Seconds)
bf.WriteUint32(0) // Unk bf.WriteUint32(0) // Unk
bf.WriteUint32(cafeBonus.ItemID) bf.WriteUint32(cafeBonus.ItemID)
bf.WriteUint32(cafeBonus.Quantity) bf.WriteUint32(cafeBonus.Quantity)
@@ -136,7 +136,7 @@ func handleMsgMhfReceiveCafeDurationBonus(s *Session, p mhfpacket.MHFPacket) {
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
row := s.server.db.QueryRowx(` row := s.server.db.QueryRowx(`
SELECT c.id, minutes_req, item_type, item_id, quantity SELECT c.id, seconds_req, item_type, item_id, quantity
FROM cafebonus c FROM cafebonus c
WHERE ( WHERE (
SELECT count(*) SELECT count(*)
@@ -146,7 +146,7 @@ func handleMsgMhfReceiveCafeDurationBonus(s *Session, p mhfpacket.MHFPacket) {
SELECT ch.cafe_time + $2 SELECT ch.cafe_time + $2
FROM characters ch FROM characters ch
WHERE ch.id = $1 WHERE ch.id = $1
) >= minutes_req LIMIT 1;`, s.charID, Time_Current_Adjusted().Unix()-s.sessionStart) ) >= seconds_req LIMIT 1;`, s.charID, Time_Current_Adjusted().Unix()-s.sessionStart)
cafeBonus := &CafeBonus{} cafeBonus := &CafeBonus{}
err := row.StructScan(cafeBonus) err := row.StructScan(cafeBonus)
if err != nil { if err != nil {