Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-10-02 16:47:32 +02:00
Code Issues Projects Releases Wiki Activity

Added exact respawning and teleporting to home on death.

Browse Source
This commit is contained in:
sk89q 2010-12-04 18:21:05 -08:00
parent 257c12e727
commit e94a9bf68f
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/WorldGuardListener.java
View File

@ -96,6 +96,8 @@ public class WorldGuardListener extends PluginListener {
private boolean disableWaterDamage; private boolean disableWaterDamage;
private int loginProtection; private int loginProtection;
private int spawnProtection; private int spawnProtection;
private boolean teleportToHome;
private boolean exactRespawn;
private boolean kickOnDeath; private boolean kickOnDeath;
private Blacklist blacklist; private Blacklist blacklist;
@ -199,6 +201,8 @@ public void loadConfiguration() {
loginProtection = properties.getInt("login-protection", 3); loginProtection = properties.getInt("login-protection", 3);
spawnProtection = properties.getInt("spawn-protection", 0); spawnProtection = properties.getInt("spawn-protection", 0);
kickOnDeath = properties.getBoolean("kick-on-death", false); kickOnDeath = properties.getBoolean("kick-on-death", false);
teleportToHome = properties.getBoolean("teleport-to-home-on-death", false);
exactRespawn = properties.getBoolean("exact-respawn", false);
// Console log configuration // Console log configuration
boolean logConsole = properties.getBoolean("log-console", true); boolean logConsole = properties.getBoolean("log-console", true);
@ -311,7 +315,8 @@ public void onLogin(Player player) {
player.sendMessage(Colors.Yellow + "Fire spread is currently globally disabled."); player.sendMessage(Colors.Yellow + "Fire spread is currently globally disabled.");
} }
if (loginProtection > 0 || spawnProtection > 0 || kickOnDeath) { if (loginProtection > 0 || spawnProtection > 0
|| kickOnDeath || teleportToHome || exactRespawn) {
recentLogins.put(player.getName(), System.currentTimeMillis()); recentLogins.put(player.getName(), System.currentTimeMillis());
} }
@ -959,7 +964,8 @@ public boolean onHealthChange(Player player, int oldValue, int newValue) {
return oldValue > newValue; return oldValue > newValue;
} }
if (loginProtection > 0 || spawnProtection > 0 || kickOnDeath) { if (loginProtection > 0 || spawnProtection > 0
|| kickOnDeath || teleportToHome || exactRespawn) {
long now = System.currentTimeMillis(); long now = System.currentTimeMillis();
boolean recentLogin = false; boolean recentLogin = false;
@ -979,13 +985,29 @@ public boolean onHealthChange(Player player, int oldValue, int newValue) {
} }
} }
if (kickOnDeath && oldValue == -1 && newValue == 20 && !recentLogin) { boolean alreadyMoved = false;
if (teleportToHome && oldValue <= 0 && newValue == 20 && !recentLogin) {
Warp warp = etc.getDataSource().getHome(player.getName());
if (warp != null) {
player.teleportTo(warp.Location);
alreadyMoved = true;
} else if (player.canUseCommand("/sethome")) {
player.sendMessage(Colors.Yellow + "Use /sethome to set your spawn location.");
}
}
if (exactRespawn && !alreadyMoved && oldValue <= 0 && newValue == 20 && !recentLogin) {
player.teleportTo(etc.getServer().getSpawnLocation());
}
if (kickOnDeath && oldValue <= 0 && newValue == 20 && !recentLogin) {
player.kick("You died! Rejoin please."); player.kick("You died! Rejoin please.");
return false; return false;
} }
if (spawnProtection > 0) { if (spawnProtection > 0) {
if (oldValue == -1 && newValue == 20 && !recentLogin) { // Player was just respawned if (oldValue <= 0 && newValue == 20 && !recentLogin) { // Player was just respawned
lastSpawn.put(player.getName(), now); lastSpawn.put(player.getName(), now);
} else if (lastSpawn.containsKey(playerName)) { } else if (lastSpawn.containsKey(playerName)) {
long time = lastSpawn.get(playerName); long time = lastSpawn.get(playerName);