Add Colors to chat, update default config

This commit is contained in:
Eric Stokes 2011-06-26 20:24:44 -06:00
parent 84b726b636
commit 46ed043104
4 changed files with 66 additions and 21 deletions

View File

@ -2,6 +2,7 @@ package com.onarandombox.MultiverseCore;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.bukkit.ChatColor;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerChatEvent; import org.bukkit.event.player.PlayerChatEvent;
@ -39,14 +40,12 @@ public class MVPlayerListener extends PlayerListener {
event.setCancelled(true); event.setCancelled(true);
} }
@Override @Override
public void onPlayerMove(PlayerMoveEvent event) { public void onPlayerMove(PlayerMoveEvent event) {
Player p = event.getPlayer(); // Grab Player Player p = event.getPlayer(); // Grab Player
Location loc = p.getLocation(); // Grab Location Location loc = p.getLocation(); // Grab Location
/** /**
* Check the Player has actually moved a block to prevent unneeded calculations... * Check the Player has actually moved a block to prevent unneeded calculations... This is to prevent huge performance drops on high player count servers.
* This is to prevent huge performance drops on high player count servers.
*/ */
MVPlayerSession ps = this.plugin.getPlayerSession(p); MVPlayerSession ps = this.plugin.getPlayerSession(p);
if (ps.loc.getBlockX() == loc.getBlockX() && ps.loc.getBlockY() == loc.getBlockY() && ps.loc.getBlockZ() == loc.getBlockZ()) { if (ps.loc.getBlockX() == loc.getBlockX() && ps.loc.getBlockY() == loc.getBlockY() && ps.loc.getBlockZ() == loc.getBlockZ()) {
@ -58,7 +57,32 @@ public class MVPlayerListener extends PlayerListener {
@Override @Override
public void onPlayerChat(PlayerChatEvent event) { public void onPlayerChat(PlayerChatEvent event) {
// Not sure if this should be a seperat plugin... in here for now!!!
// FernFerret
if (event.isCancelled()) {
return;
}
/**
* Check whether the Server is set to prefix the chat with the World name. If not we do nothing, if so we need to check if the World has an Alias.
*/
if (this.plugin.configMV.getBoolean("worldnameprefix", true)) {
String world = event.getPlayer().getWorld().getName();
String prefix = "";
// If we're not a MV world, don't do anything
if (!this.plugin.isMVWorld(world)) {
return;
}
MVWorld mvworld = this.plugin.getMVWorld(world);
prefix = mvworld.getColoredWorldString();
String format = event.getFormat();
event.setFormat("[" + prefix + "]" + format);
}
} }
@Override @Override

View File

@ -95,6 +95,14 @@ public class MVWorld {
// } // }
} }
public String getColoredWorldString() {
if (this.getAlias() != null && this.getAlias().length() > 0) {
return this.getAliasColor() + this.getAlias() + ChatColor.WHITE;
} else {
return this.world.getName();
}
}
private void getMobExceptions() { private void getMobExceptions() {
List<String> temp; List<String> temp;
temp = this.config.getStringList("worlds." + this.name + ".animals.exceptions", new ArrayList<String>()); temp = this.config.getStringList("worlds." + this.name + ".animals.exceptions", new ArrayList<String>());

View File

@ -145,6 +145,7 @@ public class MultiverseCore extends JavaPlugin {
pm.registerEvent(Event.Type.PLAYER_QUIT, this.playerListener, Priority.Normal, this); // To remove Player Sessions pm.registerEvent(Event.Type.PLAYER_QUIT, this.playerListener, Priority.Normal, this); // To remove Player Sessions
pm.registerEvent(Event.Type.PLAYER_KICK, this.playerListener, Priority.Highest, this); pm.registerEvent(Event.Type.PLAYER_KICK, this.playerListener, Priority.Highest, this);
pm.registerEvent(Event.Type.PLAYER_RESPAWN, this.playerListener, Priority.Normal, this); pm.registerEvent(Event.Type.PLAYER_RESPAWN, this.playerListener, Priority.Normal, this);
pm.registerEvent(Event.Type.PLAYER_CHAT, this.playerListener, Priority.Normal, this);
pm.registerEvent(Event.Type.ENTITY_DAMAGE, this.entityListener, Priority.Normal, this); // To Allow/Disallow PVP as well as EnableHealth. pm.registerEvent(Event.Type.ENTITY_DAMAGE, this.entityListener, Priority.Normal, this); // To Allow/Disallow PVP as well as EnableHealth.
pm.registerEvent(Event.Type.CREATURE_SPAWN, this.entityListener, Priority.Normal, this); // To prevent all or certain animals/monsters from spawning. pm.registerEvent(Event.Type.CREATURE_SPAWN, this.entityListener, Priority.Normal, this); // To prevent all or certain animals/monsters from spawning.

View File

@ -1,15 +1,27 @@
#True/False - Whether MultiVerse should handle all respawns on every World including the Default. # True/False - Whether MultiVerse should handle all respawns on every World including the Default.
#Disable this if you have a form of Respawn Teleportation plugin. # Disable this if you have a form of Respawn Teleportation plugin.
globalrespawn: false globalrespawn: false
#True/False - Whether MultiVerse should handle all respawns on the MultiVerse Worlds. # True/False - Whether MultiVerse should handle all respawns on the MultiVerse Worlds.
#If 'globalrespawn:true' then this will have no effect. # If 'globalrespawn:true' then this will have no effect.
alternaterespawn: true alternaterespawn: true
#How long to leave in between sending a message to the player. # How long to leave in between sending a message to the player.
#In Milliseconds - Default is '5000' which is 5 Seconds. # In Milliseconds - Default is '5000' which is 5 Seconds.
messagecooldown: 5000 messagecooldown: 5000
#Portal Cooldown, only affects MultiVerse portals. # Portal Cooldown, only affects MultiVerse portals.
#In Milliseconds - Default is '5000' which is 5 Seconds. # In Milliseconds - Default is '5000' which is 5 Seconds.
portalcooldown: 5000 portalcooldown: 5000
# If this is set to true, we will prefix the chat with
# a colorful world alias if it's present. If not, we simply
# show the world's name in white. If this is false Multiverse
# won't touch your chat
worldnameprefix: true
# If Multiverse does not find permissions should it automattically fall back to
# people defined in ops.txt? Remember, if you use ops based permissions
# the awesome Multiverse devs get to decide which commands require op!
# (Which is why we highly recomend a permissions plugin! You shouldn't trust us this much...)
fallbacktoops: true