Sulkta-OSS/dynmap-neoforge
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions 1

Avoid exception on bad modellist from DynmapBlockScan

Browse source
This commit is contained in:
Mike Primm 2022-02-16 22:56:36 -06:00
parent d9d3024865
commit f47a8373ff
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
DynmapCore/src/main/java/org/dynmap/hdmap/HDBlockModels.java
View file

@ -1026,10 +1026,12 @@ public class HDBlockModels {
patch = pdf.getPatch(patch, -bl.xrot, -bl.yrot, -bl.zrot, patch = pdf.getPatch(patch, -bl.xrot, -bl.yrot, -bl.zrot,
new Vector3D(bl.xrotorig / 16, bl.yrotorig / 16, bl.zrotorig / 16), new Vector3D(bl.xrotorig / 16, bl.yrotorig / 16, bl.zrotorig / 16),
patch.textureindex); patch.textureindex);
if (patch == null) continue;
} }
// If model rotation, apply too // If model rotation, apply too
if ((bl.modrotx != 0) || (bl.modroty != 0) || (bl.modrotz != 0)) { if ((bl.modrotx != 0) || (bl.modroty != 0) || (bl.modrotz != 0)) {
patch = pdf.getPatch(patch, bl.modrotx, bl.modroty, bl.modrotz, patch.textureindex); patch = pdf.getPatch(patch, bl.modrotx, bl.modroty, bl.modrotz, patch.textureindex);
if (patch == null) continue;
} }
pd.add(patch); pd.add(patch);
} }