From d2847dd2fe45a28665c7ac12c99dbe65ecc61ff7 Mon Sep 17 00:00:00 2001 From: Zrips Date: Fri, 18 Nov 2016 13:29:33 +0200 Subject: [PATCH] No need to check special entity name anymore with new API --- .classpath | 22 +++++------ com/gamingmesh/jobs/.gitignore | 1 + com/gamingmesh/jobs/commands/list/.gitignore | 5 +++ com/gamingmesh/jobs/config/.gitignore | 1 + com/gamingmesh/jobs/container/.gitignore | 4 ++ com/gamingmesh/jobs/nmsUtil/.gitignore | 1 + com/gamingmesh/jobs/nmsUtil/v1_11.java | 39 +++++++++++++++++++ com/gamingmesh/jobs/nmsUtil/v1_9.class | Bin 7170 -> 7888 bytes plugin.yml | 2 +- 9 files changed, 63 insertions(+), 12 deletions(-) create mode 100644 com/gamingmesh/jobs/nmsUtil/v1_11.java 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 fcca0d67d3b6d0b6c35a51a2271bbf5405948d76..192d12940e97e4af1abeecbadd49b57b05852382 100644 GIT binary patch literal 7888 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 L-PnvLTI&7>Ml-F^ delta 3441 zcmbuAd5|1c9mjva_hxrycHiugy|T$}HUtuKCuDPM$Og7&rgx^ZJ=2q(88!>VhG2pc zf#uST5E`^fO7SRbNGWQx5Oo!csw68>)FMa_kRv7tC~^b=<&YqtoWaE3uX|ryQbiS| ze{_HQ^Zow%UH#t7{?(uBsk#5iFYf?=ZoFn^&8`~1KJ6MAC-3!Ju9-A!I}S_XP6fY# z?FcIEI)#Fn_Nf_s@`WJ?-bn6W;`_MU3MQ-@DRI+ z!1Yq@P_bm#@hC;VSFpb_T-(y|u!28uO>J0HFby{t&!Y++tK3xE()A|=k8?qtxvpTk zmYGkPp5rFD{U;PWSwYq6Kds;(*Tg2y=r0PMJ!TF%?f}2?yn?^7srs#A*2-tRtm6d1 z3kqK3pemC!iX|?6S;5~!$1?JPb4bCfL5rEP;ik#uvey*&uLpHm$1Mi){-=U}u~TEY zw8|OB4p;Im1#gEoEv?t@8o8kQT?Oy4U2B_0G3#ZmQYy<0zpvom?8j{@lP%?GuZlcp~Q#hFm)v;De z!8+m;g;T?zT+F(Tlk-x}AUEBqa2f~IPRg{MV3gApp1@YDU|9K5xCnTn!jssP1&bF2 zXDK|HxrW#~)5#?*nzp|b=O~;Tv{$f=A=Bm3`3e_=rH*a5UXu13+lv$~4sF-U(e57~ z=@NzAK?AOlOj^N!mML7$R#h=;ngxEhN8w6#qQz|49tgWxrLd!y&AM^ZOO|ch3|cr% z;pr8lzR5QfCb=e7955*hKVe#-8MbfJNVxrs!fe=7jt=X@Q;Ta94umb_ox$;=j5&pQ zHlsx{!vl&1g=@n$3TCS08n$P+m8a^XeozCMbk}0F%3W9Xo03tra78!VQSNK zE7QrEb}%i|G{$6U+Re1o*LXYQG)=!|YSy%eD5Bvmj?$Wb%QQ>VeN2lqJ;2nbX&=)( zO$V6b&S-l$_eU6ObofW2s>-U?seV*j&u~G5rstSUO@CuLNz+SACun+wX|bk%F!gGB zgK3qfH<^^CcZjMTfBe%N=B!_5N0^f1gvc~kQ-o=_>tO$(Xon0(rocnafc z9WG_+*0h4@6iufxHECMSG+R?2QW%ueCpn2T&YVPrb(Jyrs zOopa)Ov^Q$#Z;^5V@!>j&ShGo>EleNhve_V^BFTbyntz;rVE+oYr2>zq3Kel6`HPK zni0~_7~HS})<6SHfleHOX)qh+kyR(x1bfu$T01*artlABHF4An7ykG8`g(72biv zr0-)j#&HB|uo>G(C*us9NjeMtMYx0>x^Xr3ks3IFc~S?5@NClccs^c0x*4ya`v`8q z&*K+Jufwn74W!%fd-#3QoAFlMLAn!vg?Etd!Taz5(g*P|e4O;p_&mNq`Xau8Z<4+x zKu8=B5nt4aMtYbeIz$)gbTL;fAYCYW#46HW(Jw60HKHU2N!N)DVk7A$F)S`4y*emWKy;mF%kB~kp4vJ?<{pZ9X@ftn6 zE)I($q(^03Djbms*(RruPL(s|Y|=ThTP`PEAq|-(HKik6(xO~1&mlcmZk893UM#oB zt4O!X>*SY6ub128H%V`lH_IQ9j>?_#XQa2uJ@PIb@#S9mklatk0r`Y{n)IN2NxnjQ zNWLxKBRw3cio|dv5|1=RTIpL#sH4A{YW{2dsjBM78#LHDb0E9oTq SIu2y<>b`c^0B51!*Zv<^ffaKA 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]