From ddb804ce99d9bb5b7704aac42a1ed8c275dcc52b Mon Sep 17 00:00:00 2001 From: Intelli Date: Thu, 24 Feb 2022 20:15:48 -0700 Subject: [PATCH] Fixed farmland displaying in inventory rollbacks --- .../net/coreprotect/command/LookupCommand.java | 1 + .../command/RollbackRestoreCommand.java | 14 +++++--------- .../java/net/coreprotect/database/Rollback.java | 4 ++-- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/main/java/net/coreprotect/command/LookupCommand.java b/src/main/java/net/coreprotect/command/LookupCommand.java index 474ea19..2668dc3 100755 --- a/src/main/java/net/coreprotect/command/LookupCommand.java +++ b/src/main/java/net/coreprotect/command/LookupCommand.java @@ -266,6 +266,7 @@ public class LookupCommand { if (argAction.contains(4) && argAction.contains(11)) { // a:inventory argExclude.add(Material.FIRE); argExclude.add(Material.WATER); + argExclude.add(Material.FARMLAND); argExcludeUsers.add("#hopper"); } diff --git a/src/main/java/net/coreprotect/command/RollbackRestoreCommand.java b/src/main/java/net/coreprotect/command/RollbackRestoreCommand.java index eafc516..6ce6121 100755 --- a/src/main/java/net/coreprotect/command/RollbackRestoreCommand.java +++ b/src/main/java/net/coreprotect/command/RollbackRestoreCommand.java @@ -183,15 +183,11 @@ public class RollbackRestoreCommand { Chat.sendMessage(player, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_ACTION_USER)); return; } - if (!argExclude.contains(Material.FIRE)) { - argExclude.add(Material.FIRE); - } - if (!argExclude.contains(Material.WATER)) { - argExclude.add(Material.WATER); - } - if (!argExcludeUsers.contains("#hopper")) { - argExcludeUsers.add("#hopper"); - } + + argExclude.add(Material.FIRE); + argExclude.add(Material.WATER); + argExclude.add(Material.FARMLAND); + argExcludeUsers.add("#hopper"); } if (g == 1 && (argUsers.size() > 0 || (argUsers.size() == 0 && argRadius != null))) { diff --git a/src/main/java/net/coreprotect/database/Rollback.java b/src/main/java/net/coreprotect/database/Rollback.java index db46c28..15c2dce 100644 --- a/src/main/java/net/coreprotect/database/Rollback.java +++ b/src/main/java/net/coreprotect/database/Rollback.java @@ -1411,9 +1411,9 @@ public class Rollback extends Queue { int excludeCount = 0; for (Object excludeTarget : excludeList) { - // don't display that excluded water/fire in inventory rollbacks + // don't display that excluded water/fire/farmland in inventory rollbacks if (actionList.contains(4) && actionList.contains(11)) { - if (excludeTarget.equals(Material.FIRE) || excludeTarget.equals(Material.WATER)) { + if (excludeTarget.equals(Material.FIRE) || excludeTarget.equals(Material.WATER) || excludeTarget.equals(Material.FARMLAND)) { continue; } }