diff --git a/pom.xml b/pom.xml
index e6af050f..fc53763c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
com.sk89q
worldedit
- 4.4.2
+ 4.7-SNAPSHOT
diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java
index 68b810e3..387e3366 100644
--- a/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java
+++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java
@@ -80,7 +80,7 @@ public class WorldConfiguration {
public boolean fireSpreadDisableToggle;
public boolean enforceOneSession;
public boolean itemDurability;
- public boolean classicWater;
+ // public boolean classicWater;
public boolean simulateSponge;
public int spongeRadius;
public boolean disableExpDrops;
@@ -101,11 +101,11 @@ public class WorldConfiguration {
public boolean blockCreeperBlockDamage;
public boolean blockFireballExplosions;
public boolean blockFireballBlockDamage;
- public int loginProtection;
- public int spawnProtection;
- public boolean kickOnDeath;
- public boolean exactRespawn;
- public boolean teleportToHome;
+ // public int loginProtection;
+ // public int spawnProtection;
+ // public boolean kickOnDeath;
+ // public boolean exactRespawn;
+ // public boolean teleportToHome;
public boolean disableContactDamage;
public boolean disableFallDamage;
public boolean disableLavaDamage;
@@ -122,9 +122,9 @@ public class WorldConfiguration {
public boolean highFreqFlags;
public int regionWand = 287;
public Set blockCreatureSpawn;
- public boolean useiConomy;
- public boolean buyOnClaim;
- public double buyOnClaimPrice;
+ // public boolean useiConomy;
+ // public boolean buyOnClaim;
+ // public double buyOnClaimPrice;
public int maxClaimVolume;
public boolean claimOnlyInsideExistingRegions;
public int maxRegionCountPerPlayer;
@@ -260,13 +260,12 @@ private void loadConfiguration() {
removeInfiniteStacks = getBoolean("protection.remove-infinite-stacks", false);
disableExpDrops = getBoolean("protection.disable-xp-orb-drops", false);
- classicWater = getBoolean("simulation.classic-water", false);
+ // classicWater = getBoolean("simulation.classic-water", false);
simulateSponge = getBoolean("simulation.sponge.enable", true);
spongeRadius = Math.max(1, getInt("simulation.sponge.radius", 3)) - 1;
redstoneSponges = getBoolean("simulation.sponge.redstone", false);
- pumpkinScuba = getBoolean("pumpkin-scuba", false);
-
+ pumpkinScuba = getBoolean("default.pumpkin-scuba", false);
disableHealthRegain = getBoolean("default.disable-health-regain", false);
noPhysicsGravel = getBoolean("physics.no-physics-gravel", false);
@@ -275,7 +274,6 @@ private void loadConfiguration() {
preventWaterDamage = new HashSet(getIntList("physics.disable-water-damage-blocks", null));
blockTNTExplosions = getBoolean("ignition.block-tnt", false);
- // any better place to put this?
blockTNTBlockDamage = getBoolean("ignition.block-tnt-block-damage", false);
blockLighter = getBoolean("ignition.block-lighter", false);
@@ -291,11 +289,11 @@ private void loadConfiguration() {
antiWolfDumbness = getBoolean("mobs.anti-wolf-dumbness", false);
disableEndermanGriefing = getBoolean("mobs.disable-enderman-griefing", false);
- loginProtection = getInt("spawn.login-protection", 3);
- spawnProtection = getInt("spawn.spawn-protection", 0);
- kickOnDeath = getBoolean("spawn.kick-on-death", false);
- exactRespawn = getBoolean("spawn.exact-respawn", false);
- teleportToHome = getBoolean("spawn.teleport-to-home-on-death", false);
+ // loginProtection = getInt("spawn.login-protection", 3);
+ // spawnProtection = getInt("spawn.spawn-protection", 0);
+ // kickOnDeath = getBoolean("spawn.kick-on-death", false);
+ // exactRespawn = getBoolean("spawn.exact-respawn", false);
+ // teleportToHome = getBoolean("spawn.teleport-to-home-on-death", false);
disableFallDamage = getBoolean("player-damage.disable-fall-damage", false);
disableLavaDamage = getBoolean("player-damage.disable-lava-damage", false);
@@ -341,9 +339,9 @@ private void loadConfiguration() {
claimOnlyInsideExistingRegions = getBoolean("regions.claim-only-inside-existing-regions", false);
maxRegionCountPerPlayer = getInt("regions.max-region-count-per-player", 7);
- useiConomy = getBoolean("iconomy.enable", false);
- buyOnClaim = getBoolean("iconomy.buy-on-claim", false);
- buyOnClaimPrice = getDouble("iconomy.buy-on-claim-price", 1.0);
+ // useiConomy = getBoolean("iconomy.enable", false);
+ // buyOnClaim = getBoolean("iconomy.buy-on-claim", false);
+ // buyOnClaimPrice = getDouble("iconomy.buy-on-claim-price", 1.0);
blockCreatureSpawn = new HashSet();
for (String creatureName : getStringList("mobs.block-creature-spawn", null)) {
diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java
index b7769b9c..5ee5e2d4 100644
--- a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java
+++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java
@@ -42,7 +42,6 @@
import org.bukkit.plugin.java.JavaPlugin;
import com.sk89q.bukkit.migration.PermissionsResolverManager;
-import com.sk89q.bukkit.migration.PermissionsResolverServerListener;
import com.sk89q.minecraft.util.commands.CommandException;
import com.sk89q.minecraft.util.commands.CommandPermissionsException;
import com.sk89q.minecraft.util.commands.CommandUsageException;
@@ -129,8 +128,7 @@ public void onEnable() {
getDataFolder().mkdirs();
// Set up permissions
- perms = new PermissionsResolverManager(
- getConfiguration(), getServer(), "WorldGuard", logger);
+ perms = new PermissionsResolverManager(this, getDescription().getName(), logger);
perms.load();
// This must be done before configuration is laoded
@@ -144,9 +142,6 @@ public void onEnable() {
// the migration code reuses the loaded region managers
LegacyWorldGuardMigration.migrateRegions(this);
- // Load permissions
- (new PermissionsResolverServerListener(perms)).register(this);
-
flagStateManager = new FlagStateManager(this);
if (configuration.useRegionsScheduler) {
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 9e95cab8..23047fcd 100644
--- a/src/main/java/com/sk89q/worldguard/bukkit/commands/GeneralCommands.java
+++ b/src/main/java/com/sk89q/worldguard/bukkit/commands/GeneralCommands.java
@@ -243,7 +243,7 @@ public static void locate(CommandContext args, WorldGuardPlugin plugin,
}
}
- @Command(aliases = {"stack"},
+ @Command(aliases = {"stack", ";"},
usage = "",
desc = "Stack items",
flags = "", min = 0, max = 0)
diff --git a/src/main/java/com/sk89q/worldguard/protection/flags/DefaultFlag.java b/src/main/java/com/sk89q/worldguard/protection/flags/DefaultFlag.java
index 508607ef..5a318c6e 100644
--- a/src/main/java/com/sk89q/worldguard/protection/flags/DefaultFlag.java
+++ b/src/main/java/com/sk89q/worldguard/protection/flags/DefaultFlag.java
@@ -91,7 +91,7 @@ public final class DefaultFlag {
HEAL_AMOUNT, HEAL_DELAY, MIN_HEAL, MAX_HEAL, INVINCIBILITY,
SNOW_FALL, SNOW_MELT, ICE_FORM, ICE_MELT,
MUSHROOMS, LEAF_DECAY, GRASS_SPREAD,
- FIRE_SPREAD, LAVA_FIRE, LAVA_FLOW, WATER_FLOW,
+ FIRE_SPREAD, LAVA_FIRE, LAVA_FLOW, WATER_FLOW,
TELE_LOC, TELE_PERM, SPAWN_LOC, SPAWN_PERM,
BLOCKED_CMDS, ALLOWED_CMDS, PRICE, BUYABLE,
};