Skip to content

Commit

Permalink
Fix Desoro failing to merge
Browse files Browse the repository at this point in the history
  • Loading branch information
Paneedah committed Jul 13, 2023
1 parent 14cfb21 commit 7c0542c
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/main/java/com/paneedah/weaponlib/ClientEventHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -256,13 +256,13 @@ private void update() {
PlayerUtils.restorePlayerSpeed(player, SLOW_DOWN_WHILE_ZOOMING_ATTRIBUTE_MODIFIER);
}

final SpreadableExposure spreadableExposure = CompatibleExposureCapability.getExposure(mc.player, SpreadableExposure.class);
final SpreadableExposure spreadableExposure = CompatibleExposureCapability.getExposure(MC.player, SpreadableExposure.class);
if (spreadableExposure != null && spreadableExposure.getTotalDose() > SLOW_DOWN_WHEN_POISONED_DOSE_THRESHOLD) PlayerUtils.slowPlayerDown(player, SLOW_DOWN_WHILE_POISONED_ATTRIBUTE_MODIFIER);
else PlayerUtils.restorePlayerSpeed(player, SLOW_DOWN_WHILE_POISONED_ATTRIBUTE_MODIFIER);

final LightExposure lightExposure = CompatibleExposureCapability.getExposure(mc.player, LightExposure.class);
final LightExposure lightExposure = CompatibleExposureCapability.getExposure(MC.player, LightExposure.class);
if (lightExposure != null)
lightExposure.update(mc.player);
lightExposure.update(MC.player);
}

/*@SubscribeEvent
Expand All @@ -278,7 +278,7 @@ public void onRenderHand(RenderHandEvent event) {
@SubscribeEvent
@SideOnly(Side.CLIENT)
public final void onRenderTickEvent(TickEvent.RenderTickEvent event) {
final DynamicShaderContext shaderContext = new DynamicShaderContext(DynamicShaderPhase.POST_WORLD_RENDER, mc.entityRenderer, mc.getFramebuffer(), event.renderTickTime);
final DynamicShaderContext shaderContext = new DynamicShaderContext(DynamicShaderPhase.POST_WORLD_RENDER, MC.entityRenderer, MC.getFramebuffer(), event.renderTickTime);
final EntityPlayer clientPlayer = MC.player;

if (event.phase == TickEvent.RenderTickEvent.Phase.START) {
Expand Down Expand Up @@ -346,7 +346,7 @@ public void onRenderWorldLastEvent(RenderWorldLastEvent event) {
// Hot swaps the Minecraft frame-buffer for an HDR one.

if (ModernConfigManager.enableHDRFramebuffer) {
final Framebuffer current = mc.getFramebuffer();
final Framebuffer current = MC.getFramebuffer();
if (!(current instanceof HDRFramebuffer)) {
// Create an EXACT match, but in the HDR format. This will break w/ other mods that try to do anything similar.
MC.framebuffer = new HDRFramebuffer(current.framebufferWidth, current.framebufferHeight, current.useDepth);
Expand Down

0 comments on commit 7c0542c

Please sign in to comment.