From 68ab2a752668e7ffdaa2289ab0df563ede4fc74e Mon Sep 17 00:00:00 2001 From: Major- Date: Mon, 1 Sep 2014 00:07:28 +0100 Subject: [PATCH 1/3] Import IgnoreListMessage in ignore.rb. Import IgnoreListMessage (thanks lmctruck). --- data/plugins/chat/private-messaging/ignore.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/data/plugins/chat/private-messaging/ignore.rb b/data/plugins/chat/private-messaging/ignore.rb index 212df8d3..75dbc8a6 100644 --- a/data/plugins/chat/private-messaging/ignore.rb +++ b/data/plugins/chat/private-messaging/ignore.rb @@ -1,3 +1,5 @@ +java_import 'org.apollo.game.message.impl.IgnoreListMessage' + on :message, :add_ignore do |ctx, player, message| username = message.username player.add_ignore(username) @@ -6,4 +8,4 @@ end on :message, :remove_ignore do |ctx, player, message| username = message.username player.remove_ignore(username) -end \ No newline at end of file +end From 961a846c8bfa1623eaa1e9ade553b6513914e388 Mon Sep 17 00:00:00 2001 From: Major- Date: Tue, 2 Sep 2014 14:23:22 +0100 Subject: [PATCH 2/3] Undo last commit. --- data/plugins/chat/private-messaging/ignore.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/data/plugins/chat/private-messaging/ignore.rb b/data/plugins/chat/private-messaging/ignore.rb index 75dbc8a6..327e7987 100644 --- a/data/plugins/chat/private-messaging/ignore.rb +++ b/data/plugins/chat/private-messaging/ignore.rb @@ -1,5 +1,3 @@ -java_import 'org.apollo.game.message.impl.IgnoreListMessage' - on :message, :add_ignore do |ctx, player, message| username = message.username player.add_ignore(username) From cb4fa4eb31d982289fd8a6e1322391ab295dfa52 Mon Sep 17 00:00:00 2001 From: Major- Date: Tue, 2 Sep 2014 14:23:59 +0100 Subject: [PATCH 3/3] Import IgnoreListMessage in friend.rb. --- data/plugins/chat/private-messaging/friend.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/data/plugins/chat/private-messaging/friend.rb b/data/plugins/chat/private-messaging/friend.rb index 6a68fa80..dea9d769 100644 --- a/data/plugins/chat/private-messaging/friend.rb +++ b/data/plugins/chat/private-messaging/friend.rb @@ -1,6 +1,7 @@ require 'java' java_import 'org.apollo.game.message.impl.FriendServerStatusMessage' +java_import 'org.apollo.game.message.impl.IgnoreListMessage' java_import 'org.apollo.game.message.impl.SendFriendMessage' java_import 'org.apollo.game.model.World' java_import 'org.apollo.game.model.setting.ServerStatus' @@ -8,6 +9,7 @@ java_import 'org.apollo.game.model.setting.PrivacyState' java_import 'org.apollo.game.model.entity.Player' + # Processes an add friend message, updating the logged-in status of the player (and the person they added) if necessary. on :message, :add_friend do |ctx, player, message| friend_username = message.username @@ -86,4 +88,4 @@ end def viewable?(player, other_username) privacy = player.friend_privacy return privacy != PrivacyState::OFF && player.friends_with(other_username) || privacy == PrivacyState::ON -end \ No newline at end of file +end