wisplite/distant-horizons-core-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a null pointer in FullDataArrayAccessor

Browse Source
This commit is contained in:
James Seibel
2023-09-24 20:47:53 -05:00
parent a4b7e3e021
commit 4333cf65a2
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/accessor/FullDataArrayAccessor.java
+10 -6
View File
@@ -114,14 +114,18 @@ public class FullDataArrayAccessor implements IFullDataAccessor
{
for (int z = 0; z < this.width; z++)
{
long[] sourceData = this.dataArrays[this.offset + x * this.dataWidth + z];
long[] newData = new long[sourceData.length];
for (int dataPointIndex = 0; dataPointIndex < newData.length; dataPointIndex++)
long[] currentData = this.dataArrays[this.offset + x * this.dataWidth + z];
// may be null if no data exists for this column yet
if (currentData != null)
{
newData[dataPointIndex] = FullDataPointUtil.remap(remappedIds, sourceData[dataPointIndex]);
long[] newData = new long[currentData.length]; // TODO what to do if null?
for (int dataPointIndex = 0; dataPointIndex < newData.length; dataPointIndex++)
{
newData[dataPointIndex] = FullDataPointUtil.remap(remappedIds, currentData[dataPointIndex]);
}
target.dataArrays[target.offset + x * target.dataWidth + z] = newData;
}
target.dataArrays[target.offset + x * target.dataWidth + z] = newData;
}
}
}