Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-09-30 07:37:31 +02:00
Code Issues Projects Releases Wiki Activity

Clean up and preparation for release.

Browse Source
This commit is contained in:
Wizjany 2011-09-25 23:31:21 -04:00
parent 3441ae11f2
commit 6c89ef908a
5 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -35,7 +35,7 @@
<dependency> <dependency>
<groupId>com.sk89q</groupId> <groupId>com.sk89q</groupId>
<artifactId>worldedit</artifactId> <artifactId>worldedit</artifactId>
<version>4.4.2</version> <version>4.7-SNAPSHOT</version>
</dependency> </dependency>
<!-- Bukkit --> <!-- Bukkit -->

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

@ -80,7 +80,7 @@ public class WorldConfiguration {
public boolean fireSpreadDisableToggle; public boolean fireSpreadDisableToggle;
public boolean enforceOneSession; public boolean enforceOneSession;
public boolean itemDurability; public boolean itemDurability;
public boolean classicWater; // public boolean classicWater;
public boolean simulateSponge; public boolean simulateSponge;
public int spongeRadius; public int spongeRadius;
public boolean disableExpDrops; public boolean disableExpDrops;
@ -101,11 +101,11 @@ public class WorldConfiguration {
public boolean blockCreeperBlockDamage; public boolean blockCreeperBlockDamage;
public boolean blockFireballExplosions; public boolean blockFireballExplosions;
public boolean blockFireballBlockDamage; public boolean blockFireballBlockDamage;
public int loginProtection; // public int loginProtection;
public int spawnProtection; // public int spawnProtection;
public boolean kickOnDeath; // public boolean kickOnDeath;
public boolean exactRespawn; // public boolean exactRespawn;
public boolean teleportToHome; // public boolean teleportToHome;
public boolean disableContactDamage; public boolean disableContactDamage;
public boolean disableFallDamage; public boolean disableFallDamage;
public boolean disableLavaDamage; public boolean disableLavaDamage;
@ -122,9 +122,9 @@ public class WorldConfiguration {
public boolean highFreqFlags; public boolean highFreqFlags;
public int regionWand = 287; public int regionWand = 287;
public Set<CreatureType> blockCreatureSpawn; public Set<CreatureType> blockCreatureSpawn;
public boolean useiConomy; // public boolean useiConomy;
public boolean buyOnClaim; // public boolean buyOnClaim;
public double buyOnClaimPrice; // public double buyOnClaimPrice;
public int maxClaimVolume; public int maxClaimVolume;
public boolean claimOnlyInsideExistingRegions; public boolean claimOnlyInsideExistingRegions;
public int maxRegionCountPerPlayer; public int maxRegionCountPerPlayer;
@ -260,13 +260,12 @@ private void loadConfiguration() {
removeInfiniteStacks = getBoolean("protection.remove-infinite-stacks", false); removeInfiniteStacks = getBoolean("protection.remove-infinite-stacks", false);
disableExpDrops = getBoolean("protection.disable-xp-orb-drops", 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); simulateSponge = getBoolean("simulation.sponge.enable", true);
spongeRadius = Math.max(1, getInt("simulation.sponge.radius", 3)) - 1; spongeRadius = Math.max(1, getInt("simulation.sponge.radius", 3)) - 1;
redstoneSponges = getBoolean("simulation.sponge.redstone", false); redstoneSponges = getBoolean("simulation.sponge.redstone", false);
pumpkinScuba = getBoolean("pumpkin-scuba", false); pumpkinScuba = getBoolean("default.pumpkin-scuba", false);
disableHealthRegain = getBoolean("default.disable-health-regain", false); disableHealthRegain = getBoolean("default.disable-health-regain", false);
noPhysicsGravel = getBoolean("physics.no-physics-gravel", false); noPhysicsGravel = getBoolean("physics.no-physics-gravel", false);
@ -275,7 +274,6 @@ private void loadConfiguration() {
preventWaterDamage = new HashSet<Integer>(getIntList("physics.disable-water-damage-blocks", null)); preventWaterDamage = new HashSet<Integer>(getIntList("physics.disable-water-damage-blocks", null));
blockTNTExplosions = getBoolean("ignition.block-tnt", false); blockTNTExplosions = getBoolean("ignition.block-tnt", false);
// any better place to put this?
blockTNTBlockDamage = getBoolean("ignition.block-tnt-block-damage", false); blockTNTBlockDamage = getBoolean("ignition.block-tnt-block-damage", false);
blockLighter = getBoolean("ignition.block-lighter", false); blockLighter = getBoolean("ignition.block-lighter", false);
@ -291,11 +289,11 @@ private void loadConfiguration() {
antiWolfDumbness = getBoolean("mobs.anti-wolf-dumbness", false); antiWolfDumbness = getBoolean("mobs.anti-wolf-dumbness", false);
disableEndermanGriefing = getBoolean("mobs.disable-enderman-griefing", false); disableEndermanGriefing = getBoolean("mobs.disable-enderman-griefing", false);
loginProtection = getInt("spawn.login-protection", 3); // loginProtection = getInt("spawn.login-protection", 3);
spawnProtection = getInt("spawn.spawn-protection", 0); // spawnProtection = getInt("spawn.spawn-protection", 0);
kickOnDeath = getBoolean("spawn.kick-on-death", false); // kickOnDeath = getBoolean("spawn.kick-on-death", false);
exactRespawn = getBoolean("spawn.exact-respawn", false); // exactRespawn = getBoolean("spawn.exact-respawn", false);
teleportToHome = getBoolean("spawn.teleport-to-home-on-death", false); // teleportToHome = getBoolean("spawn.teleport-to-home-on-death", false);
disableFallDamage = getBoolean("player-damage.disable-fall-damage", false); disableFallDamage = getBoolean("player-damage.disable-fall-damage", false);
disableLavaDamage = getBoolean("player-damage.disable-lava-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); claimOnlyInsideExistingRegions = getBoolean("regions.claim-only-inside-existing-regions", false);
maxRegionCountPerPlayer = getInt("regions.max-region-count-per-player", 7); maxRegionCountPerPlayer = getInt("regions.max-region-count-per-player", 7);
useiConomy = getBoolean("iconomy.enable", false); // useiConomy = getBoolean("iconomy.enable", false);
buyOnClaim = getBoolean("iconomy.buy-on-claim", false); // buyOnClaim = getBoolean("iconomy.buy-on-claim", false);
buyOnClaimPrice = getDouble("iconomy.buy-on-claim-price", 1.0); // buyOnClaimPrice = getDouble("iconomy.buy-on-claim-price", 1.0);
blockCreatureSpawn = new HashSet<CreatureType>(); blockCreatureSpawn = new HashSet<CreatureType>();
for (String creatureName : getStringList("mobs.block-creature-spawn", null)) { for (String creatureName : getStringList("mobs.block-creature-spawn", null)) {

7
src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java
View File

@ -42,7 +42,6 @@
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import com.sk89q.bukkit.migration.PermissionsResolverManager; 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.CommandException;
import com.sk89q.minecraft.util.commands.CommandPermissionsException; import com.sk89q.minecraft.util.commands.CommandPermissionsException;
import com.sk89q.minecraft.util.commands.CommandUsageException; import com.sk89q.minecraft.util.commands.CommandUsageException;
@ -129,8 +128,7 @@ public void onEnable() {
getDataFolder().mkdirs(); getDataFolder().mkdirs();
// Set up permissions // Set up permissions
perms = new PermissionsResolverManager( perms = new PermissionsResolverManager(this, getDescription().getName(), logger);
getConfiguration(), getServer(), "WorldGuard", logger);
perms.load(); perms.load();
// This must be done before configuration is laoded // This must be done before configuration is laoded
@ -144,9 +142,6 @@ public void onEnable() {
// the migration code reuses the loaded region managers // the migration code reuses the loaded region managers
LegacyWorldGuardMigration.migrateRegions(this); LegacyWorldGuardMigration.migrateRegions(this);
// Load permissions
(new PermissionsResolverServerListener(perms)).register(this);
flagStateManager = new FlagStateManager(this); flagStateManager = new FlagStateManager(this);
if (configuration.useRegionsScheduler) { if (configuration.useRegionsScheduler) {

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

@ -243,7 +243,7 @@ public static void locate(CommandContext args, WorldGuardPlugin plugin,
} }
} }
@Command(aliases = {"stack"}, @Command(aliases = {"stack", ";"},
usage = "", usage = "",
desc = "Stack items", desc = "Stack items",
flags = "", min = 0, max = 0) flags = "", min = 0, max = 0)

2
src/main/java/com/sk89q/worldguard/protection/flags/DefaultFlag.java
View File

@ -91,7 +91,7 @@ public final class DefaultFlag {
HEAL_AMOUNT, HEAL_DELAY, MIN_HEAL, MAX_HEAL, INVINCIBILITY, HEAL_AMOUNT, HEAL_DELAY, MIN_HEAL, MAX_HEAL, INVINCIBILITY,
SNOW_FALL, SNOW_MELT, ICE_FORM, ICE_MELT, SNOW_FALL, SNOW_MELT, ICE_FORM, ICE_MELT,
MUSHROOMS, LEAF_DECAY, GRASS_SPREAD, 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, TELE_LOC, TELE_PERM, SPAWN_LOC, SPAWN_PERM,
BLOCKED_CMDS, ALLOWED_CMDS, PRICE, BUYABLE, BLOCKED_CMDS, ALLOWED_CMDS, PRICE, BUYABLE,
}; };