Upstream
/
WorldGuard
mirror of https://github.com/EngineHub/WorldGuard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Implement new alternative association mode to limit piston movement

This commit is contained in:
JOO200 2020-07-30 20:24:18 +02:00
parent efe1e48bd4
commit 5162ce3dbd
4 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -160,6 +160,8 @@ public class BukkitWorldConfiguration extends YamlWorldConfiguration {
disableExpDrops = getBoolean("protection.disable-xp-orb-drops", false);
disableObsidianGenerators = getBoolean("protection.disable-obsidian-generators", false);
useBetterAssociationMode = getBoolean("protection.useBetterAssociationMode", false);
blockPotions = new HashSet<>();
for (String potionName : getStringList("gameplay.block-potions", null)) {
PotionEffectType effect = PotionEffectType.getByName(potionName);

5
worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/AbstractListener.java
View File

@ -137,10 +137,11 @@ class AbstractListener implements Listener {
} else {
loc = entity.getLocation();
}
return new DelayedRegionOverlapAssociation(query, BukkitAdapter.adapt(loc));
return new DelayedRegionOverlapAssociation(query, BukkitAdapter.adapt(loc.getWorld()), BukkitAdapter.adapt(loc));
} else if (rootCause instanceof Block) {
RegionQuery query = WorldGuard.getInstance().getPlatform().getRegionContainer().createQuery();
return new DelayedRegionOverlapAssociation(query, BukkitAdapter.adapt(((Block) rootCause).getLocation()));
Location loc = ((Block) rootCause).getLocation();
return new DelayedRegionOverlapAssociation(query, BukkitAdapter.adapt(loc.getWorld()), BukkitAdapter.adapt(loc));
} else {
return Associables.constant(Association.NON_MEMBER);
}

1
worldguard-core/src/main/java/com/sk89q/worldguard/config/WorldConfiguration.java
View File

@ -171,6 +171,7 @@ public abstract class WorldConfiguration {
public boolean strictEntitySpawn;
public boolean ignoreHopperMoveEvents;
public boolean breakDeniedHoppers;
public boolean useBetterAssociationMode;
protected Map<String, Integer> maxRegionCounts;
/**

27
worldguard-core/src/main/java/com/sk89q/worldguard/protection/DelayedRegionOverlapAssociation.java
View File

@ -20,11 +20,13 @@
package com.sk89q.worldguard.protection;
import com.sk89q.worldedit.util.Location;
import com.sk89q.worldguard.protection.regions.RegionQuery;
import com.sk89q.worldedit.world.World;
import com.sk89q.worldguard.WorldGuard;
import com.sk89q.worldguard.config.ConfigurationManager;
import com.sk89q.worldguard.domains.Association;
import com.sk89q.worldguard.protection.ApplicableRegionSet;
import com.sk89q.worldguard.protection.association.RegionAssociable;
import com.sk89q.worldguard.protection.regions.ProtectedRegion;
import com.sk89q.worldguard.protection.regions.RegionQuery;
import javax.annotation.Nullable;
import java.util.List;
@ -45,18 +47,21 @@ public class DelayedRegionOverlapAssociation implements RegionAssociable {
private final Location location;
@Nullable
private Set<ProtectedRegion> source;
private boolean betterAssociationMode;
/**
* Create a new instance.
*
* @param query the query
* @param query the query
* @param world the world
* @param location the location
*/
public DelayedRegionOverlapAssociation(RegionQuery query, Location location) {
public DelayedRegionOverlapAssociation(RegionQuery query, World world, Location location) {
checkNotNull(query);
checkNotNull(location);
this.query = query;
this.location = location;
ConfigurationManager cfg = WorldGuard.getInstance().getPlatform().getGlobalStateManager();
betterAssociationMode = cfg.get(world).useBetterAssociationMode;
}
@Override
@ -67,9 +72,19 @@ public class DelayedRegionOverlapAssociation implements RegionAssociable {
}
for (ProtectedRegion region : regions) {
if ((region.getId().equals(ProtectedRegion.GLOBAL_REGION) && source.isEmpty()) || source.contains(region)) {
if ((region.getId().equals(ProtectedRegion.GLOBAL_REGION) && source.isEmpty())) {
return Association.OWNER;
}
if (source.contains(region)) {
if (betterAssociationMode) {
int priority = region.getPriority();
int maxPriority = source.stream().mapToInt(ProtectedRegion::getPriority).max().orElse(0);
if (priority == maxPriority) return Association.OWNER;
} else {
return Association.OWNER;
}
}
}
return Association.NON_MEMBER;