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

stage as a /internal/system

Browse Source
This commit is contained in:
stratic-dev
2024-10-17 20:22:53 +01:00
parent 674ac9bd47
commit 094855b984
10 changed files with 177 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/channelserver/sys_channel_server.go
View File

@@ -7,8 +7,10 @@ import (
"time"
"erupe-ce/config"
"erupe-ce/internal/system"
"erupe-ce/server/discordbot"
"erupe-ce/utils/db"
"erupe-ce/utils/gametime"
"erupe-ce/utils/logger"
@@ -47,7 +49,7 @@ type ChannelServer struct {
isShuttingDown bool
stagesLock sync.RWMutex
stages map[string]*Stage
stages map[string]*system.Stage
// Used to map different languages
i18n i18n
@@ -82,9 +84,9 @@ func NewServer(config *Config) *ChannelServer {
"sl2Ns379p0a0u0", // Diva fountain
"sl1Ns462p0a0u0", // MezFes
}
stages := make(map[string]*Stage)
stages := make(map[string]*system.Stage)
for _, name := range stageNames {
stages[name] = NewStage(name)
stages[name] = system.NewStage(name)
}
server := &ChannelServer{
ID: config.ID,
@@ -228,14 +230,14 @@ func (server *ChannelServer) DisconnectUser(uid uint32) {
}
}
func (server *ChannelServer) FindObjectByChar(charID uint32) *Object {
func (server *ChannelServer) FindObjectByChar(charID uint32) *system.Object {
server.stagesLock.RLock()
defer server.stagesLock.RUnlock()
for _, stage := range server.stages {
stage.RLock()
for objId := range stage.objects {
obj := stage.objects[objId]
if obj.ownerCharID == charID {
for objId := range stage.Objects {
obj := stage.Objects[objId]
if obj.OwnerCharID == charID {
stage.RUnlock()
return obj
}