From 1bd87c4cc93297c75dd7b7ce6dd0cb87ace224d7 Mon Sep 17 00:00:00 2001
From: Danielv123 <tranen.bananen@gmail.com>
Date: Fri, 27 Apr 2018 21:58:03 +0200
Subject: [PATCH] Fixed crash  on !shout

---
 client.js                         | 4 +++-
 sharedPlugins/globalChat/index.js | 7 ++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/client.js b/client.js
index 3f0db6e3..5247ae95 100644
--- a/client.js
+++ b/client.js
@@ -504,7 +504,9 @@ function instanceManagement() {
 								}
 								for(let i = 0; i < stuff.length; i++) {
 									if(stuff[i] && !stuff[i].includes('\u0000\u0000')) {
-										plugins[I].scriptOutput(stuff[i]);
+										try{
+											plugins[I].scriptOutput(stuff[i]);
+										}catch(e){console.log(e)}
 									}
 								}
 							},
diff --git a/sharedPlugins/globalChat/index.js b/sharedPlugins/globalChat/index.js
index 283a6184..aa6cf3f9 100644
--- a/sharedPlugins/globalChat/index.js
+++ b/sharedPlugins/globalChat/index.js
@@ -8,7 +8,12 @@ module.exports = class remoteCommands {
 		this.socket.on("gameChat", data => {
 			if(data.instanceID && data.instanceID != this.config.unique.toString()){
 				if(data.data.includes("[CHAT]") && data.data.toLowerCase().includes("!shout")){
-					let chatMessage = "["+data.instanceID+"]"+ data.data.trim().split(" ").shift().shift().shift().join(" ");
+					let message = data.data.trim().split(" ");
+					message.shift();
+					message.shift();
+					message.shift();
+					message.join(" ");
+					let chatMessage = "["+data.instanceID+"]"+ message;
 					this.messageInterface("/c game.print('"+chatMessage+"')");
 				}
 			}