From ccf5da2113a365914a235c9c090ff29d47cc036c Mon Sep 17 00:00:00 2001
From: Ross Allan <ross@nallar.me>
Date: Sat, 13 Feb 2016 14:43:37 +0000
Subject: [PATCH] Workaround JDK-8087309: Constant folding "static final
 boolean" in boolean expressions is incomplete

---
 .../fml/common/eventhandler/ASMEventHandler.java       | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/main/java/net/minecraftforge/fml/common/eventhandler/ASMEventHandler.java b/src/main/java/net/minecraftforge/fml/common/eventhandler/ASMEventHandler.java
index 68b9926705..1bd4f6e85f 100644
--- a/src/main/java/net/minecraftforge/fml/common/eventhandler/ASMEventHandler.java
+++ b/src/main/java/net/minecraftforge/fml/common/eventhandler/ASMEventHandler.java
@@ -40,14 +40,8 @@ public class ASMEventHandler implements IEventListener
     @Override
     public void invoke(Event event)
     {
-        if (owner != null && GETCONTEXT)
-        {
-            ThreadContext.put("mod", owner.getName());
-        }
-        else if (GETCONTEXT)
-        {
-            ThreadContext.put("mod", "");
-        }
+        if (GETCONTEXT)
+            ThreadContext.put("mod", owner == null ? "" : owner.getName());
         if (handler != null)
         {
             if (!event.isCancelable() || !event.isCanceled() || subInfo.receiveCanceled())