Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 17:57:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add check when obtaining BlockState from id to prevent edits losing large amounts of data

Browse Source
This commit is contained in:
dordsor21 2021-07-20 20:49:47 +01:00
parent 5f8addbb5b
commit 1ec927f30c
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java
View File

@ -26,6 +26,7 @@ import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.extent.NullExtent; import com.sk89q.worldedit.extent.NullExtent;
import com.sk89q.worldedit.function.mask.SingleBlockTypeMask; import com.sk89q.worldedit.function.mask.SingleBlockTypeMask;
import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.internal.util.LogManagerCompat;
import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.registry.Keyed; import com.sk89q.worldedit.registry.Keyed;
import com.sk89q.worldedit.registry.NamespacedRegistry; import com.sk89q.worldedit.registry.NamespacedRegistry;
@ -38,6 +39,7 @@ import com.sk89q.worldedit.world.item.ItemType;
import com.sk89q.worldedit.world.item.ItemTypes; import com.sk89q.worldedit.world.item.ItemTypes;
import com.sk89q.worldedit.world.registry.BlockMaterial; import com.sk89q.worldedit.world.registry.BlockMaterial;
import com.sk89q.worldedit.world.registry.LegacyMapper; import com.sk89q.worldedit.world.registry.LegacyMapper;
import org.apache.logging.log4j.Logger;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@ -53,6 +55,7 @@ import static com.google.common.base.Preconditions.checkArgument;
public class BlockType implements Keyed, Pattern { public class BlockType implements Keyed, Pattern {
public static final NamespacedRegistry<BlockType> REGISTRY = new NamespacedRegistry<>("block type"); public static final NamespacedRegistry<BlockType> REGISTRY = new NamespacedRegistry<>("block type");
private static final Logger LOGGER = LogManagerCompat.getLogger();
private final String id; private final String id;
private final BlockTypesCache.Settings settings; private final BlockTypesCache.Settings settings;
@ -138,8 +141,16 @@ public class BlockType implements Keyed, Pattern {
public BlockState withPropertyId(int propertyId) { public BlockState withPropertyId(int propertyId) {
if (settings.stateOrdinals == null) { if (settings.stateOrdinals == null) {
return settings.defaultState; return settings.defaultState;
} else if (propertyId >= settings.stateOrdinals.length || propertyId < 0) {
LOGGER.error("Attempted to load blockstate with id {} of type {} outside of state ordinals length. Using default state.", propertyId, getId());
return settings.defaultState;
} }
return BlockTypesCache.states[settings.stateOrdinals[propertyId]]; int ordinal = settings.stateOrdinals[propertyId];
if (ordinal >= BlockTypesCache.states.length || ordinal < 0) {
LOGGER.error("Attempted to load blockstate with ordinal {} of type {} outside of states length. Using default state. Using default state.", ordinal, getId());
return settings.defaultState;
}
return BlockTypesCache.states[ordinal];
} }
@Deprecated @Deprecated