diff --git a/.classpath b/.classpath index a833b69c..f7fdd02d 100644 --- a/.classpath +++ b/.classpath @@ -1,11 +1,11 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/com/gamingmesh/jobs/.gitignore b/com/gamingmesh/jobs/.gitignore index cc01228c..5bc5d680 100644 --- a/com/gamingmesh/jobs/.gitignore +++ b/com/gamingmesh/jobs/.gitignore @@ -6,3 +6,4 @@ /Jobs$1.class /PlayerManager$1.class /NMS.class +/JobsPlugin.class diff --git a/com/gamingmesh/jobs/commands/list/.gitignore b/com/gamingmesh/jobs/commands/list/.gitignore index 762f7b89..de734988 100644 --- a/com/gamingmesh/jobs/commands/list/.gitignore +++ b/com/gamingmesh/jobs/commands/list/.gitignore @@ -47,3 +47,8 @@ /test.class /purge.class /saveall.class +/fill.class +/fillprot.class +/fillprot$1.class +/bp$1.class +/bp.class diff --git a/com/gamingmesh/jobs/config/.gitignore b/com/gamingmesh/jobs/config/.gitignore index 9a8a48f6..e8b70954 100644 --- a/com/gamingmesh/jobs/config/.gitignore +++ b/com/gamingmesh/jobs/config/.gitignore @@ -29,3 +29,4 @@ /ExploreManager.class /BossBarManager$1.class /BossBarManager.class +/BlockProtectionManager.class diff --git a/com/gamingmesh/jobs/container/.gitignore b/com/gamingmesh/jobs/container/.gitignore index f54cc8ce..19d175a6 100644 --- a/com/gamingmesh/jobs/container/.gitignore +++ b/com/gamingmesh/jobs/container/.gitignore @@ -37,3 +37,7 @@ /McmmoSkill.class /FastPayment.class /TempJobProgression.class +/BlockTimer.class +/BlockProtection.class +/BpDBAction.class +/DBAction.class diff --git a/com/gamingmesh/jobs/nmsUtil/.gitignore b/com/gamingmesh/jobs/nmsUtil/.gitignore index 142152c4..f90f0e0b 100644 --- a/com/gamingmesh/jobs/nmsUtil/.gitignore +++ b/com/gamingmesh/jobs/nmsUtil/.gitignore @@ -2,3 +2,4 @@ /v1_7.class /v1_9.class /v1_10.class +/v1_11.class diff --git a/com/gamingmesh/jobs/nmsUtil/v1_11.java b/com/gamingmesh/jobs/nmsUtil/v1_11.java new file mode 100644 index 00000000..124c2dc6 --- /dev/null +++ b/com/gamingmesh/jobs/nmsUtil/v1_11.java @@ -0,0 +1,39 @@ +package com.gamingmesh.jobs.nmsUtil; + +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + +import org.bukkit.Material; +import org.bukkit.block.Block; +import org.bukkit.entity.Entity; +import org.bukkit.entity.Player; +import org.bukkit.event.block.BlockPistonRetractEvent; +import org.bukkit.inventory.ItemStack; + +import com.gamingmesh.jobs.NMS; + +public class v1_11 implements NMS { + @Override + public List getPistonRetractBlocks(BlockPistonRetractEvent event) { + List blocks = new ArrayList(); + blocks.addAll(event.getBlocks()); + return blocks; + } + + @Override + public String getRealType(Entity entity) { + return entity.getType().name(); + } + + @Override + public ItemStack getItemInMainHand(Player player) { + return player.getInventory().getItemInMainHand(); + } + + @Override + public Block getTargetBlock(Player player, int range) { + return player.getTargetBlock((Set) null, range); + } + +} diff --git a/com/gamingmesh/jobs/nmsUtil/v1_9.class b/com/gamingmesh/jobs/nmsUtil/v1_9.class index fcca0d67..192d1294 100644 Binary files a/com/gamingmesh/jobs/nmsUtil/v1_9.class and b/com/gamingmesh/jobs/nmsUtil/v1_9.class differ diff --git a/plugin.yml b/plugin.yml index 9ca9a305..13682b5e 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,7 +1,7 @@ name: Jobs description: Jobs Plugin for the BukkitAPI main: com.gamingmesh.jobs.Jobs -version: 3.6.2 +version: 3.6.3 author: phrstbrn depend: [Vault] softdepend: [MythicMobs, McMMO]