Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-11-24 11:36:11 +01:00
Code Issues Projects Releases Wiki Activity

Added administrator notification functionality and flag for greets and farewells

Browse Source
This commit is contained in:
DarkLiKally 2011-02-28 20:28:14 +01:00
parent 79b937e8d2
commit df7409607f
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/sk89q/worldguard/protection/TimedFlagsTimer.java
View File

@ -20,6 +20,7 @@
package com.sk89q.worldguard.protection; package com.sk89q.worldguard.protection;
import org.bukkit.ChatColor;
import org.bukkit.Location; import org.bukkit.Location;
import com.sk89q.worldguard.LocalPlayer; import com.sk89q.worldguard.LocalPlayer;
import com.sk89q.worldguard.bukkit.BukkitPlayer; import com.sk89q.worldguard.bukkit.BukkitPlayer;
@ -112,6 +113,9 @@ public void run() {
if (newGreetMsg != null) { if (newGreetMsg != null) {
player.sendMessage(newGreetMsg); player.sendMessage(newGreetMsg);
} }
if (regions.getBooleanFlag(FlagType.NOTIFY_GREET, false).getValue(false)) {
broadcastNotification(ChatColor.YELLOW + "Player " + player.getName() + " entered region " + newRegionName);
}
nfo.lastFarewellMsg = farewellMsg; nfo.lastFarewellMsg = farewellMsg;
nfo.lastRegion = newRegionName; nfo.lastRegion = newRegionName;
} }
@ -121,6 +125,9 @@ public void run() {
player.sendMessage(nfo.lastFarewellMsg); player.sendMessage(nfo.lastFarewellMsg);
nfo.lastFarewellMsg = null; nfo.lastFarewellMsg = null;
} }
if (regions.getBooleanFlag(FlagType.NOTIFY_FAREWELL, false).getValue(false)) {
broadcastNotification(ChatColor.YELLOW + "Player " + player.getName() + " left region " + nfo.lastRegion);
}
nfo.lastRegion = null; nfo.lastRegion = null;
} }
} }
@ -134,6 +141,15 @@ public void run() {
newLoc.setY(newLoc.getWorld().getHighestBlockYAt(newLoc) + 1); newLoc.setY(newLoc.getWorld().getHighestBlockYAt(newLoc) + 1);
player.teleportTo(newLoc); player.teleportTo(newLoc);
} }
}
}
public void broadcastNotification(String msg) {
for (Player player : wg.getServer().getOnlinePlayers()) {
if (wg.getWgConfiguration().hasPermission(player, "notify_onenter")) {
player.sendMessage(msg);
}
} }
} }

8
src/com/sk89q/worldguard/protection/regions/flags/FlagDatabase.java
View File

@ -38,9 +38,9 @@ public enum FlagType {
PASSTHROUGH, BUILD, PVP, MOB_DAMAGE, CREEPER_EXPLOSION, PASSTHROUGH, BUILD, PVP, MOB_DAMAGE, CREEPER_EXPLOSION,
TNT, LIGHTER, FIRE_SPREAD, LAVA_FIRE, CHEST_ACCESS, WATER_FLOW, TNT, LIGHTER, FIRE_SPREAD, LAVA_FIRE, CHEST_ACCESS, WATER_FLOW,
LEVER_AND_BUTTON, PLACE_VEHICLE, GREET_MESSAGE, FAREWELL_MESSAGE, DENY_SPAWN, LEVER_AND_BUTTON, PLACE_VEHICLE, GREET_MESSAGE, FAREWELL_MESSAGE,
HEAL_DELAY, HEAL_AMOUNT, TELE_LOC, TELE_PERM, SPAWN_LOC, SPAWN_PERM, NOTIFY_GREET, NOTIFY_FAREWELL, DENY_SPAWN, HEAL_DELAY, HEAL_AMOUNT,
BUYABLE, PRICE TELE_LOC, TELE_PERM, SPAWN_LOC, SPAWN_PERM, BUYABLE, PRICE
}; };
@ -72,6 +72,8 @@ public enum FlagType {
registerFlag("gmsg", FlagType.GREET_MESSAGE, FlagDataType.STRING); registerFlag("gmsg", FlagType.GREET_MESSAGE, FlagDataType.STRING);
registerFlag("fmsg", FlagType.FAREWELL_MESSAGE, FlagDataType.STRING); registerFlag("fmsg", FlagType.FAREWELL_MESSAGE, FlagDataType.STRING);
registerFlag("denyspawn", FlagType.DENY_SPAWN, FlagDataType.STRING); registerFlag("denyspawn", FlagType.DENY_SPAWN, FlagDataType.STRING);
registerFlag("notifygreet", FlagType.NOTIFY_GREET, FlagDataType.BOOLEAN);
registerFlag("notifyfarewell", FlagType.NOTIFY_GREET, FlagDataType.BOOLEAN);
registerFlag("teleloc", FlagType.TELE_LOC, FlagDataType.LOCATION); registerFlag("teleloc", FlagType.TELE_LOC, FlagDataType.LOCATION);
registerFlag("spawnloc", FlagType.SPAWN_LOC, FlagDataType.LOCATION); registerFlag("spawnloc", FlagType.SPAWN_LOC, FlagDataType.LOCATION);