Merge branch 'dev' into shader-pipeline

This commit is contained in:
JozsefA 2021-06-27 18:50:38 -07:00
commit cd5b9b06b5
2 changed files with 6 additions and 1 deletions

View file

@ -33,6 +33,7 @@ public class AtlasStitcher {
.equals(PlayerContainer.BLOCK_ATLAS_TEXTURE)) .equals(PlayerContainer.BLOCK_ATLAS_TEXTURE))
return; return;
sprites.forEach(StitchedSprite::reset);
sprites.stream() sprites.stream()
.map(StitchedSprite::getLoc) .map(StitchedSprite::getLoc)
.forEach(event::addSprite); .forEach(event::addSprite);

View file

@ -11,7 +11,7 @@ public class StitchedSprite {
TextureAtlasSprite sprite; TextureAtlasSprite sprite;
public StitchedSprite(ResourceLocation loc) { StitchedSprite(ResourceLocation loc) {
this.loc = loc; this.loc = loc;
} }
@ -28,4 +28,8 @@ public class StitchedSprite {
return sprite; return sprite;
} }
void reset() {
sprite = null;
}
} }