From 36d6221b3b4e0e75f3d87e64476b99ee97d99384 Mon Sep 17 00:00:00 2001 From: GJ Date: Mon, 5 Mar 2012 18:01:56 -0500 Subject: [PATCH] Fixes some Blast Mining stuff. Still issues due to changes in internal math calculations somewhere... --- Changelog.txt | 1 + .../java/com/gmail/nossr50/listeners/mcBlockListener.java | 1 - .../com/gmail/nossr50/listeners/mcEntityListener.java | 7 +++++-- .../com/gmail/nossr50/listeners/mcPlayerListener.java | 8 +++++++- src/main/java/com/gmail/nossr50/skills/BlastMining.java | 3 +-- src/main/java/com/gmail/nossr50/skills/Taming.java | 2 ++ 6 files changed, 16 insertions(+), 6 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index 608c4193a..585133f7d 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -11,6 +11,7 @@ Version 2.0.00-dev + Added Ocelots to Taming XP tables + Added ability to summon Ocelots with Call of the Wild = Fixed ClassCastException from Taming preventDamage checks + = Fixed issue with Blast Mining not seeing TNT for detonation due to snow Version 1.3.02 + Added in game guides for Mining, Excavation, and Acrobatics. Simply type /skillname ? to access them diff --git a/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java b/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java index 8890bb5af..8f9dbd2a3 100644 --- a/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java @@ -73,7 +73,6 @@ public class mcBlockListener implements Listener //TNT placement checks - needed for Blast Mining if(mat.equals(Material.TNT) && mcPermissions.getInstance().blastMining(player)) plugin.misc.tntTracker.put(block.getLocation(), player); - //Check if the blocks placed should be monitored so they do not give out XP in the future if(m.shouldBeWatched(mat)) { diff --git a/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java b/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java index f157aa8c1..f18836238 100644 --- a/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java @@ -165,11 +165,14 @@ public class mcEntityListener implements Listener if(event.getEntity() instanceof TNTPrimed) { Location location = event.getEntity().getLocation(); - + System.out.println("UNNORMALIZED LOCATION"); + System.out.println(location); //Ugly code to make it recognize the location location.setX(location.getBlockX()+1); location.setY(location.getBlockY()); location.setZ(location.getBlockZ()+1); + System.out.println("NORMALIZED LOCATION"); + System.out.println(location); if(plugin.misc.tntTracker.containsKey(location)) { @@ -190,7 +193,7 @@ public class mcEntityListener implements Listener location.setX(location.getBlockX()+1); location.setY(location.getBlockY()); location.setZ(location.getBlockZ()+1); - + if(plugin.misc.tntTracker.containsKey(location)) { Player player = plugin.misc.tntTracker.get(location); diff --git a/src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java index edaf99239..69c5ef075 100644 --- a/src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java @@ -16,6 +16,7 @@ */ package com.gmail.nossr50.listeners; +import java.util.HashSet; import java.util.logging.Level; import java.util.logging.Logger; @@ -269,7 +270,12 @@ public class mcPlayerListener implements Listener //BLAST MINING if((action == Action.RIGHT_CLICK_BLOCK || action == Action.RIGHT_CLICK_AIR) && is.getTypeId() == LoadProperties.detonatorID) { - Block b = player.getTargetBlock(null, 100); + //Gotta make snow transparent... + HashSet transparent = new HashSet(); + transparent.add((byte) 78); + transparent.add((byte) 0); + + Block b = player.getTargetBlock(transparent, 100); if(b.getType().equals(Material.TNT) && mcPermissions.getInstance().blastMining(player) && m.blockBreakSimulate(b, player, true) && Users.getProfile(player).getSkillLevel(SkillType.MINING) >= 125) { AbilityType ability = AbilityType.BLAST_MINING; diff --git a/src/main/java/com/gmail/nossr50/skills/BlastMining.java b/src/main/java/com/gmail/nossr50/skills/BlastMining.java index a1a831dd0..3358a33dd 100644 --- a/src/main/java/com/gmail/nossr50/skills/BlastMining.java +++ b/src/main/java/com/gmail/nossr50/skills/BlastMining.java @@ -212,8 +212,7 @@ public class BlastMining{ if(skillLevel >= 750) radius++; if(skillLevel >= 1000) - radius++; - + radius++; event.setRadius(radius); } diff --git a/src/main/java/com/gmail/nossr50/skills/Taming.java b/src/main/java/com/gmail/nossr50/skills/Taming.java index c99a8bf0f..4dde90b9c 100644 --- a/src/main/java/com/gmail/nossr50/skills/Taming.java +++ b/src/main/java/com/gmail/nossr50/skills/Taming.java @@ -195,7 +195,9 @@ public class Taming world.spawnCreature(player.getLocation(), type); int amount = item.getAmount(); + System.out.println(amount); amount = amount - summonAmount; + System.out.println(amount); player.setItemInHand(new ItemStack(summonItem, amount)); player.sendMessage(mcLocale.getString("m.TamingSummon")); }