fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add safety checks to prevent itemblocks with invalid metadata turning into invalid blockstates, fixes #382

Browse Source 
(Because *some* mod authors are not very careful...)
This commit is contained in:
Electroblob77
2020-03-31 21:42:16 +01:00
parent 1ab674136b
commit 586840aa53
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/block/BlockPedestal.java
+3 -1
View File
@@ -107,7 +107,9 @@ public class BlockPedestal extends Block implements ITileEntityProvider {
natural = true; natural = true;
metadata -= ELEMENT.getAllowedValues().size(); metadata -= ELEMENT.getAllowedValues().size();
} }
return this.getDefaultState().withProperty(ELEMENT, Element.values()[metadata]).withProperty(NATURAL, natural); Element element = Element.values()[metadata];
if(!ELEMENT.getAllowedValues().contains(element)) return this.getDefaultState().withProperty(NATURAL, natural);
return this.getDefaultState().withProperty(ELEMENT, element).withProperty(NATURAL, natural);
} }
@Override @Override
src/main/java/electroblob/wizardry/block/BlockRunestone.java
+3 -1
View File
@@ -69,7 +69,9 @@ public class BlockRunestone extends Block {
@Override @Override
public IBlockState getStateFromMeta(int metadata){ public IBlockState getStateFromMeta(int metadata){
return this.getDefaultState().withProperty(ELEMENT, Element.values()[metadata]); Element element = Element.values()[metadata];
if(!ELEMENT.getAllowedValues().contains(element)) return this.getDefaultState();
return this.getDefaultState().withProperty(ELEMENT, element);
} }
@Override @Override