Mirror von
https://github.com/IntellectualSites/FastAsyncWorldEdit.git
synchronisiert 2024-09-07 08:32:51 +02:00
fix: correct issues with processor scopes (#2230)
Dieser Commit ist enthalten in:
Ursprung
52723439dd
Commit
2a08ad28a4
@ -141,7 +141,7 @@ public class DisallowedBlocksExtent extends AbstractDelegateExtent implements IB
|
|||||||
BlockState state = BlockTypesCache.states[block];
|
BlockState state = BlockTypesCache.states[block];
|
||||||
if (blockedBlocks != null) {
|
if (blockedBlocks != null) {
|
||||||
if (blockedBlocks.contains(state.getBlockType().getId())) {
|
if (blockedBlocks.contains(state.getBlockType().getId())) {
|
||||||
blocks[i] = 0;
|
blocks[i] = BlockTypesCache.ReservedIDs.__RESERVED__;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -150,7 +150,7 @@ public class DisallowedBlocksExtent extends AbstractDelegateExtent implements IB
|
|||||||
}
|
}
|
||||||
for (FuzzyBlockState fuzzy : blockedStates) {
|
for (FuzzyBlockState fuzzy : blockedStates) {
|
||||||
if (fuzzy.equalsFuzzy(state)) {
|
if (fuzzy.equalsFuzzy(state)) {
|
||||||
blocks[i] = 0;
|
blocks[i] = BlockTypesCache.ReservedIDs.__RESERVED__;
|
||||||
continue it;
|
continue it;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -178,7 +178,7 @@ public class DisallowedBlocksExtent extends AbstractDelegateExtent implements IB
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ProcessorScope getScope() {
|
public ProcessorScope getScope() {
|
||||||
return ProcessorScope.CHANGING_BLOCKS;
|
return ProcessorScope.REMOVING_BLOCKS;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -168,7 +168,7 @@ public abstract class FaweRegionExtent extends ResettableExtent implements IBatc
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ProcessorScope getScope() {
|
public ProcessorScope getScope() {
|
||||||
return ProcessorScope.READING_SET_BLOCKS;
|
return ProcessorScope.REMOVING_BLOCKS;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -257,7 +257,7 @@ public class MultiBatchProcessor implements IBatchProcessor {
|
|||||||
for (IBatchProcessor processor : processors) {
|
for (IBatchProcessor processor : processors) {
|
||||||
scope = Math.max(scope, processor.getScope().intValue());
|
scope = Math.max(scope, processor.getScope().intValue());
|
||||||
}
|
}
|
||||||
return ProcessorScope.valueOf(0);
|
return ProcessorScope.valueOf(scope);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -3,9 +3,9 @@ package com.fastasyncworldedit.core.extent.processor;
|
|||||||
/**
|
/**
|
||||||
* The scope of a processor.
|
* The scope of a processor.
|
||||||
* Order in which processors are executed:
|
* Order in which processors are executed:
|
||||||
* - ADDING_BLOCKS (processors that strictly ADD blocks to an edit ONLY)
|
* - ADDING_BLOCKS (processors that may ADD blocks to an edit ONLY)
|
||||||
* - CHANGING_BLOCKS (processors that strictly ADD or CHANGE blocks being set)
|
* - CHANGING_BLOCKS (processors that may ADD or CHANGE blocks being set)
|
||||||
* - REMOVING_BLOCKS (processors that string ADD, CHANGE or REMOVE blocks being set)
|
* - REMOVING_BLOCKS (processors that may ADD, CHANGE or REMOVE blocks being set)
|
||||||
* - CUSTOM (processors that do not specify a SCOPE)
|
* - CUSTOM (processors that do not specify a SCOPE)
|
||||||
* - READING_SET_BLOCKS (processors that do not alter blocks at all, and read the blocks that are actually going to set, e.g. history processors)
|
* - READING_SET_BLOCKS (processors that do not alter blocks at all, and read the blocks that are actually going to set, e.g. history processors)
|
||||||
*/
|
*/
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren