From e20d9197c6f77c4a8bcb4f12edc690b444f83fc4 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 8 May 2019 00:58:07 -0400 Subject: [PATCH] =Fixed Roll precedence --- src/commands/CommandRoll.java | 2 +- src/dataStructures/KittyTrackedLong.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/commands/CommandRoll.java b/src/commands/CommandRoll.java index 5a9ef7e..1cb7ba7 100644 --- a/src/commands/CommandRoll.java +++ b/src/commands/CommandRoll.java @@ -166,7 +166,7 @@ public class CommandRoll extends Command private boolean hasPrecendence(char op1, char op2) { - if ((op1 == '*' || op1 == '/') && (op2 == '+' || op2 == '-')) + if ((op2 == '*' || op2 == '/') && (op1 == '+' || op1 == '-')) return false; else if ((op2 == 'd') && (op1 == '+' || op1 == '-' || op1 == '*' || op1 == '/')) diff --git a/src/dataStructures/KittyTrackedLong.java b/src/dataStructures/KittyTrackedLong.java index 98f450e..588d64f 100644 --- a/src/dataStructures/KittyTrackedLong.java +++ b/src/dataStructures/KittyTrackedLong.java @@ -1,6 +1,5 @@ package dataStructures; -import core.DatabaseManager; import core.DatabaseTrackedObject; import utils.GlobalLog; import utils.LogFilter;