Use constant for farming block list (#1014)

This commit is contained in:
Adam 2020-09-17 11:22:57 -04:00 committed by GitHub
parent eff759463d
commit 88dd68505a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -29,9 +29,9 @@ import org.bukkit.entity.Entity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.EnumSet;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
@ -354,7 +354,7 @@ public class Claim
return GriefPrevention.instance.dataStore.getMessage(Messages.OnlyOwnersModifyClaims, this.getOwnerName()); return GriefPrevention.instance.dataStore.getMessage(Messages.OnlyOwnersModifyClaims, this.getOwnerName());
} }
private List<Material> placeableFarmingBlocksList = Arrays.asList( private static final EnumSet<Material> PLACEABLE_FARMING_BLOCKS = EnumSet.of(
Material.PUMPKIN_STEM, Material.PUMPKIN_STEM,
Material.WHEAT, Material.WHEAT,
Material.MELON_STEM, Material.MELON_STEM,
@ -363,9 +363,9 @@ public class Claim
Material.NETHER_WART, Material.NETHER_WART,
Material.BEETROOTS); Material.BEETROOTS);
private boolean placeableForFarming(Material material) private static boolean placeableForFarming(Material material)
{ {
return this.placeableFarmingBlocksList.contains(material); return PLACEABLE_FARMING_BLOCKS.contains(material);
} }
//build permission check //build permission check
@ -410,7 +410,7 @@ public class Claim
if (this.allowContainers(player) == null) if (this.allowContainers(player) == null)
{ {
//do allow for farming, if player has /containertrust permission //do allow for farming, if player has /containertrust permission
if (this.placeableForFarming(material)) if (placeableForFarming(material))
{ {
return null; return null;
} }