Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix, simplify and optimize AbstractRegionOverlapAssociation #1956

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix, simplify and optimize AbstractRegionOverlapAssociation #1956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36d4483
Fix, simplify and optimize AbstractRegionOverlapAssociation
stonar96 Oct 13, 2022
1901692
Handle non-existent region group flags smarter
stonar96 Oct 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 40 additions & 39 deletions ...in/java/com/sk89q/worldguard/protection/association/AbstractRegionOverlapAssociation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,22 @@
import com.sk89q.worldguard.domains.Association;
import com.sk89q.worldguard.protection.FlagValueCalculator;
import com.sk89q.worldguard.protection.flags.Flags;
import com.sk89q.worldguard.protection.flags.StateFlag.State;
import com.sk89q.worldguard.protection.regions.ProtectedRegion;

import javax.annotation.Nullable;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;

public abstract class AbstractRegionOverlapAssociation implements RegionAssociable {

@Nullable
protected Set<ProtectedRegion> source;
private boolean useMaxPriorityAssociation;
private boolean effectivelyEmpty;
private final boolean useMaxPriorityAssociation;
private int maxPriority;
private Set<ProtectedRegion> maxPriorityRegions;

protected AbstractRegionOverlapAssociation(@Nullable Set<ProtectedRegion> source, boolean useMaxPriorityAssociation) {
this.source = source;
Expand All @@ -48,36 +48,53 @@ protected AbstractRegionOverlapAssociation(@Nullable Set<ProtectedRegion> source

protected void calcMaxPriority() {
checkNotNull(source);
int best = 0;
Set<ProtectedRegion> bestRegions = new HashSet<>();
boolean effectivelyEmpty = true;
int maxPriority = Integer.MIN_VALUE;

for (ProtectedRegion region : source) {
int priority = region.getPriority();
if (priority > best) {
best = priority;
bestRegions.clear();
bestRegions.add(region);
} else if (priority == best) {
bestRegions.add(region);

// Potential endless recurrence? No, because there is no region group flag.
if ((effectivelyEmpty || priority > maxPriority) && FlagValueCalculator.getEffectiveFlagOf(region, Flags.PASSTHROUGH, this) != State.ALLOW) {
effectivelyEmpty = false;

if (useMaxPriorityAssociation) {
maxPriority = priority;
} else {
break;
}
}
}
this.maxPriority = best;
this.maxPriorityRegions = bestRegions;

this.effectivelyEmpty = effectivelyEmpty;
this.maxPriority = maxPriority;
}

private boolean checkNonplayerProtectionDomains(Iterable<? extends ProtectedRegion> source, Collection<?> domains) {
if (source == null || domains == null || domains.isEmpty()) {
private boolean checkNonplayerProtectionDomains(ProtectedRegion region) {
if (source.isEmpty()) {
return false;
}

for (ProtectedRegion region : source) {
// Potential endless recurrence? No, because there is no region group flag.
Set<String> domains = FlagValueCalculator.getEffectiveFlagOf(region, Flags.NONPLAYER_PROTECTION_DOMAINS, this);

if (domains == null || domains.isEmpty()) {
return false;
}

for (ProtectedRegion sourceRegion : source) {
if (sourceRegion.getPriority() < maxPriority) {
continue;
}

// Potential endless recurrence? No, because there is no region group flag.
Set<String> regionDomains = FlagValueCalculator.getEffectiveFlagOf(region, Flags.NONPLAYER_PROTECTION_DOMAINS, this);
Set<String> sourceDomains = FlagValueCalculator.getEffectiveFlagOf(sourceRegion, Flags.NONPLAYER_PROTECTION_DOMAINS, this);

if (regionDomains == null || regionDomains.isEmpty()) {
if (sourceDomains == null || sourceDomains.isEmpty()) {
continue;
}

if (!Collections.disjoint(regionDomains, domains)) {
if (!Collections.disjoint(sourceDomains, domains)) {
return true;
}
}
Expand All @@ -90,31 +107,15 @@ public Association getAssociation(List<ProtectedRegion> regions) {
checkNotNull(source);
for (ProtectedRegion region : regions) {
while (region != null) {
if ((region.getId().equals(ProtectedRegion.GLOBAL_REGION) && source.isEmpty())) {
if (region.getId().equals(ProtectedRegion.GLOBAL_REGION) && effectivelyEmpty) {
return Association.OWNER;
}

if (source.contains(region)) {
if (useMaxPriorityAssociation) {
int priority = region.getPriority();
if (priority == maxPriority) {
return Association.OWNER;
}
} else {
return Association.OWNER;
}
}

Set<ProtectedRegion> source;

if (useMaxPriorityAssociation) {
source = maxPriorityRegions;
} else {
source = this.source;
if (source.contains(region) && region.getPriority() >= maxPriority) {
return Association.OWNER;
}

// Potential endless recurrence? No, because there is no region group flag.
if (checkNonplayerProtectionDomains(source, FlagValueCalculator.getEffectiveFlagOf(region, Flags.NONPLAYER_PROTECTION_DOMAINS, this))) {
if (checkNonplayerProtectionDomains(region)) {
return Association.OWNER;
}

Expand Down
2 changes: 1 addition & 1 deletion worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/Flags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public final class Flags {
public static final List<String> INBUILT_FLAGS = Collections.unmodifiableList(INBUILT_FLAGS_LIST);

// Overrides membership check
public static final StateFlag PASSTHROUGH = register(new StateFlag("passthrough", false));
public static final StateFlag PASSTHROUGH = register(new StateFlag("passthrough", false, null));
public static final SetFlag<String> NONPLAYER_PROTECTION_DOMAINS = register(new SetFlag<>("nonplayer-protection-domains", null, new StringFlag(null)));

// This flag is unlike the others. It forces the checking of region membership
Expand Down
22 changes: 21 additions & 1 deletion ...core/src/main/java/com/sk89q/worldguard/protection/flags/registry/SimpleFlagRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@
import com.google.common.collect.Maps;
import com.sk89q.worldguard.protection.flags.Flag;
import com.sk89q.worldguard.protection.flags.Flags;
import com.sk89q.worldguard.protection.flags.RegionGroup;
import com.sk89q.worldguard.protection.flags.RegionGroupFlag;
import com.sk89q.worldguard.protection.flags.StateFlag;
import com.sk89q.worldguard.protection.flags.StateFlag.State;

import javax.annotation.Nullable;
import java.util.Collection;
Expand Down Expand Up @@ -162,7 +166,23 @@ public Map<Flag<?>, Object> unmarshal(Map<String, Object> rawValues, boolean cre
values.put(unk, entry.getValue());
}
} else {
values.put(parent.getRegionGroupFlag(), parent.getRegionGroupFlag().unmarshal(entry.getValue()));
RegionGroupFlag regionGroupFlag = parent.getRegionGroupFlag();

if (regionGroupFlag != null) {
values.put(regionGroupFlag, regionGroupFlag.unmarshal(entry.getValue()));
} else {
log.warning("Found non-existent region group flag '" + entry.getKey() + "' with value '" + entry.getValue() + "' for flag '" + parent.getName() + "'");
log.warning("The region group flag '" + entry.getKey() + "' with value '" + entry.getValue() + "' will be removed");
regionGroupFlag = new RegionGroupFlag("dummy", RegionGroup.ALL);
RegionGroup regionGroup = regionGroupFlag.unmarshal(entry.getValue());

if (regionGroup != null && regionGroup != RegionGroup.ALL) {
if (!(parent instanceof StateFlag) || values.get(parent) == State.ALLOW) {
log.warning("For safety reasons the flag '" + parent.getName() + "' with value '" + values.get(parent) + "' will also be removed");
values.remove(parent);
}
}
}
}
}

Expand Down