Skip to content

Improve state applying pattern performance #3149

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

Merged
NotMyFault merged 1 commit into from
Mar 23, 2025
Merged

Improve state applying pattern performance #3149

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 32 additions & 9 deletions worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/StateApplyingPattern.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

package com.sk89q.worldedit.function.pattern;

import com.google.common.collect.Maps;
import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.registry.state.Property;
Expand All @@ -36,8 +35,8 @@
public class StateApplyingPattern extends AbstractExtentPattern {

private final Map<String, String> states;
//FAWE - avoid race conditions
private final Map<BlockType, Map<Property<Object>, Object>> cache = new ConcurrentHashMap<>();
//FAWE - avoid race conditions, faster property applications
private final Map<BlockType, PropertyApplication[]> cache = new ConcurrentHashMap<>();
//FAWE end

public StateApplyingPattern(Extent extent, Map<String, String> statesToSet) {
Expand All @@ -47,16 +46,40 @@ public StateApplyingPattern(Extent extent, Map<String, String> statesToSet) {

@Override
public BaseBlock applyBlock(BlockVector3 position) {
BlockState block = getExtent().getBlock(position);
for (Entry<Property<Object>, Object> entry : cache
.computeIfAbsent(block.getBlockType(), (b -> resolveProperties(states, b))).entrySet()) {
//FAWE start
if (block.getBlockType().hasProperty(entry.getKey().getKey())) {
block = block.with(entry.getKey(), entry.getValue());
//FAWE start
BlockState block = position.getBlock(getExtent());
final BlockType blockType = block.getBlockType();
// weak consistency is enough, no need to use computeIfAbsent
PropertyApplication[] applications = cache.get(blockType);
if (applications == null) {
applications = resolvePropertiesFor(blockType);
cache.put(blockType, applications);
}
for (PropertyApplication entry : applications) {
if (blockType.hasProperty(entry.property().getKey())) {
block = block.with(entry.property(), entry.value());
}
//FAWE end
}
return block.toBaseBlock();
}

//FAWE start - faster property application
private record PropertyApplication(Property<Object> property, Object value) {

}

private PropertyApplication[] resolvePropertiesFor(BlockType blockType) {
Map<Property<Object>, Object> map = resolveProperties(states, blockType);
final PropertyApplication[] applications = new PropertyApplication[map.size()];
int i = 0;
for (Entry<Property<Object>, Object> entry : map.entrySet()) {
Property<Object> property = entry.getKey();
Object o = entry.getValue();
applications[i++] = new PropertyApplication(property, o);
}
return applications;
}
//FAWE end

}
Loading