From ac5c7124deab6972bc0f932044a88e11af896196 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Zeutzheim?= <bjoern@zeutzheim-boppard.de>
Date: Mon, 31 Aug 2015 03:39:33 +0900
Subject: [PATCH] Fix possible crash in EventBus

There is currently no way to check if an event handler has been registered or not.
But when trying to unregister a not-registered event handler, Minecraft crashes with a NullPointerException.
This is a simple fix to prevent such crashes.
---
 .../main/java/cpw/mods/fml/common/eventhandler/EventBus.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fml/src/main/java/cpw/mods/fml/common/eventhandler/EventBus.java b/fml/src/main/java/cpw/mods/fml/common/eventhandler/EventBus.java
index d4570b0ef..49bcf0d5e 100644
--- a/fml/src/main/java/cpw/mods/fml/common/eventhandler/EventBus.java
+++ b/fml/src/main/java/cpw/mods/fml/common/eventhandler/EventBus.java
@@ -121,6 +121,8 @@ public class EventBus implements IEventExceptionHandler
     public void unregister(Object object)
     {
         ArrayList<IEventListener> list = listeners.remove(object);
+        if (list == null)
+            return;
         for (IEventListener listener : list)
         {
             ListenerList.unregisterAll(busID, listener);