Merge remote-tracking branch 'origin/clans/beta' into clans/beta

This commit is contained in:
Shaun Bennett 2016-03-31 20:09:16 +11:00
commit 682c365bc6
2 changed files with 2 additions and 4 deletions

View File

@ -87,9 +87,7 @@ public class BlowUpWallGoal extends ObjectiveGoal<AttackEnemyObjective>
if (Math.random() < 0.2 + (dist.doubleValue() / 2.55) || dist.doubleValue() < 1.75)
{
BlockState state = block.getState();
state.setType(Material.AIR);
state.update(true, false);
block.setType(Material.AIR, false);
if (block.getType() != Material.IRON_DOOR_BLOCK && block.getType().name().endsWith("BANNER"))
FallingBlocks.Instance.Spawn(block.getLocation(), block.getType(), block.getData(), center);

View File

@ -63,7 +63,7 @@ public class MineDiamondsGoal extends ObjectiveGoal<FieldsObjective>
{
System.out.println("c");
event.setCancelled(true);
event.getBlock().getWorld().dropItemNaturally(event.getBlock().getLocation().add(0.5, 0.5, 0.5), new ItemStack(Material.DIAMOND));
event.getBlock().getWorld().dropItemNaturally(event.getBlock().getLocation().add(0.5, 1.5, 0.5), new ItemStack(Material.DIAMOND));
event.getBlock().setType(Material.COBBLESTONE);
Bukkit.getServer().getScheduler().runTaskLater(getObjective().getJavaPlugin(), new Runnable()