From 470b19160d97fa63cce0b13554d932fa71ce3521 Mon Sep 17 00:00:00 2001 From: Brettflan Date: Sun, 4 Nov 2012 15:07:41 -0600 Subject: [PATCH] Allow knockback to be set to 0, for the rare person that might for whatever reason want to disable border knockback --- src/com/wimbli/WorldBorder/BorderData.java | 4 ++++ src/com/wimbli/WorldBorder/WBCommand.java | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/com/wimbli/WorldBorder/BorderData.java b/src/com/wimbli/WorldBorder/BorderData.java index 187e3a9..6bb2079 100644 --- a/src/com/wimbli/WorldBorder/BorderData.java +++ b/src/com/wimbli/WorldBorder/BorderData.java @@ -134,6 +134,10 @@ public class BorderData public Location correctedPosition(Location loc, boolean round) { + // if knockback is set to 0, simply return + if (Config.KnockBack() == 0.0) + return loc; + // if this border has a shape override set, use it if (shapeRound != null) round = shapeRound.booleanValue(); diff --git a/src/com/wimbli/WorldBorder/WBCommand.java b/src/com/wimbli/WorldBorder/WBCommand.java index 6bad6e8..6d06c75 100644 --- a/src/com/wimbli/WorldBorder/WBCommand.java +++ b/src/com/wimbli/WorldBorder/WBCommand.java @@ -354,13 +354,13 @@ public class WBCommand implements CommandExecutor } catch(NumberFormatException ex) { - sender.sendMessage(clrErr + "The knockback must be a decimal value of at least 1.0."); + sender.sendMessage(clrErr + "The knockback must be a decimal value of at least 1.0, or it can be 0."); return true; } - if (numBlocks < 1.0) + if (numBlocks < 0.0 || (numBlocks > 0.0 && numBlocks < 1.0)) { - sender.sendMessage(clrErr + "The knockback must be a decimal value of at least 1.0."); + sender.sendMessage(clrErr + "The knockback must be a decimal value of at least 1.0, or it can be 0."); return true; }