diff --git a/src/com/gmail/nossr50/datatypes/HealthBarMMO.java b/src/com/gmail/nossr50/datatypes/HealthBarMMO.java index 0d92e8a0a..9f763eb03 100644 --- a/src/com/gmail/nossr50/datatypes/HealthBarMMO.java +++ b/src/com/gmail/nossr50/datatypes/HealthBarMMO.java @@ -5,7 +5,7 @@ import org.bukkit.entity.LivingEntity; import org.getspout.spoutapi.gui.GenericLabel; import org.getspout.spoutapi.gui.GenericTexture; -import com.gmail.nossr50.spout.SpoutStuff; +//import com.gmail.nossr50.spout.SpoutStuff; public class HealthBarMMO { @@ -18,8 +18,8 @@ public class HealthBarMMO health_name = new GenericLabel(); health_name.setText(ChatColor.GREEN+name).setDirty(true); - health_bar = new GenericTexture(); - health_bar.setUrl(SpoutStuff.getHealthBarURL(entity.getHealth())).setHeight(8).setWidth(64).setDirty(true); + //health_bar = new GenericTexture(); + //health_bar.setUrl(SpoutStuff.getHealthBarURL(entity.getHealth())).setHeight(8).setWidth(64).setDirty(true); playerName = name; } diff --git a/src/com/gmail/nossr50/listeners/mcPlayerListener.java b/src/com/gmail/nossr50/listeners/mcPlayerListener.java index d1e7233b3..99e8c418c 100644 --- a/src/com/gmail/nossr50/listeners/mcPlayerListener.java +++ b/src/com/gmail/nossr50/listeners/mcPlayerListener.java @@ -7,7 +7,7 @@ import org.bukkit.ChatColor; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; -import org.bukkit.craftbukkit.command.ColouredConsoleSender; +//import org.bukkit.craftbukkit.command.ColouredConsoleSender; import org.bukkit.entity.Player; import org.bukkit.event.block.Action; import org.bukkit.event.player.PlayerChatEvent; @@ -243,11 +243,11 @@ public class mcPlayerListener extends PlayerListener if(Party.getInstance().inSameParty(player, x)) x.sendMessage(format); } - if(Bukkit.getServer() instanceof ColouredConsoleSender) + /*if(Bukkit.getServer() instanceof ColouredConsoleSender) { ColouredConsoleSender ccs = (ColouredConsoleSender) Bukkit.getServer(); ccs.sendMessage(ChatColor.GREEN+"[P]"+format); //Colors, woot! - } + }*/ } else if (PP.getAdminChatMode()) { event.setCancelled(true); String format = ChatColor.AQUA + "{" + ChatColor.WHITE + player.getDisplayName() + ChatColor.AQUA + "} "+event.getMessage(); @@ -256,11 +256,11 @@ public class mcPlayerListener extends PlayerListener if(x.isOp() || mcPermissions.getInstance().adminChat(x)) x.sendMessage(format); } - if(Bukkit.getServer() instanceof ColouredConsoleSender) + /*if(Bukkit.getServer() instanceof ColouredConsoleSender) { ColouredConsoleSender ccs = (ColouredConsoleSender) Bukkit.getServer(); ccs.sendMessage(ChatColor.AQUA+"[A]"+format); //Colors, woot! - } + }*/ } } } \ No newline at end of file diff --git a/src/resources/plugin.yml b/src/com/gmail/plugin.yml similarity index 99% rename from src/resources/plugin.yml rename to src/com/gmail/plugin.yml index 2ecbf404a..1d4bcb7f5 100644 --- a/src/resources/plugin.yml +++ b/src/com/gmail/plugin.yml @@ -1,6 +1,6 @@ name: mcMMO main: com.gmail.nossr50.mcMMO -version: 1.1.14 +version: 1.1.14-Disk-GIT softdepend: [Spout] commands: mchud: