Skip to content
This repository has been archived by the owner on May 2, 2020. It is now read-only.

Fix mcmmo refactors #275

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix mcmmo refactors #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified dependencies/mcMMO.jar
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions src/main/java/org/monstercraft/irc/ircplugin/IRC.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import org.monstercraft.irc.plugin.wrappers.IRCServer;
import org.monstercraft.support.MonsterTickets;

import com.gmail.nossr50.util.Users;
import com.gmail.nossr50.util.player.UserManager;

public class IRC {

Expand Down Expand Up @@ -216,7 +216,7 @@ public static void sendMessageToGame(final IRCChannel c, final String name,
for (final Player p : IRC.getIRCPlugin().getServer()
.getOnlinePlayers()) {
if (p.isOp()
|| Users.getPlayer(p.getName())
|| UserManager.getPlayer(p.getName())
.getAdminChatMode()) {
p.sendMessage(ColorUtils.formatIRCtoGame(format,
message));
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/org/monstercraft/irc/plugin/managers/listeners/MonsterIRCListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.monstercraft.irc.plugin.wrappers.IRCChannel;

import com.dthielke.herochat.Herochat;
import com.gmail.nossr50.util.Users;
import com.gmail.nossr50.util.player.UserManager;

/**
* This class listens for chat ingame to pass to the IRC.
Expand Down Expand Up @@ -59,7 +59,7 @@ public void onPluginEnable(final PluginEnableEvent event) {
@EventHandler(priority = EventPriority.NORMAL)
public void onChat(final AsyncPlayerChatEvent event) {
if (Bukkit.getServer().getPluginManager().getPlugin("mcMMO") != null) {
if (!Users.getPlayer(event.getPlayer().getName())
if (!UserManager.getPlayer(event.getPlayer().getName())
.getAdminChatMode()) {
if (event.isCancelled()) {
return;
Expand Down Expand Up @@ -202,7 +202,7 @@ protected static void handleMessage(final Player player,
final StringBuffer result = new StringBuffer();
if (c.getChatType() == ChatType.MCMMOADMINCHAT) {
if (Bukkit.getServer().getPluginManager().getPlugin("mcMMO") != null) {
if (Users.getPlayer(player.getName()).getAdminChatMode()) {
if (UserManager.getPlayer(player.getName()).getAdminChatMode()) {
result.append(Variables.ircformat
.replace("{HCchannelColor}", "")
.replace("{heroChatTag}", "")
Expand Down Expand Up @@ -246,10 +246,10 @@ protected static void handleMessage(final Player player,
}
} else if (c.getChatType() == ChatType.HEROCHAT) {
if (Bukkit.getServer().getPluginManager().getPlugin("mcMMO") != null) {
if (Users.getPlayer(player.getName()).getAdminChatMode()) {
if (UserManager.getPlayer(player.getName()).getAdminChatMode()) {
return;
}
if (Users.getPlayer(player.getName()).getPartyChatMode()) {
if (UserManager.getPlayer(player.getName()).getPartyChatMode()) {
return;
}
}
Expand Down Expand Up @@ -334,10 +334,10 @@ protected static void handleMessage(final Player player,
}
} else if (c.getChatType() == ChatType.GLOBAL) {
if (Bukkit.getServer().getPluginManager().getPlugin("mcMMO") != null) {
if (Users.getPlayer(player.getName()).getAdminChatMode()) {
if (UserManager.getPlayer(player.getName()).getAdminChatMode()) {
return;
}
if (Users.getPlayer(player.getName()).getPartyChatMode()) {
if (UserManager.getPlayer(player.getName()).getPartyChatMode()) {
return;
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/monstercraft/irc/plugin/towny/TownyChatListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import org.monstercraft.irc.plugin.util.StringUtils;
import org.monstercraft.irc.plugin.wrappers.IRCChannel;

import com.gmail.nossr50.util.Users;
import com.gmail.nossr50.util.player.UserManager;
import com.palmergames.bukkit.TownyChat.Chat;
import com.palmergames.bukkit.TownyChat.channels.Channel;
import com.palmergames.bukkit.TownyChat.channels.channelTypes;
Expand Down Expand Up @@ -97,10 +97,10 @@ public void handle(final IRCChannel c, final Player player,
final String message) {
if (c.getChatType() == ChatType.TOWNYCHAT) {
if (Bukkit.getServer().getPluginManager().getPlugin("mcMMO") != null) {
if (Users.getPlayer(player.getName()).getAdminChatMode()) {
if (UserManager.getPlayer(player.getName()).getAdminChatMode()) {
return;
}
if (Users.getPlayer(player.getName()).getPartyChatMode()) {
if (UserManager.getPlayer(player.getName()).getPartyChatMode()) {
return;
}
}
Expand Down
6 changes: 2 additions & 4 deletions src/main/java/org/monstercraft/irc/plugin/util/StringUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@ public static String getPrefix(final String name) {
if (MonsterIRC.getHookManager() != null) {
if (MonsterIRC.getHookManager().getChatHook() != null) {
if (MonsterIRC.getHookManager().getChatHook().isEnabled()) {
if (MonsterIRC.getHookManager().getChatHook()
.getPlayerPrefix("", name) != null) {
s = MonsterIRC.getHookManager().getChatHook()
.getPlayerPrefix("", name);
if (MonsterIRC.getHookManager().getChatHook().getPlayerPrefix("", name) != null) {
s = MonsterIRC.getHookManager().getChatHook().getPlayerPrefix("", name);
}
}
}
Expand Down