From 3ca147e405d0a8a88d02adbbfaddb644fd9209d2 Mon Sep 17 00:00:00 2001 From: sk89q Date: Sun, 17 Aug 2014 15:23:34 -0700 Subject: [PATCH] Don't check metadata on Blocks in Cause. We don't track causes on Blocks. There's no need for the performance hit. --- src/main/java/com/sk89q/worldguard/bukkit/cause/Cause.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/sk89q/worldguard/bukkit/cause/Cause.java b/src/main/java/com/sk89q/worldguard/bukkit/cause/Cause.java index c32ed3b5..a2be3f95 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/cause/Cause.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/cause/Cause.java @@ -21,6 +21,7 @@ import com.google.common.base.Joiner; import com.sk89q.worldguard.bukkit.util.WGMetadata; +import org.bukkit.block.Block; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.entity.Projectile; @@ -123,7 +124,7 @@ private static void expand(List list, @Nullable Object ... element) { // Add manually tracked parent causes Object source = o; int index = list.size(); - while (source instanceof Metadatable) { + while (source instanceof Metadatable && !(source instanceof Block)) { source = WGMetadata.getIfPresent((Metadatable) source, CAUSE_KEY, Object.class); if (source != null) { list.add(index, source);