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

Revert commenting out of the code blocks from stage1's commit.

Browse Source
This commit is contained in:
Ben Diskmaster L 2011-09-04 05:16:39 -05:00
parent b83b69c7ff
commit 3989861f1a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/gmail/nossr50/datatypes/HealthBarMMO.java
View File

@ -5,7 +5,7 @@ import org.bukkit.entity.LivingEntity;
import org.getspout.spoutapi.gui.GenericLabel; import org.getspout.spoutapi.gui.GenericLabel;
import org.getspout.spoutapi.gui.GenericTexture; import org.getspout.spoutapi.gui.GenericTexture;
//import com.gmail.nossr50.spout.SpoutStuff; import com.gmail.nossr50.spout.SpoutStuff;
public class HealthBarMMO public class HealthBarMMO
{ {
@ -18,8 +18,8 @@ public class HealthBarMMO
health_name = new GenericLabel(); health_name = new GenericLabel();
health_name.setText(ChatColor.GREEN+name).setDirty(true); health_name.setText(ChatColor.GREEN+name).setDirty(true);
//health_bar = new GenericTexture(); health_bar = new GenericTexture();
//health_bar.setUrl(SpoutStuff.getHealthBarURL(entity.getHealth())).setHeight(8).setWidth(64).setDirty(true); health_bar.setUrl(SpoutStuff.getHealthBarURL(entity.getHealth())).setHeight(8).setWidth(64).setDirty(true);
playerName = name; playerName = name;
} }

10
src/com/gmail/nossr50/listeners/mcPlayerListener.java
View File

@ -7,7 +7,7 @@ import org.bukkit.ChatColor;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Block; 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.entity.Player;
import org.bukkit.event.block.Action; import org.bukkit.event.block.Action;
import org.bukkit.event.player.PlayerChatEvent; import org.bukkit.event.player.PlayerChatEvent;
@ -243,11 +243,11 @@ public class mcPlayerListener extends PlayerListener
if(Party.getInstance().inSameParty(player, x)) if(Party.getInstance().inSameParty(player, x))
x.sendMessage(format); x.sendMessage(format);
} }
/*if(Bukkit.getServer() instanceof ColouredConsoleSender) if(Bukkit.getServer() instanceof ColouredConsoleSender)
{ {
ColouredConsoleSender ccs = (ColouredConsoleSender) Bukkit.getServer(); ColouredConsoleSender ccs = (ColouredConsoleSender) Bukkit.getServer();
ccs.sendMessage(ChatColor.GREEN+"[P]"+format); //Colors, woot! ccs.sendMessage(ChatColor.GREEN+"[P]"+format); //Colors, woot!
}*/ }
} else if (PP.getAdminChatMode()) { } else if (PP.getAdminChatMode()) {
event.setCancelled(true); event.setCancelled(true);
String format = ChatColor.AQUA + "{" + ChatColor.WHITE + player.getDisplayName() + ChatColor.AQUA + "} "+event.getMessage(); 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)) if(x.isOp() || mcPermissions.getInstance().adminChat(x))
x.sendMessage(format); x.sendMessage(format);
} }
/*if(Bukkit.getServer() instanceof ColouredConsoleSender) if(Bukkit.getServer() instanceof ColouredConsoleSender)
{ {
ColouredConsoleSender ccs = (ColouredConsoleSender) Bukkit.getServer(); ColouredConsoleSender ccs = (ColouredConsoleSender) Bukkit.getServer();
ccs.sendMessage(ChatColor.AQUA+"[A]"+format); //Colors, woot! ccs.sendMessage(ChatColor.AQUA+"[A]"+format); //Colors, woot!
}*/ }
} }
} }
} }