Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't rebuild material definitions each interaction #2143

Merged
merged 1 commit into from
Aug 24, 2023
Merged

Don't rebuild material definitions each interaction #2143

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 15 additions & 14 deletions src/main/java/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,13 +129,26 @@ class PlayerEventHandler implements Listener

//spam tracker
SpamDetector spamDetector = new SpamDetector();
// Definitions for specific material groups that do not have a tag
private final Set<Material> spawnEggs;
private final Set<Material> dyes;

//typical constructor, yawn
PlayerEventHandler(DataStore dataStore, GriefPrevention plugin)
{
this.dataStore = dataStore;
this.instance = plugin;
bannedWordFinder = new WordFinder(instance.dataStore.loadBannedWords());

spawnEggs = new HashSet<>();
dyes = new HashSet<>();
for (Material material : Material.values())
{
if (material.name().endsWith("_SPAWN_EGG"))
spawnEggs.add(material);
else if (material.name().endsWith("_DYE"))
dyes.add(material);
}
}

protected void resetPattern()
Expand Down Expand Up @@ -1842,22 +1855,10 @@ else if (clickedBlock != null &&
ItemStack itemInHand = instance.getItemInHand(player, hand);
Material materialInHand = itemInHand.getType();

Set<Material> spawn_eggs = new HashSet<>();
Set<Material> dyes = new HashSet<>();

for (Material material : Material.values())
{
if (material.isLegacy()) continue;
if (material.name().endsWith("_SPAWN_EGG"))
spawn_eggs.add(material);
else if (material.name().endsWith("_DYE"))
dyes.add(material);
}

// Require build permission for items that may have an effect on the world when used.
if (clickedBlock != null && (materialInHand == Material.BONE_MEAL
|| materialInHand == Material.ARMOR_STAND
|| (spawn_eggs.contains(materialInHand) && GriefPrevention.instance.config_claims_preventGlobalMonsterEggs)
|| (spawnEggs.contains(materialInHand) && GriefPrevention.instance.config_claims_preventGlobalMonsterEggs)
|| materialInHand == Material.END_CRYSTAL
|| materialInHand == Material.FLINT_AND_STEEL
|| materialInHand == Material.INK_SAC
Expand Down Expand Up @@ -1926,7 +1927,7 @@ else if (clickedBlock != null && (materialInHand == Material.MINECART ||
materialInHand == Material.ARMOR_STAND ||
materialInHand == Material.ITEM_FRAME ||
materialInHand == Material.GLOW_ITEM_FRAME ||
spawn_eggs.contains(materialInHand) ||
spawnEggs.contains(materialInHand) ||
materialInHand == Material.INFESTED_STONE ||
materialInHand == Material.INFESTED_COBBLESTONE ||
materialInHand == Material.INFESTED_STONE_BRICKS ||
Expand Down