Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-10-01 16:17:28 +02:00
Code Issues Projects Releases Wiki Activity

Added regions.invincibility-removes-mobs so you can turn on invincibility without creating the possibility about farming.

Browse Source
This commit is contained in:
sk89q 2011-06-27 13:41:27 -07:00
parent 671b4fe2db
commit cfffba25cf
2 changed files with 14 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

@ -143,6 +143,7 @@ public class WorldConfiguration {
public boolean disableSnowFormation;
public boolean disableIceFormation;
public boolean disableLeafDecay;
public boolean regionInvinciblityRemovesMobs;
/* Configuration data end */
@ -318,6 +319,7 @@ private void loadConfiguration() {
disableLeafDecay = getBoolean("dynamics.disable-leaf-decay", false);
useRegions = getBoolean("regions.enable", true);
regionInvinciblityRemovesMobs = getBoolean("regions.invincibility-removes-mobs", false);
highFreqFlags = getBoolean("regions.high-frequency-flags", false);
regionWand = getInt("regions.wand", 287);
maxClaimVolume = getInt("regions.max-claim-volume", 30000);

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

@ -210,8 +210,18 @@ private void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
ConfigurationManager cfg = plugin.getGlobalStateManager();
WorldConfiguration wcfg = cfg.get(player.getWorld());
if (cfg.hasGodMode(player)
|| (wcfg.useRegions && RegionQueryUtil.isInvincible(plugin, player))) {
if (cfg.hasGodMode(player)) {
event.setCancelled(true);
return;
}
if (wcfg.useRegions && RegionQueryUtil.isInvincible(plugin, player)) {
if (wcfg.regionInvinciblityRemovesMobs
&& attacker instanceof LivingEntity && !(attacker instanceof Player)
&& !(attacker instanceof Tameable && ((Tameable) attacker).isTamed())) {
attacker.remove();
}
event.setCancelled(true);
return;
}