mirror of
https://github.com/mcMMO-Dev/mcMMO.git
synced 2024-11-25 22:56:45 +01:00
Revert commenting out of the code blocks from stage1's commit.
This commit is contained in:
parent
b83b69c7ff
commit
3989861f1a
@ -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;
|
||||
}
|
||||
|
@ -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!
|
||||
}*/
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user