Merge pull request #5 from secmc/chore/cleanup2

chore: add utility method to execute player methods

Author: HashimTheArab

plugin/adapters/plugin/emitter.go

@@ -462,47 +462,35 @@ func (m *Emitter) handleSendChat(act *pb.SendChatAction) {
 	if err != nil {
 		return
 	}
-	if handle, ok := m.srv.Player(id); ok {
-		handle.ExecWorld(func(tx *world.Tx, e world.Entity) {
-			if pl, ok := e.(*player.Player); ok {
-				pl.Message(act.Message)
-			}
-		})
-	}
+
+	m.execMethod(id, func(pl *player.Player) {
+		pl.Message(act.Message)
+	})
 }
 
 func (m *Emitter) handleTeleport(act *pb.TeleportAction) {
 	id, err := uuid.Parse(act.PlayerUuid)
 	if err != nil {
 		return
 	}
-	if handle, ok := m.srv.Player(id); ok {
-		handle.ExecWorld(func(tx *world.Tx, e world.Entity) {
-			pl, ok := e.(*player.Player)
-			if !ok {
-				return
-			}
-			pl.Teleport(mgl64.Vec3{act.X, act.Y, act.Z})
-			rot := pl.Rotation()
-			deltaYaw := float64(act.Yaw) - rot.Yaw()
-			deltaPitch := float64(act.Pitch) - rot.Pitch()
-			pl.Move(mgl64.Vec3{}, deltaYaw, deltaPitch)
-		})
-	}
+
+	m.execMethod(id, func(pl *player.Player) {
+		pl.Teleport(mgl64.Vec3{act.X, act.Y, act.Z})
+		rot := pl.Rotation()
+		deltaYaw := float64(act.Yaw) - rot.Yaw()
+		deltaPitch := float64(act.Pitch) - rot.Pitch()
+		pl.Move(mgl64.Vec3{}, deltaYaw, deltaPitch)
+	})
 }
 
 func (m *Emitter) handleKick(act *pb.KickAction) {
 	id, err := uuid.Parse(act.PlayerUuid)
 	if err != nil {
 		return
 	}
-	if handle, ok := m.srv.Player(id); ok {
-		handle.ExecWorld(func(tx *world.Tx, e world.Entity) {
-			if pl, ok := e.(*player.Player); ok {
-				pl.Disconnect(act.Reason)
-			}
-		})
-	}
+	m.execMethod(id, func(pl *player.Player) {
+		pl.Disconnect(act.Reason)
+	})
 }
 
 func (m *Emitter) handleSetGameMode(act *pb.SetGameModeAction) {
@@ -514,10 +502,16 @@ func (m *Emitter) handleSetGameMode(act *pb.SetGameModeAction) {
 	if !ok {
 		return
 	}
+	m.execMethod(id, func(pl *player.Player) {
+		pl.SetGameMode(gameMode)
+	})
+}
+
+func (m *Emitter) execMethod(id uuid.UUID, method func(pl *player.Player)) {
 	if handle, ok := m.srv.Player(id); ok {
 		handle.ExecWorld(func(tx *world.Tx, e world.Entity) {
 			if pl, ok := e.(*player.Player); ok {
-				pl.SetGameMode(gameMode)
+				method(pl)
 			}
 		})
 	}