From 3989861f1a17e6507599317e455cdad94c153154 Mon Sep 17 00:00:00 2001 From: Ben Diskmaster L Date: Sun, 4 Sep 2011 05:16:39 -0500 Subject: [PATCH] Revert commenting out of the code blocks from stage1's commit. --- src/com/gmail/nossr50/datatypes/HealthBarMMO.java | 6 +++--- src/com/gmail/nossr50/listeners/mcPlayerListener.java | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/com/gmail/nossr50/datatypes/HealthBarMMO.java b/src/com/gmail/nossr50/datatypes/HealthBarMMO.java index 9f763eb03..0d92e8a0a 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 99e8c418c..d1e7233b3 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