Grab default meta when meta exceeds allowed values for meta blocks (#621

) - Prevents world corrupting crash
GregTechCEu · Feb 21, 2022 · e7f9f08 · e7f9f08
1 parent 8177076
commit e7f9f08
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/src/main/java/gregtech/common/blocks/BlockCompressed.java b/src/main/java/gregtech/common/blocks/BlockCompressed.java
@@ -78,14 +78,15 @@ public int getHarvestLevel(IBlockState state) {
     @Override
     @SuppressWarnings("deprecation")
     public IBlockState getStateFromMeta(int meta) {
-        Material material = variantProperty.getAllowedValues().get(meta);
-        return getDefaultState().withProperty(variantProperty, material);
+        if (meta >= variantProperty.getAllowedValues().size()) {
+            meta = 0;
+        }
+        return getDefaultState().withProperty(variantProperty, variantProperty.getAllowedValues().get(meta));
     }
 
     @Override
     public int getMetaFromState(IBlockState state) {
-        Material material = state.getValue(variantProperty);
-        return variantProperty.getAllowedValues().indexOf(material);
+        return variantProperty.getAllowedValues().indexOf(state.getValue(variantProperty));
     }
 
     @Override

diff --git a/src/main/java/gregtech/common/blocks/BlockFrame.java b/src/main/java/gregtech/common/blocks/BlockFrame.java
@@ -63,14 +63,15 @@ public int damageDropped(@Nonnull IBlockState state) {
     @Override
     @SuppressWarnings("deprecation")
     public IBlockState getStateFromMeta(int meta) {
-        Material material = variantProperty.getAllowedValues().get(meta);
-        return getDefaultState().withProperty(variantProperty, material);
+        if (meta >= variantProperty.getAllowedValues().size()) {
+            meta = 0;
+        }
+        return getDefaultState().withProperty(variantProperty, variantProperty.getAllowedValues().get(meta));
     }
 
     @Override
     public int getMetaFromState(IBlockState state) {
-        Material material = state.getValue(variantProperty);
-        return variantProperty.getAllowedValues().indexOf(material);
+        return variantProperty.getAllowedValues().indexOf(state.getValue(variantProperty));
     }
 
     @Override

diff --git a/src/main/java/gregtech/common/blocks/BlockOre.java b/src/main/java/gregtech/common/blocks/BlockOre.java
@@ -114,6 +114,9 @@ public int getHarvestLevel(IBlockState state) {
     @Override
     @SuppressWarnings("deprecation")
     public IBlockState getStateFromMeta(int meta) {
+        if (meta >= STONE_TYPE.getAllowedValues().size()) {
+            meta = 0;
+        }
         return getDefaultState().withProperty(STONE_TYPE, STONE_TYPE.getAllowedValues().get(meta));
     }