Add ConsoleExecutor

core_commands/gamemode.go

@@ -37,11 +37,12 @@ var gamemode_cmd = &commands.Command{
 		}
 		var player *server.PlayerController
 		if len(ctx.Arguments) == 1 {
-			if ctx.IsConsole {
+			if p, ok := ctx.Executor.(*server.PlayerController); ok {
 				ctx.Incomplete()
 				return
+			} else {
+				player = p
 			}
-			player = ctx.Executor.(*server.PlayerController)
 		} else {
 			p := ctx.Executor.(*server.PlayerController).Server.FindPlayer(ctx.Arguments[1])
 			if p == nil {

server/commands/commands.go

@@ -5,21 +5,14 @@ import (
 	"strings"
 
 	pk "github.com/aimjel/minecraft/packet"
-	"github.com/dynamitemc/dynamite/server/player"
 )
 
 type CommandContext struct {
 	Executor interface {
 		SystemChatMessage(s string) error
-		OnGround() bool
-		ClientSettings() player.ClientInformation
-		Position() (x float64, y float64, z float64)
-		Rotation() (yaw float32, pitch float32)
-		HasPermissions(perms []string) bool
 	} `js:"executor"`
 	Arguments   []string `js:"arguments"`
 	FullCommand string   `js:"fullCommand"`
-	IsConsole   bool     `js:"isConsole"`
 }
 
 func (ctx *CommandContext) Reply(content string) {

server/console.go

@@ -0,0 +1,12 @@
+package server
+
+import "fmt"
+
+type ConsoleExecutor struct {
+	Server *Server
+}
+
+func (p *ConsoleExecutor) SystemChatMessage(s string) error {
+	fmt.Println(s)
+	return nil
+}

server/network/handlers/ChatCommand.go

@@ -5,15 +5,10 @@ import (
 	"strings"
 
 	"github.com/dynamitemc/dynamite/server/commands"
-	"github.com/dynamitemc/dynamite/server/player"
 )
 
 type controller interface {
 	SystemChatMessage(s string) error
-	OnGround() bool
-	ClientSettings() player.ClientInformation
-	Position() (x float64, y float64, z float64)
-	Rotation() (yaw float32, pitch float32)
 	HasPermissions(perms []string) bool
 }