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

Merge branch '1.12.2' of https://github.com/Electroblob77/Wizardry into 1.12.2

Browse Source 
# Conflicts:
#	src/main/resources/assets/ebwizardry/lang/ru_ru.lang
This commit is contained in:
Electroblob77
2020-12-19 23:41:22 +00:00
parent 4c3dfb3bc9 b1478de6fe
commit c483591ea8
4 changed files with 232 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/client/renderer/entity/layers/LayerTiledOverlay.java
+1 -1
View File
@@ -143,7 +143,7 @@ public abstract class LayerTiledOverlay<T extends EntityLivingBase> implements L
double scaleX = 1, scaleY = 1;
// It's more logical to use the model's texture size, but some classes don't bother setting it properly
// (e.g. ModelVillager), so to get the correct dimensions I'm getting them from the first box instead.
if(model.boxList != null && model.boxList.get(0) != null){
if(model.boxList != null && model.boxList.size() >= 1 && model.boxList.get(0) != null){
scaleX = (double)model.boxList.get(0).textureWidth / textureWidth;
scaleY = (double)model.boxList.get(0).textureHeight / textureHeight;
}else{ // Fallback to model fields; should never be needed