Fix hand of invisible spectated player being visible (fixes #59)
This commit is contained in:
@@ -11,7 +11,10 @@ import com.replaymod.replay.events.ReplayCloseEvent;
|
|||||||
import com.replaymod.replay.events.ReplayOpenEvent;
|
import com.replaymod.replay.events.ReplayOpenEvent;
|
||||||
import net.minecraft.client.renderer.entity.RenderManager;
|
import net.minecraft.client.renderer.entity.RenderManager;
|
||||||
import net.minecraft.client.renderer.entity.RenderPlayer;
|
import net.minecraft.client.renderer.entity.RenderPlayer;
|
||||||
|
import net.minecraft.entity.Entity;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
|
import net.minecraftforge.client.event.RenderHandEvent;
|
||||||
|
import net.minecraftforge.common.MinecraftForge;
|
||||||
import net.minecraftforge.fml.common.FMLCommonHandler;
|
import net.minecraftforge.fml.common.FMLCommonHandler;
|
||||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||||
import org.lwjgl.input.Keyboard;
|
import org.lwjgl.input.Keyboard;
|
||||||
@@ -56,6 +59,7 @@ public class PlayerOverview implements Extra {
|
|||||||
});
|
});
|
||||||
|
|
||||||
FMLCommonHandler.instance().bus().register(this);
|
FMLCommonHandler.instance().bus().register(this);
|
||||||
|
MinecraftForge.EVENT_BUS.register(this);
|
||||||
|
|
||||||
RenderManager renderManager = mod.getMinecraft().getRenderManager();
|
RenderManager renderManager = mod.getMinecraft().getRenderManager();
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
@@ -92,6 +96,14 @@ public class PlayerOverview implements Extra {
|
|||||||
hiddenPlayers.clear();
|
hiddenPlayers.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SubscribeEvent
|
||||||
|
public void oRenderHand(RenderHandEvent event) {
|
||||||
|
Entity view = module.getCore().getMinecraft().getRenderViewEntity();
|
||||||
|
if (view != null && isHidden(view.getUniqueID())) {
|
||||||
|
event.setCanceled(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public boolean isSavingEnabled() {
|
public boolean isSavingEnabled() {
|
||||||
return savingEnabled;
|
return savingEnabled;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -252,6 +252,15 @@ public class CameraEntity extends EntityPlayerSP {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isInvisible() {
|
||||||
|
Entity view = mc.getRenderViewEntity();
|
||||||
|
if (view != this) {
|
||||||
|
return view.isInvisible();
|
||||||
|
}
|
||||||
|
return super.isInvisible();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ResourceLocation getLocationSkin() {
|
public ResourceLocation getLocationSkin() {
|
||||||
Entity view = mc.getRenderViewEntity();
|
Entity view = mc.getRenderViewEntity();
|
||||||
|
|||||||
Reference in New Issue
Block a user