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

Merge branch 'master' into feature/region-api-update

Browse Source
This commit is contained in:
sk89q 2014-08-22 20:48:34 -07:00
commit 88e7327af6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java
View File

@ -329,7 +329,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);

2
src/main/java/com/sk89q/worldguard/bukkit/commands/GeneralCommands.java
View File

@ -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