Fix

Author: oq-x

server/player/player.go

@@ -83,13 +83,20 @@ ViewDistance returns the view distance of the client, in chunks, or the server's
 */
 func (p *Player) ViewDistance() int32 {
 	plVd := int32(p.ClientInformation.Load().ViewDistance)
-	/*if plVd == 0 || plVd > int32(session.config.ViewDistance) {
-		return int32(session.config.ViewDistance)
-	}*/ // todo add this back
+	if plVd == 0 || plVd > p.serverProperties.ViewDistance {
+		return p.serverProperties.ViewDistance
+	}
 
 	return plVd
 }
 
+// writeOrKill tries to write the packet to the player and kills it on failure
+func (p *Player) writeOrKill(pk packet.Encodeable) {
+	if err := p.WritePacket(pk); err != nil {
+		p.killConnection(false, "lost connection")
+	}
+}
+
 // finishConfiguration finishes the configuration phase by sending the server brand, registries and tags
 func (p *Player) finishConfiguration() error {
 	// begin packet reading in the background

server/player/playerlist.go

@@ -32,6 +32,17 @@ func (list *PlayerList) Player(uuid uuid.UUID) *Player {
 	return nil
 }
 
+func (list *PlayerList) PlayerByUsername(name string) *Player {
+	for i := uintptr(0); i < list.playerList.Len(); i++ {
+		player := list.playerAtIndex(i)
+
+		if player.Username() == name {
+			return player
+		}
+	}
+	return nil
+}
+
 func (list *PlayerList) playerAtIndex(index uintptr) *Player {
 	return *(**Player)(list.playerList.Element(index))
 }
@@ -56,7 +67,7 @@ func (list *PlayerList) AddPlayer(player *Player) {
 
 	for i := uintptr(0); i < list.playerList.Len(); i++ {
 		player := list.playerAtIndex(i)
-		player.WritePacket(update)
+		player.writeOrKill(update)
 	}
 }
 

server/server.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"fmt"
 	"github.com/zeppelinmc/zeppelin/properties"
+	"github.com/zeppelinmc/zeppelin/protocol/net/packet/configuration"
 	"github.com/zeppelinmc/zeppelin/server/player"
 	"image/png"
 	"os"
@@ -195,12 +196,12 @@ func (srv *Server) Start(ts time.Time) {
 
 func (srv *Server) handleNewConnection(conn *net.Conn) {
 	log.Infolnf("%sPlayer attempting to connect: %s (%s)", log.FormatAddr(srv.cfg.LogIPs, conn.RemoteAddr()), conn.Username(), conn.UUID())
-	/*if _, ok := srv.World.Broadcast.SessionByUsername(conn.Username()); ok {
-		conn.WritePacket(&configuration.Disconnect{
+	if p := srv.playerList.PlayerByUsername(conn.Username()); p != nil {
+		_ = conn.WritePacket(&configuration.Disconnect{
 			Reason: text.TextComponent{Text: "You are already connected to the server from another session. Please disconnect then try again"},
 		})
 		return
-	}*/
+	}
 	playerData, err := srv.World.PlayerData(conn.UUID().String())
 	if err != nil {
 		playerData = srv.World.NewPlayerData(conn.UUID())