zhdev/griefus
1
0
Fork 0
Code Issues Pull requests Activity

Fixed farmland displaying in inventory rollbacks

Browse source
This commit is contained in:
Intelli 2022-02-24 20:15:48 -07:00
parent 45f9f4316e
commit ddb804ce99
3 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/net/coreprotect/command/LookupCommand.java
View file

@ -266,6 +266,7 @@ public class LookupCommand {
if (argAction.contains(4) && argAction.contains(11)) { // a:inventory if (argAction.contains(4) && argAction.contains(11)) { // a:inventory
argExclude.add(Material.FIRE); argExclude.add(Material.FIRE);
argExclude.add(Material.WATER); argExclude.add(Material.WATER);
argExclude.add(Material.FARMLAND);
argExcludeUsers.add("#hopper"); argExcludeUsers.add("#hopper");
} }

14
src/main/java/net/coreprotect/command/RollbackRestoreCommand.java
View file

@ -183,15 +183,11 @@ public class RollbackRestoreCommand {
Chat.sendMessage(player, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_ACTION_USER)); Chat.sendMessage(player, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_ACTION_USER));
return; return;
} }
if (!argExclude.contains(Material.FIRE)) {
argExclude.add(Material.FIRE); argExclude.add(Material.FIRE);
} argExclude.add(Material.WATER);
if (!argExclude.contains(Material.WATER)) { argExclude.add(Material.FARMLAND);
argExclude.add(Material.WATER); argExcludeUsers.add("#hopper");
}
if (!argExcludeUsers.contains("#hopper")) {
argExcludeUsers.add("#hopper");
}
} }
if (g == 1 && (argUsers.size() > 0 || (argUsers.size() == 0 && argRadius != null))) { if (g == 1 && (argUsers.size() > 0 || (argUsers.size() == 0 && argRadius != null))) {

4
src/main/java/net/coreprotect/database/Rollback.java
View file

@ -1411,9 +1411,9 @@ public class Rollback extends Queue {
int excludeCount = 0; int excludeCount = 0;
for (Object excludeTarget : excludeList) { 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 (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; continue;
} }
} }