From 434b14bedd53a0f11c2382545b047c960a1fc645 Mon Sep 17 00:00:00 2001
From: Jonas Gunz <himself@jonasgunz.de>
Date: Sun, 27 Sep 2020 21:07:20 +0200
Subject: Calculator Fix kick on wrong entry

---
 src/main/java/re/jag/parquet/commands/Calculator.java | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/main/java/re/jag')

diff --git a/src/main/java/re/jag/parquet/commands/Calculator.java b/src/main/java/re/jag/parquet/commands/Calculator.java
index ee8bc53..4cfdb26 100644
--- a/src/main/java/re/jag/parquet/commands/Calculator.java
+++ b/src/main/java/re/jag/parquet/commands/Calculator.java
@@ -58,6 +58,10 @@ public class Calculator {
 					level_count++;
 
 					String result = execute_operation(operator, parts.get(o), parts.get(o+1), _source);
+
+					if (result == null)
+						return 1;
+
 					parts.set(o, result);
 					parts.remove(o+1);
 					operators.remove(o);
@@ -95,6 +99,7 @@ public class Calculator {
 						operand = (int)player.getPos().z;
 					break;
 				default:
+					operand = null;
 			}
 		}
 
-- 
cgit v1.2.3