From 2f057ce0b164ea420ed4a4e7af018de664c707a1 Mon Sep 17 00:00:00 2001
From: johni0702 <me@johni0702.de>
Date: Sun, 17 May 2015 12:18:46 +0200
Subject: [PATCH] Prevent constant NPE exceptions being thrown and ignored
 (which caused extremely high CPU load)

---
 .../replaymod/chat/ChatMessageHandler.java          | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/eu/crushedpixel/replaymod/chat/ChatMessageHandler.java b/src/main/java/eu/crushedpixel/replaymod/chat/ChatMessageHandler.java
index 2dcb4771..be3f75ef 100755
--- a/src/main/java/eu/crushedpixel/replaymod/chat/ChatMessageHandler.java
+++ b/src/main/java/eu/crushedpixel/replaymod/chat/ChatMessageHandler.java
@@ -31,16 +31,17 @@ public class ChatMessageHandler {
                             if(!alive) {
                                 break;
                             }
-                            try {
-                                Thread.sleep(100);
-                                player = Minecraft.getMinecraft().thePlayer;
-                            } catch(Exception e) {
-                            }
+                            Thread.sleep(100);
+                            player = Minecraft.getMinecraft().thePlayer;
                         }
 
-                        player.addChatComponentMessage(requests.poll());
+                        IChatComponent message = requests.poll();
+                        if (message != null) {
+                            player.addChatComponentMessage(message);
+                        }
                         Thread.sleep(100);
                     } catch(Exception e) {
+                        e.printStackTrace();
                     }
                 }