Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-09-28 22:57:29 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #289 from sk89q/develop

Browse Source 
Tiny changes extracted from various branches.
This commit is contained in:
Albert Pham 2013-11-17 15:03:19 -08:00
commit 723928d239
8 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -4,3 +4,5 @@
target
.DS_Store
*.iml
.idea

2
pom.xml
View File

@ -71,7 +71,7 @@
<dependency>
<groupId>com.sk89q</groupId>
<artifactId>worldedit</artifactId>
<version>5.5.8-SNAPSHOT</version>
<version>5.5.9-SNAPSHOT</version>
<scope>compile</scope>
<type>jar</type>
</dependency>

9
src/main/java/com/sk89q/worldguard/bukkit/BukkitUtil.java
View File

@ -29,7 +29,14 @@
import org.bukkit.Server;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.entity.*;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Tameable;
import org.bukkit.entity.ExperienceOrb;
import org.bukkit.entity.FallingBlock;
import org.bukkit.entity.Item;
import org.bukkit.entity.TNTPrimed;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import java.util.List;

12
src/main/java/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java
View File

@ -816,30 +816,32 @@ public void onBlockFade(BlockFadeEvent event) {
ConfigurationManager cfg = plugin.getGlobalStateManager();
WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
int type = event.getBlock().getTypeId();
if (type == BlockID.ICE) {
switch (event.getBlock().getTypeId()) {
case BlockID.ICE:
if (wcfg.disableIceMelting) {
event.setCancelled(true);
return;
}
if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(
DefaultFlag.ICE_MELT, event.getBlock().getLocation())) {
event.setCancelled(true);
return;
}
}
break;
if (type == BlockID.SNOW) {
case BlockID.SNOW:
if (wcfg.disableSnowMelting) {
event.setCancelled(true);
return;
}
if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(
DefaultFlag.SNOW_MELT, event.getBlock().getLocation())) {
event.setCancelled(true);
return;
}
break;
}
if (type == BlockID.SOIL) {

3
src/main/java/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java
View File

@ -382,7 +382,6 @@ private void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
}
}
}
}
}
}
@ -526,7 +525,7 @@ public void onEntityDamage(EntityDamageEvent event) {
return;
}
if (wcfg.teleportOnSuffocation && type == DamageCause.SUFFOCATION) {
if (wcfg.teleportOnSuffocation && type == DamageCause.SUFFOCATION) {
BukkitUtil.findFreePosition(player);
event.setCancelled(true);
return;

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

@ -18,11 +18,9 @@
import org.bukkit.event.vehicle.VehicleMoveEvent;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldguard.LocalPlayer;
import com.sk89q.worldguard.bukkit.FlagStateManager.PlayerFlagState;
import com.sk89q.worldguard.protection.ApplicableRegionSet;
import com.sk89q.worldguard.protection.flags.DefaultFlag;
import com.sk89q.worldguard.protection.managers.RegionManager;
import com.sk89q.worldguard.protection.regions.ProtectedRegion;
public class WorldGuardVehicleListener implements Listener {

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

@ -55,7 +55,7 @@ public ApplicableRegionSet(Collection<ProtectedRegion> applicable,
/**
* Checks if a player can build in an area.
*
* @param player The player to chec
* @param player The player to check
* @return build ability
*/
public boolean canBuild(LocalPlayer player) {

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

@ -120,10 +120,10 @@ private DefaultFlag() {
public static Flag<?>[] getFlags() {
return flagsList;
}
/**
* Try to match the flag with the given ID using a fuzzy name match.
*
*
* @param id the flag ID
* @return a flag, or null
*/
@ -133,7 +133,7 @@ public static Flag<?> fuzzyMatchFlag(String id) {
return flag;
}
}
return null;
}
}