EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-22 13:16:45 +01:00
Code Issues Projects Releases Wiki Activity

Removed ColoredConsoleSender. No more CB Dependency!

Browse Source
This commit is contained in:
GJ 2012-02-09 14:12:36 -05:00
parent 7dee6db362
commit 52458041f0
2 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pom.xml
View File

@ -111,13 +111,6 @@
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId>
<version>1.1-R3</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency> <dependency>
<groupId>org.getspout</groupId> <groupId>org.getspout</groupId>
<artifactId>spoutpluginapi</artifactId> <artifactId>spoutpluginapi</artifactId>

13
src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java
View File

@ -25,7 +25,6 @@ import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.craftbukkit.command.ColouredConsoleSender;
import org.bukkit.entity.CreatureType; import org.bukkit.entity.CreatureType;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;
@ -328,11 +327,7 @@ public class mcPlayerListener implements Listener
if(Party.getInstance().inSameParty(player, x)) if(Party.getInstance().inSameParty(player, x))
x.sendMessage(format); x.sendMessage(format);
} }
if(Bukkit.getServer() instanceof ColouredConsoleSender) log.log(Level.INFO, "[P]"+format);
{
ColouredConsoleSender ccs = (ColouredConsoleSender) Bukkit.getServer();
ccs.sendMessage(ChatColor.GREEN+"[P]"+format); //Colors, woot!
}
} else if (PP.getAdminChatMode()) { } else if (PP.getAdminChatMode()) {
event.setCancelled(true); event.setCancelled(true);
String name = (LoadProperties.aDisplayNames) ? player.getDisplayName() : player.getName(); String name = (LoadProperties.aDisplayNames) ? player.getDisplayName() : player.getName();
@ -342,15 +337,9 @@ public class mcPlayerListener implements Listener
if(x.isOp() || mcPermissions.getInstance().adminChat(x)) if(x.isOp() || mcPermissions.getInstance().adminChat(x))
x.sendMessage(format); x.sendMessage(format);
} }
if(Bukkit.getServer() instanceof ColouredConsoleSender)
{
ColouredConsoleSender ccs = (ColouredConsoleSender) Bukkit.getServer();
ccs.sendMessage(ChatColor.AQUA+"[A]"+format); //Colors, woot!
} else {
log.log(Level.INFO, "[A]"+format); log.log(Level.INFO, "[A]"+format);
} }
} }
}
// Dynamically aliasing commands need to be re-done. // Dynamically aliasing commands need to be re-done.
// For now, using a command with an alias will send both the original command, and the mcMMO command // For now, using a command with an alias will send both the original command, and the mcMMO command