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

Renamed option to use-max-priority-association, Code cleanup

This commit is contained in:
JOO200 2020-08-01 13:54:27 +02:00
parent 85c5f53d29
commit 449145ba1f
4 changed files with 27 additions and 16 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,7 +160,7 @@ 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);
useMaxPriorityAssociation = getBoolean("protection.use-max-priority-association", false);
blockPotions = new HashSet<>();
for (String potionName : getStringList("gameplay.block-potions", null)) {

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

@ -127,9 +127,10 @@ class AbstractListener implements Listener {
} else if (rootCause instanceof Entity) {
RegionQuery query = WorldGuard.getInstance().getPlatform().getRegionContainer().createQuery();
final Entity entity = (Entity) rootCause;
BukkitWorldConfiguration config =
(BukkitWorldConfiguration) getWorldConfig(BukkitAdapter.adapt(entity.getWorld()));
Location loc;
if (PaperLib.isPaper()
&& ((BukkitWorldConfiguration) getWorldConfig(BukkitAdapter.adapt(entity.getWorld()))).usePaperEntityOrigin) {
if (PaperLib.isPaper() && config.usePaperEntityOrigin) {
loc = entity.getOrigin();
if (loc == null) {
loc = entity.getLocation();
@ -137,11 +138,13 @@ class AbstractListener implements Listener {
} else {
loc = entity.getLocation();
}
return new DelayedRegionOverlapAssociation(query, BukkitAdapter.adapt(loc.getWorld()), BukkitAdapter.adapt(loc));
return new DelayedRegionOverlapAssociation(query, BukkitAdapter.adapt(loc),
config.useMaxPriorityAssociation);
} else if (rootCause instanceof Block) {
RegionQuery query = WorldGuard.getInstance().getPlatform().getRegionContainer().createQuery();
Location loc = ((Block) rootCause).getLocation();
return new DelayedRegionOverlapAssociation(query, BukkitAdapter.adapt(loc.getWorld()), BukkitAdapter.adapt(loc));
return new DelayedRegionOverlapAssociation(query, BukkitAdapter.adapt(loc),
getWorldConfig(BukkitAdapter.adapt(loc.getWorld())).useMaxPriorityAssociation);
} else {
return Associables.constant(Association.NON_MEMBER);
}

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

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

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

@ -20,9 +20,6 @@
package com.sk89q.worldguard.protection;
import com.sk89q.worldedit.util.Location;
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.association.RegionAssociable;
import com.sk89q.worldguard.protection.regions.ProtectedRegion;
@ -47,21 +44,30 @@ public class DelayedRegionOverlapAssociation implements RegionAssociable {
private final Location location;
@Nullable
private Set<ProtectedRegion> source;
private boolean betterAssociationMode;
private boolean useMaxPriorityAssociation;
private int maxPriority; // only used for useMaxPriorityAssociation
/**
* Create a new instance.
* @param query the query
* @param world the world
* @param location the location
*/
public DelayedRegionOverlapAssociation(RegionQuery query, World world, Location location) {
public DelayedRegionOverlapAssociation(RegionQuery query, Location location) {
this(query, location, false);
}
/**
* Create a new instance.
* @param query the query
* @param location the location
* @param useMaxPriorityAssociation whether to use the max priority from regions to determine association
*/
public DelayedRegionOverlapAssociation(RegionQuery query, Location location, boolean useMaxPriorityAssociation) {
checkNotNull(query);
checkNotNull(location);
this.query = query;
this.location = location;
ConfigurationManager cfg = WorldGuard.getInstance().getPlatform().getGlobalStateManager();
betterAssociationMode = cfg.get(world).useBetterAssociationMode;
this.useMaxPriorityAssociation = useMaxPriorityAssociation;
}
@Override
@ -69,8 +75,10 @@ public class DelayedRegionOverlapAssociation implements RegionAssociable {
if (source == null) {
ApplicableRegionSet result = query.getApplicableRegions(location);
source = result.getRegions();
if (useMaxPriorityAssociation)
maxPriority = source.stream().mapToInt(ProtectedRegion::getPriority).max().orElse(0);
}
int maxPriority = source.stream().mapToInt(ProtectedRegion::getPriority).max().orElse(0);
for (ProtectedRegion region : regions) {
if ((region.getId().equals(ProtectedRegion.GLOBAL_REGION) && source.isEmpty())) {
@ -78,7 +86,7 @@ public class DelayedRegionOverlapAssociation implements RegionAssociable {
}
if (source.contains(region)) {
if (betterAssociationMode) {
if (useMaxPriorityAssociation) {
int priority = region.getPriority();
if (priority == maxPriority) return Association.OWNER;
} else {