From 05f6ede2ea7bd6652ccbe8994f60a859648eb2aa Mon Sep 17 00:00:00 2001
From: luacs1998 <luacs1998@users.noreply.github.com>
Date: Sun, 27 Sep 2015 12:47:37 +0800
Subject: [PATCH] Fix a possible crash in EventBus

---
 .../net/minecraftforge/fml/common/eventhandler/EventBus.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/net/minecraftforge/fml/common/eventhandler/EventBus.java b/src/main/java/net/minecraftforge/fml/common/eventhandler/EventBus.java
index 391810d1e4..87d0c99488 100644
--- a/src/main/java/net/minecraftforge/fml/common/eventhandler/EventBus.java
+++ b/src/main/java/net/minecraftforge/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);