From 020f122bb03afd762c47cfdefb0b600b8b3a540a Mon Sep 17 00:00:00 2001 From: wish Date: Wed, 21 Feb 2024 02:08:59 +1100 Subject: [PATCH] use better RNG for Warehouse IDs --- server/channelserver/handlers_house.go | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/server/channelserver/handlers_house.go b/server/channelserver/handlers_house.go index 9eaec24bd..88d5793df 100644 --- a/server/channelserver/handlers_house.go +++ b/server/channelserver/handlers_house.go @@ -1,11 +1,11 @@ package channelserver import ( - "crypto/rand" "erupe-ce/common/byteframe" "erupe-ce/common/mhfitem" ps "erupe-ce/common/pascalstring" "erupe-ce/common/stringsupport" + "erupe-ce/common/token" _config "erupe-ce/config" "erupe-ce/network/mhfpacket" "fmt" @@ -521,10 +521,7 @@ func handleMsgMhfUpdateWarehouse(s *Session, p mhfpacket.MHFPacket) { } } if !exists { - newID := make([]byte, 4) - _, _ = rand.Read(newID) - bf := byteframe.NewByteFrameFromBytes(newID) - uItem.WarehouseID = bf.ReadUint32() + uItem.WarehouseID = token.RNG().Uint32() fItems = append(fItems, uItem) } } @@ -542,10 +539,7 @@ func handleMsgMhfUpdateWarehouse(s *Session, p mhfpacket.MHFPacket) { } } if !exists { - newID := make([]byte, 4) - _, _ = rand.Read(newID) - bf := byteframe.NewByteFrameFromBytes(newID) - uEquip.WarehouseID = bf.ReadUint32() + uEquip.WarehouseID = token.RNG().Uint32() fEquip = append(fEquip, uEquip) } }