From 52dd935e7ed9b16c7ffe41cb9bdecadd0507893d Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <the@jeffreyfreeman.me>
Date: Thu, 23 Apr 2020 22:21:43 +0200
Subject: [PATCH] Fixed administrator commands to use the new object_added
scheme.
---
lib/aethyr/core/commands/admin/admin_handler.rb | 6 +++---
lib/aethyr/core/commands/admin/alook.rb | 2 +-
lib/aethyr/core/commands/command_handler.rb | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/aethyr/core/commands/admin/admin_handler.rb b/lib/aethyr/core/commands/admin/admin_handler.rb
index ecc9c5d..1826ab7 100644
--- a/lib/aethyr/core/commands/admin/admin_handler.rb
+++ b/lib/aethyr/core/commands/admin/admin_handler.rb
@@ -7,12 +7,12 @@ module Aethyr
super(player, commands, *args)
end
- def self.admin_object_added(data, klass)
+ protected
+ def self.object_added(data, child_class)
return unless (data[:game_object].is_a? Player) && data[:game_object].admin
- data[:game_object].subscribe(klass.new(data[:game_object]))
+ data[:game_object].subscribe(child_class.new(data[:game_object]))
end
- protected
#Tail a file
def tail file, lines = 10
require 'util/tail'
diff --git a/lib/aethyr/core/commands/admin/alook.rb b/lib/aethyr/core/commands/admin/alook.rb
index 712f576..fc27ae1 100644
--- a/lib/aethyr/core/commands/admin/alook.rb
+++ b/lib/aethyr/core/commands/admin/alook.rb
@@ -11,7 +11,7 @@ module Aethyr
end
def self.object_added(data)
- return Aethyr::Extend::AdminHandler.admin_object_added(data, AlookHandler)
+ super(data, klass: self)
end
def player_input(data)
diff --git a/lib/aethyr/core/commands/command_handler.rb b/lib/aethyr/core/commands/command_handler.rb
index 9765552..93dba7e 100644
--- a/lib/aethyr/core/commands/command_handler.rb
+++ b/lib/aethyr/core/commands/command_handler.rb
@@ -25,9 +25,9 @@ module Aethyr
protected
#event listener parent that listens for when a new user is added to the manager
- def self.object_added(data, klass: child_class)
+ def self.object_added(data, child_class)
return unless data[:game_object].is_a? Player
- data[:game_object].subscribe(klass.new(data[:game_object]))
+ data[:game_object].subscribe(child_class.new(data[:game_object]))
end
end
--
GitLab