Mirror/Erupe
1
0
Fork 0
mirror of https://github.com/Mezeporta/Erupe.git synced 2025-12-16 17:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflicts

Browse Source
This commit is contained in:
Sophie
2020-03-09 07:16:45 +00:00
parent 927f6e9419 c7862f38bf
commit 320ce7d783
45 changed files with 583 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/channelserver/session.go
View File

@@ -22,11 +22,11 @@ type Session struct {
cryptConn *network.CryptConn
sendPackets chan []byte
stageID string
stage *Stage
reserveStage *Stage
charID uint32
logKey []byte
stageID string
stage *Stage
reservationStage *Stage // Required for the stateful MsgSysUnreserveStage packet.
charID uint32
logKey []byte
// A stack containing the stage movement history (push on enter/move, pop on back)
stageMoveStack *stringstack.StringStack