Bug fixes for Netherrack Items and Double Axes

Author: chrismin13

dependency-reduced-pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.chrismin13</groupId>
   <artifactId>VanillaAdditions</artifactId>
-  <version>1.3.2-SNAPSHOT</version>
+  <version>1.3.3-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>
@@ -58,13 +58,13 @@
                 </goals>
                 <configuration>
                   <executable>C:\Users\chris\eclipse-workspace\vanilla-additions/scripts/dev.bat</executable>
-                  <arguments>C:\Users\chris\eclipse-workspace\vanilla-additions\target\VanillaAdditions-1.3.2-SNAPSHOT.jar</arguments>
+                  <arguments>C:\Users\chris\eclipse-workspace\vanilla-additions\target\VanillaAdditions-1.3.3-SNAPSHOT.jar</arguments>
                 </configuration>
               </execution>
             </executions>
             <configuration>
               <executable>C:\Users\chris\eclipse-workspace\vanilla-additions/scripts/dev.bat</executable>
-              <arguments>C:\Users\chris\eclipse-workspace\vanilla-additions\target\VanillaAdditions-1.3.2-SNAPSHOT.jar</arguments>
+              <arguments>C:\Users\chris\eclipse-workspace\vanilla-additions\target\VanillaAdditions-1.3.3-SNAPSHOT.jar</arguments>
             </configuration>
           </plugin>
         </plugins>

pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>com.chrismin13</groupId>
 	<artifactId>VanillaAdditions</artifactId>
-	<version>1.3.2-SNAPSHOT</version>
+	<version>1.3.3-SNAPSHOT</version>
 	<build>
 		<plugins>
 

src/main/java/com/chrismin13/vanillaadditions/listeners/NetherrackItemsListener.java

@@ -64,10 +64,11 @@ public void onRightClickBlock(PlayerInteractEvent event) {
 			}
 		}
 
-		CustomItemBlockIgniteEvent cEvent = new CustomItemBlockIgniteEvent(
-				new BlockIgniteEvent(blockClicked, IgniteCause.FLINT_AND_STEEL, blockAir), cStack);
+		BlockIgniteEvent bEvent = new BlockIgniteEvent(blockClicked, IgniteCause.FLINT_AND_STEEL, player, blockAir);
+		CustomItemBlockIgniteEvent cEvent = new CustomItemBlockIgniteEvent(bEvent, cStack);
+		Bukkit.getPluginManager().callEvent(bEvent);
 		Bukkit.getPluginManager().callEvent(cEvent);
-		if (!cEvent.isCancelled()) {
+		if (!bEvent.isCancelled() && !cEvent.isCancelled()) {
 			blockAir.setType(Material.FIRE);
 			blockAir.setData((byte) 0);
 			player.playSound(blockAir.getLocation(), Sound.ITEM_FLINTANDSTEEL_USE, 1F, 1F);

src/main/java/com/chrismin13/vanillaadditions/utils/BlockUtils.java

@@ -57,6 +57,16 @@ public static boolean isBlockIgnored(Block block) {
 	}
 
 	public static boolean breakBlock(Block block, CustomItemStack cStack, Player player) {
+		return breakBlock(block, cStack, player, false);
+	}
+
+	public static boolean breakBlock(Block block, CustomItemStack cStack, Player player, boolean cancelDurability) {
+		final Integer currentDurability;
+		if (cancelDurability && cStack.getCustomItem().hasFakeDurability())
+			currentDurability = cStack.getFakeDurability();
+		else
+			currentDurability = null;
+
 		addIgnoreBlocks(block);
 		BlockBreakEvent event = new BlockBreakEvent(block, player);
 
@@ -88,6 +98,10 @@ public static boolean breakBlock(Block block, CustomItemStack cStack, Player pla
 			else
 				block.breakNaturally();
 		removeIgnoreBlocks(block);
+		
+		if (currentDurability != null)
+			cStack.setFakeDurability(currentDurability);
+		
 		return !event.isCancelled();
 	}
 }

src/main/java/com/chrismin13/vanillaadditions/utils/TreeFeller.java

@@ -296,7 +296,7 @@ public static void popLogs(List<Block> blocks, final World world, Player player,
 			Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() {
 				@Override
 				public void run() {
-					if (!BlockUtils.breakBlock(currentBlock, cStack, player)) {
+					if (BlockUtils.breakBlock(currentBlock, cStack, player)) {
 						TreeFeller.popLeaves(currentBlock, cStack, player);
 					}
 					// if (useParticleLIB)
@@ -324,7 +324,7 @@ public static void popLeaves(Block block, final CustomItemStack cStack, Player p
 							// @SuppressWarnings("deprecation")
 							@Override
 							public void run() {
-								BlockUtils.breakBlock(target, cStack, player);
+								BlockUtils.breakBlock(target, cStack, player, true);
 								// if (useParticleLIB)
 								// ParticleEffect.BLOCK_CRACK.sendData(players,
 								// (double) target.getX(),

src/main/resources/plugin.yml

@@ -1,5 +1,5 @@
 name: VanillaAdditions
-version: 1.3.2
+version: 1.3.3
 main: com.chrismin13.vanillaadditions.VanillaAdditions
 author: chrismin13
 depend: [ AdditionsAPI ]