Merge branch 'dev' into shader-pipeline

This commit is contained in:
Jozufozu 2021-08-08 17:07:33 -07:00
commit a417b2944c
2 changed files with 6 additions and 0 deletions

View file

@ -1,4 +1,6 @@
0.2.3:
Fixes
- Fix crash moving a deleted LightVolume
Technical/API:
- Alter BeginFrameEvent to enable compatibility with optifine shadows

View file

@ -121,6 +121,8 @@ public class LightVolume {
}
public void move(IBlockDisplayReader world, GridAlignedBB newSampleVolume) {
if (removed) return;
if (textureVolume.contains(newSampleVolume)) {
if (newSampleVolume.intersects(sampleVolume)) {
GridAlignedBB newArea = newSampleVolume.intersect(sampleVolume);
@ -166,6 +168,8 @@ public class LightVolume {
* This is expensive and should be avoided.
*/
public void initialize(IBlockDisplayReader world) {
if (removed) return;
BlockPos.Mutable pos = new BlockPos.Mutable();
int shiftX = textureVolume.minX;