send texture pack only once

2 files changed, 6 insertions, 8 deletions

diff --git a/server/player.go b/server/player.go
index e436714..9852833 100644
--- a/server/player.go
+++ b/server/player.go
@@ -276,14 +276,6 @@ func (p *player) OnLevelData(from *level, info levelInfo, data io.ReadCloser) {
 			Height: int16(info.Size.Y),
 			Length: int16(info.Size.Z),
 		})
-		p.server.GetInfo(p, func(info ServerInfo) {
-			if info.TexturePack == "" {
-				return
-			}
-			p.client.SendPacket(p, &classic.SetMapEnvUrl {
-				TexturePackUrl: classic.PadDString(info.TexturePack),
-			})
-		})
 		p.client.SendPacket(p, &classic.AddEntity2 {
 			EntityId: 255,
 			InGameName: classic.PadString(p.name),
diff --git a/server/server.go b/server/server.go
index a434aee..66daf22 100644
--- a/server/server.go
+++ b/server/server.go
@@ -468,6 +468,12 @@ func (cl *client) performHandshake(conn net.Conn, srvInfo ServerInfo) {
 		cl.player = pl
 	})
 
+	if srvInfo.TexturePack != "" {
+		cl.SendPacket(nil, &classic.SetMapEnvUrl {
+			TexturePackUrl: classic.PadDString(srvInfo.TexturePack),
+		})
+	}
+
 	conn.SetDeadline(time.Time{})
 }