Fix plugin issues created by breaking changes in previous commit.

This commit is contained in:
Major-
2015-01-07 15:52:21 +00:00
parent ab8ad2a556
commit 3e22f78ff2
4 changed files with 8 additions and 5 deletions
+4 -3
View File
@@ -22,6 +22,7 @@ java_import 'org.apollo.game.model.World'
java_import 'org.apollo.game.model.entity.Player' java_import 'org.apollo.game.model.entity.Player'
java_import 'org.apollo.game.model.setting.PrivilegeLevel' java_import 'org.apollo.game.model.setting.PrivilegeLevel'
java_import 'org.apollo.game.scheduling.ScheduledTask' java_import 'org.apollo.game.scheduling.ScheduledTask'
java_import 'org.apollo.util.plugin.PluginContext'
# Alias the privilege levels. # Alias the privilege levels.
RIGHTS_ADMIN = PrivilegeLevel::ADMINISTRATOR RIGHTS_ADMIN = PrivilegeLevel::ADMINISTRATOR
@@ -196,17 +197,17 @@ def on_command(args, proc)
raise 'Command message must have one or two arguments.' unless (1..2).include?(args.length) raise 'Command message must have one or two arguments.' unless (1..2).include?(args.length)
rights = args.length == 2 ? args[1] : RIGHTS_STANDARD rights = args.length == 2 ? args[1] : RIGHTS_STANDARD
$ctx.add_command_listener(args[0].to_s, ProcCommandListener.new(rights, proc)) PluginContext::add_command_listener(args[0].to_s, ProcCommandListener.new(rights, proc))
end end
# Defines an action to be taken upon login. # Defines an action to be taken upon login.
def on_login(proc) def on_login(proc)
$ctx.add_login_listener(ProcLoginListener.new(proc)) PluginContext::add_login_listener(ProcLoginListener.new(proc))
end end
# Defines an action to be taken upon logout. # Defines an action to be taken upon logout.
def on_logout(proc) def on_logout(proc)
$ctx.add_logout_listener(ProcLogoutListener.new(proc)) PluginContext::add_logout_listener(ProcLogoutListener.new(proc))
end end
# Ids of in-game skills. # Ids of in-game skills.
+1 -1
View File
@@ -11,7 +11,7 @@ class Rune
def initialize(id, level, experience, multiplier) def initialize(id, level, experience, multiplier)
@id = id @id = id
@name = ItemDefinition.lookup(id).name.downcase @name = ItemDefinition.lookup(id).name.to_s.downcase
@level = level @level = level
@experience = experience @experience = experience
@multiplier = multiplier @multiplier = multiplier
+1 -1
View File
@@ -18,7 +18,7 @@ class Tiara
def initialize(tiara_id, altar, talisman, bitshift, experience) def initialize(tiara_id, altar, talisman, bitshift, experience)
@tiara_id = tiara_id @tiara_id = tiara_id
@name = ItemDefinition.lookup(tiara_id).name.downcase @name = ItemDefinition.lookup(tiara_id).name.to_s.downcase
@altar = altar @altar = altar
@talisman = talisman @talisman = talisman
@bitshift = bitshift @bitshift = bitshift
@@ -19,6 +19,8 @@ import org.apollo.game.model.World;
*/ */
public final class PluginContext { public final class PluginContext {
// TODO move listeners to world?
/** /**
* Adds a {@link CommandListener}. * Adds a {@link CommandListener}.
* *