Upstream/WorldBorder-Updated-Fork
1
0
Fork 0
mirror of https://github.com/PryPurity/WorldBorder.git synced 2024-11-17 10:45:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #25 from erocs/master

Browse Source 
Added option to kill player instead of teleporting to spawn.
This commit is contained in:
Brett Flannigan 2013-09-03 09:07:29 -07:00
commit 119640ecc6
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/wimbli/WorldBorder/BorderCheckTask.java
View File

@ -131,7 +131,12 @@ public class BorderCheckTask implements Runnable
if (newLoc == null)
{
if (Config.Debug())
Config.LogWarn("Target new location unviable, using spawn.");
Config.LogWarn("Target new location unviable, using spawn or killing player.");
if (Config.getIfPlayerKill())
{
player.setHealth(0.0D);
return null;
}
newLoc = player.getWorld().getSpawnLocation();
}

7
src/main/java/com/wimbli/WorldBorder/Config.java
View File

@ -45,6 +45,7 @@ public class Config
private static boolean dynmapEnable = true;
private static String dynmapMessage;
private static int remountDelayTicks = 0;
private static boolean killPlayer = false;
// for monitoring plugin efficiency
// public static long timeUsed = 0;
@ -216,7 +217,9 @@ public class Config
{
return whooshEffect;
}
public static boolean getIfPlayerKill(){
return killPlayer;
}
public static void showWhooshEffect(Location loc)
{
if (!whooshEffect())
@ -459,6 +462,7 @@ public class Config
dynmapEnable = cfg.getBoolean("dynmap-border-enabled", true);
dynmapMessage = cfg.getString("dynmap-border-message", "The border of the world.");
LogConfig("Using " + (ShapeName()) + " border, knockback of " + knockBack + " blocks, and timer delay of " + timerTicks + ".");
killPlayer = cfg.getBoolean("player-killed-bad-spawn", false);
StartBorderTimer();
@ -543,6 +547,7 @@ public class Config
cfg.set("remount-delay-ticks", remountDelayTicks);
cfg.set("dynmap-border-enabled", dynmapEnable);
cfg.set("dynmap-border-message", dynmapMessage);
cfg.set("player-killed-bad-spawn", killPlayer);
cfg.set("worlds", null);
Iterator world = borders.entrySet().iterator();