From 573204caad8a6430e38c85aa770f50c1e16bf5d2 Mon Sep 17 00:00:00 2001 From: Torm Date: Mon, 11 Aug 2014 00:02:26 +0200 Subject: [PATCH 1/3] Fix heal command for players with more health than 20 --- .../com/sk89q/worldguard/bukkit/commands/GeneralCommands.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/GeneralCommands.java b/src/main/java/com/sk89q/worldguard/bukkit/commands/GeneralCommands.java index dfd6ccaf..4819e5f4 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/commands/GeneralCommands.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/commands/GeneralCommands.java @@ -150,7 +150,7 @@ public void heal(CommandContext args,CommandSender sender) throws CommandExcepti } for (Player player : targets) { - player.setHealth(20); + player.setHealth(player.getMaxHealth()); player.setFoodLevel(20); // Tell the user From c3363f0d7074d180d5f7f238245d97292e2b17ea Mon Sep 17 00:00:00 2001 From: sk89q Date: Mon, 18 Aug 2014 12:32:28 -0700 Subject: [PATCH 2/3] Disable sponge simulation by default. Vanilla Minecraft will have sponges again, plus it is uses up CPU time even if players can't get sponges. --- .../java/com/sk89q/worldguard/bukkit/WorldConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java index 903ae86b..3687c7be 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java @@ -324,7 +324,7 @@ private void loadConfiguration() { } blockPotionsAlways = getBoolean("gameplay.block-potions-overly-reliably", false); - simulateSponge = getBoolean("simulation.sponge.enable", true); + simulateSponge = getBoolean("simulation.sponge.enable", false); spongeRadius = Math.max(1, getInt("simulation.sponge.radius", 3)) - 1; redstoneSponges = getBoolean("simulation.sponge.redstone", false); From 577cfd0954145cf0e5d99746a18573fd8c0090e5 Mon Sep 17 00:00:00 2001 From: parryjacob Date: Tue, 19 Aug 2014 20:54:00 -0400 Subject: [PATCH 3/3] Remove zml-repo from pom.xml as it failed to resolve anymore, causing Maven builds to have to wait for extended periods of time --- pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pom.xml b/pom.xml index c73fa8ff..0d8ef41e 100644 --- a/pom.xml +++ b/pom.xml @@ -65,10 +65,6 @@ sk89q-repo http://maven.sk89q.com/repo/ - - zml-repo - http://files.zachsthings.com/repo - bukkit-repo http://repo.bukkit.org/content/groups/public