From 2c380f609e880ee39fdbd4a7d3e8d44bf7080c16 Mon Sep 17 00:00:00 2001 From: gmcferrin Date: Sat, 4 Feb 2012 01:59:31 -0500 Subject: [PATCH] Fixed import issues from last commit. --- src/main/java/com/gmail/nossr50/skills/Unarmed.java | 7 +++++-- src/main/java/com/gmail/nossr50/skills/WoodCutting.java | 6 ++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/skills/Unarmed.java b/src/main/java/com/gmail/nossr50/skills/Unarmed.java index e5fb906f5..816afcb45 100644 --- a/src/main/java/com/gmail/nossr50/skills/Unarmed.java +++ b/src/main/java/com/gmail/nossr50/skills/Unarmed.java @@ -18,16 +18,19 @@ package com.gmail.nossr50.skills; import org.bukkit.Location; import org.bukkit.entity.Player; +import org.bukkit.block.Block; import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.inventory.ItemStack; +import org.bukkit.Material; +import org.bukkit.Statistic; import com.gmail.nossr50.Users; import com.gmail.nossr50.m; import com.gmail.nossr50.config.LoadProperties; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; -import com.gmail.nossr50.listeners.Material; import com.gmail.nossr50.locale.mcLocale; import com.gmail.nossr50.spout.SpoutStuff; +import org.getspout.spoutapi.sound.SoundEffect; public class Unarmed { public static void berserkActivationCheck(Player player) @@ -124,7 +127,7 @@ public class Unarmed { mat = Material.CLAY_BALL; ItemStack item = new ItemStack(mat, 1, (byte)0, damage); - player.incrementStatistic(Statistic.MINE_BLOCK, event.getBlock().getType()); + player.incrementStatistic(Statistic.MINE_BLOCK, block.getType()); // block.setType(Material.AIR); diff --git a/src/main/java/com/gmail/nossr50/skills/WoodCutting.java b/src/main/java/com/gmail/nossr50/skills/WoodCutting.java index f1380c38f..076383501 100644 --- a/src/main/java/com/gmail/nossr50/skills/WoodCutting.java +++ b/src/main/java/com/gmail/nossr50/skills/WoodCutting.java @@ -17,13 +17,14 @@ package com.gmail.nossr50.skills; import java.util.ArrayList; - +import net.minecraft.server.Enchantment; import org.bukkit.ChatColor; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; +import org.bukkit.Statistic; import com.gmail.nossr50.Users; import com.gmail.nossr50.m; import com.gmail.nossr50.mcMMO; @@ -33,6 +34,7 @@ import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.locale.mcLocale; import com.gmail.nossr50.spout.SpoutStuff; import com.gmail.nossr50.config.*; +import org.getspout.spoutapi.sound.SoundEffect; public class WoodCutting @@ -212,7 +214,7 @@ public class WoodCutting } block.setType(Material.AIR); - player.incrementStatistic(Statistic.MINE_BLOCK, event.getBlock().getType()); + player.incrementStatistic(Statistic.MINE_BLOCK, block.getType()); if(LoadProperties.spoutEnabled) SpoutStuff.playSoundForPlayer(SoundEffect.POP, player, block.getLocation());