aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client
diff options
context:
space:
mode:
Diffstat (limited to 'Minecraft.Client')
-rw-r--r--Minecraft.Client/HorseRenderer.cpp11
-rw-r--r--Minecraft.Client/LevelRenderer.cpp3
2 files changed, 11 insertions, 3 deletions
diff --git a/Minecraft.Client/HorseRenderer.cpp b/Minecraft.Client/HorseRenderer.cpp
index e01542d5..5bbf7661 100644
--- a/Minecraft.Client/HorseRenderer.cpp
+++ b/Minecraft.Client/HorseRenderer.cpp
@@ -55,8 +55,15 @@ void HorseRenderer::renderModel(shared_ptr<LivingEntity> mob, float wp, float ws
void HorseRenderer::bindTexture(ResourceLocation *location)
{
- // Set up (potentially) multiple texture layers for the horse
- entityRenderDispatcher->textures->bindTextureLayers(location);
+ if (location->getTextureCount() > 1)
+ {
+ // Set up multiple texture layers for the horse
+ entityRenderDispatcher->textures->bindTextureLayers(location);
+ }
+ else
+ {
+ EntityRenderer::bindTexture(location);
+ }
}
ResourceLocation *HorseRenderer::getTextureLocation(shared_ptr<Entity> entity)
diff --git a/Minecraft.Client/LevelRenderer.cpp b/Minecraft.Client/LevelRenderer.cpp
index c1b4850c..594ff4ea 100644
--- a/Minecraft.Client/LevelRenderer.cpp
+++ b/Minecraft.Client/LevelRenderer.cpp
@@ -545,7 +545,8 @@ void LevelRenderer::renderEntities(Vec3 *cam, Culler *culler, float a)
for (auto& entity : entities)
{
- bool shouldRender = (entity->shouldRender(cam) && (entity->noCulling || culler->isVisible(entity->bb)));
+ bool isPlayerVehicle = (entity == mc->cameraTargetPlayer->riding);
+ bool shouldRender = (entity->shouldRender(cam) && (entity->noCulling || isPlayerVehicle || culler->isVisible(entity->bb)));
// Render the mob if the mob's leash holder is within the culler
if ( !shouldRender && entity->instanceof(eTYPE_MOB) )