Bläddra i källkod

Fixed import issues from last commit.

gmcferrin 13 år sedan
förälder
incheckning
2c380f609e

+ 5 - 2
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);
 		

+ 4 - 2
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());