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

Fixed fire/water displaying in inventory lookups

Browse source
This commit is contained in:
Intelli 2022-02-22 20:10:55 -07:00
parent 2a8e4f9797
commit c95bf3cc30
3 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -263,6 +263,8 @@ 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.WATER);
argExcludeUsers.add("#hopper"); argExcludeUsers.add("#hopper");
} }

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

@ -183,6 +183,12 @@ 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);
}
if (!argExclude.contains(Material.WATER)) {
argExclude.add(Material.WATER);
}
if (!argExcludeUsers.contains("#hopper")) { if (!argExcludeUsers.contains("#hopper")) {
argExcludeUsers.add("#hopper"); argExcludeUsers.add("#hopper");
} }

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

@ -1394,8 +1394,14 @@ public class Rollback extends Queue {
int excludeCount = 0; int excludeCount = 0;
for (Object excludeTarget : excludeList) { for (Object excludeTarget : excludeList) {
String targetName = ""; // don't display that excluded water/fire in inventory rollbacks
if (actionList.contains(4) && actionList.contains(11)) {
if (excludeTarget.equals(Material.FIRE) || excludeTarget.equals(Material.WATER)) {
continue;
}
}
String targetName = "";
if (excludeTarget instanceof Material) { if (excludeTarget instanceof Material) {
targetName = ((Material) excludeTarget).name().toLowerCase(Locale.ROOT); targetName = ((Material) excludeTarget).name().toLowerCase(Locale.ROOT);
item = (!item ? !(((Material) excludeTarget).isBlock()) : item); item = (!item ? !(((Material) excludeTarget).isBlock()) : item);
@ -1427,7 +1433,9 @@ public class Rollback extends Queue {
targetType = Selector.SECOND; targetType = Selector.SECOND;
} }
Chat.sendMessage(user, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_INCLUDE, excludeTargets.toString(), Selector.SECOND, targetType, (excludeCount == 1 ? Selector.FIRST : Selector.SECOND))); // exclude if (excludeCount > 0) {
Chat.sendMessage(user, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_INCLUDE, excludeTargets.toString(), Selector.SECOND, targetType, (excludeCount == 1 ? Selector.FIRST : Selector.SECOND))); // exclude
}
} }
if (excludeUserList.size() > 0) { if (excludeUserList.size() > 0) {