Prepare process.go for merge

1 files changed, 14 insertions, 19 deletions

diff --git a/process.go b/process.go
index 6737af1..c78daa3 100644
--- a/process.go
+++ b/process.go
@@ -447,12 +447,7 @@ func (cc *ClientConn) process(pkt mt.Pkt) {
 		go func(done chan<- struct{}) {
 			result, isCmd := onChatMsg(cc, cmd)
 			if !isCmd {
-				if srv == nil {
-					cc.Log("->", "no server")
-					return
-				}
-
-				srv.Send(pkt)
+				forward(pkt)
 			} else if result != "" {
 				cc.SendChatMsg(result)
 			}
@@ -635,7 +630,7 @@ func (sc *ServerConn) process(pkt mt.Pkt) {
 
 		handStack := mt.Stack{
 			Item: mt.Item{
-				Name: sc.prefix + "_hand",
+				Name: sc.mediaPool + "_hand",
 			},
 			Count: 1,
 		}
@@ -753,7 +748,7 @@ func (sc *ServerConn) process(pkt mt.Pkt) {
 			break
 		}
 
-		prepend(sc.prefix, &cmd.Filename)
+		prepend(sc.mediaPool, &cmd.Filename)
 		if cmd.ShouldCache {
 			cacheMedia(mediaFile{
 				name:       cmd.Filename,
@@ -763,17 +758,17 @@ func (sc *ServerConn) process(pkt mt.Pkt) {
 		}
 	case *mt.ToCltSkyParams:
 		for i := range cmd.Textures {
-			prependTexture(sc.prefix, &cmd.Textures[i])
+			prependTexture(sc.mediaPool, &cmd.Textures[i])
 		}
 	case *mt.ToCltSunParams:
-		prependTexture(sc.prefix, &cmd.Texture)
-		prependTexture(sc.prefix, &cmd.ToneMap)
-		prependTexture(sc.prefix, &cmd.Rise)
+		prependTexture(sc.mediaPool, &cmd.Texture)
+		prependTexture(sc.mediaPool, &cmd.ToneMap)
+		prependTexture(sc.mediaPool, &cmd.Rise)
 	case *mt.ToCltMoonParams:
-		prependTexture(sc.prefix, &cmd.Texture)
-		prependTexture(sc.prefix, &cmd.ToneMap)
+		prependTexture(sc.mediaPool, &cmd.Texture)
+		prependTexture(sc.mediaPool, &cmd.ToneMap)
 	case *mt.ToCltSetHotbarParam:
-		prependTexture(sc.prefix, &cmd.Img)
+		prependTexture(sc.mediaPool, &cmd.Img)
 	case *mt.ToCltUpdatePlayerList:
 		if !clt.playerListInit {
 			clt.playerListInit = true
@@ -791,7 +786,7 @@ func (sc *ServerConn) process(pkt mt.Pkt) {
 			}
 		}
 	case *mt.ToCltSpawnParticle:
-		prependTexture(sc.prefix, &cmd.Texture)
+		prependTexture(sc.mediaPool, &cmd.Texture)
 		sc.globalParam0(&cmd.NodeParam0)
 	case *mt.ToCltBlkData:
 		for i := range cmd.Blk.Param0 {
@@ -810,14 +805,14 @@ func (sc *ServerConn) process(pkt mt.Pkt) {
 	case *mt.ToCltAddNode:
 		sc.globalParam0(&cmd.Node.Param0)
 	case *mt.ToCltAddParticleSpawner:
-		prependTexture(sc.prefix, &cmd.Texture)
+		prependTexture(sc.mediaPool, &cmd.Texture)
 		sc.swapAOID(&cmd.AttachedAOID)
 		sc.globalParam0(&cmd.NodeParam0)
 		sc.particleSpawners[cmd.ID] = struct{}{}
 	case *mt.ToCltDelParticleSpawner:
 		delete(sc.particleSpawners, cmd.ID)
 	case *mt.ToCltPlaySound:
-		prepend(sc.prefix, &cmd.Name)
+		prepend(sc.mediaPool, &cmd.Name)
 		sc.swapAOID(&cmd.SrcAOID)
 		if cmd.Loop {
 			sc.sounds[cmd.ID] = struct{}{}
@@ -842,7 +837,7 @@ func (sc *ServerConn) process(pkt mt.Pkt) {
 		sc.prependFormspec(&cmd.Formspec)
 	case *mt.ToCltMinimapModes:
 		for i := range cmd.Modes {
-			prependTexture(sc.prefix, &cmd.Modes[i].Texture)
+			prependTexture(sc.mediaPool, &cmd.Modes[i].Texture)
 		}
 	case *mt.ToCltNodeMetasChanged:
 		for k := range cmd.Changed {