diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/gadget/gadgets/PaintballGun.java b/Plugins/Mineplex.Hub/src/mineplex/hub/gadget/gadgets/PaintballGun.java index 0dab3e8c0..1b40e7ffd 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/gadget/gadgets/PaintballGun.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/gadget/gadgets/PaintballGun.java @@ -18,7 +18,9 @@ import org.bukkit.event.player.PlayerTeleportEvent; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import mineplex.core.common.util.C; +import mineplex.core.common.util.F; import mineplex.core.common.util.UtilBlock; +import mineplex.core.common.util.UtilPlayer; import mineplex.core.recharge.Recharge; import mineplex.hub.gadget.GadgetManager; import mineplex.hub.gadget.types.ItemGadget; @@ -85,6 +87,11 @@ public class PaintballGun extends ItemGadget @EventHandler public void Paint(ProjectileHitEvent event) { + if (Manager.Manager.GetParkour().InParkour(event.getEntity())) + { + return; + } + Location loc = event.getEntity().getLocation().add(event.getEntity().getVelocity()); loc.getWorld().playEffect(loc, Effect.STEP_SOUND, 49); diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/ParkourManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/ParkourManager.java index e7b78377d..1b300d34f 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/ParkourManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/ParkourManager.java @@ -8,6 +8,7 @@ import org.bukkit.Material; import org.bukkit.Sound; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; +import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -77,7 +78,7 @@ public class ParkourManager extends MiniPlugin _lavaParkourReturn.setYaw(90); } - public boolean InParkour(LivingEntity ent) + public boolean InParkour(Entity ent) { for (ParkourData data : _parkour) { diff --git a/Website/LOC.Website.Web/LOC.Website.Web.Publish.xml b/Website/LOC.Website.Web/LOC.Website.Web.Publish.xml index 05ceb4e3b..ff95bc5e9 100644 --- a/Website/LOC.Website.Web/LOC.Website.Web.Publish.xml +++ b/Website/LOC.Website.Web/LOC.Website.Web.Publish.xml @@ -1,7 +1,6 @@  - @@ -17,43 +16,39 @@ - + - - + + - - + - + - + - - - @@ -62,7 +57,9 @@ - + + + @@ -73,23 +70,24 @@ - - + - + + + - + + - @@ -97,7 +95,7 @@ - + @@ -105,43 +103,41 @@ + + + - - - - - - - + + + - - + @@ -152,323 +148,65 @@ - + - + + + + + + - + - + - + - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + @@ -477,16 +215,18 @@ - - + + - - + + + - - + + + @@ -494,36 +234,296 @@ - + - + - - - - + + - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Website/LOCWebsite.sln b/Website/LOCWebsite.sln index 0d718d73a..4af3b86ac 100644 --- a/Website/LOCWebsite.sln +++ b/Website/LOCWebsite.sln @@ -10,8 +10,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LOC.Website.Web", "LOC.Webs {A994B28E-8AAA-4A53-BDFE-0E72F1B0F4AD} = {A994B28E-8AAA-4A53-BDFE-0E72F1B0F4AD} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LOCTester", "..\TestApps\LOCTester\LOCTester.csproj", "{418496EF-36D6-4AE0-B48F-393D45E124CA}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LOC.Website.Tests", "LOC.Website.Tests\LOC.Website.Tests.csproj", "{5A4544F8-662F-4D5B-B3CB-B9B3994A0C0D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C2613EC6-7E43-4245-81FD-A6E9E190B481}" @@ -64,16 +62,6 @@ Global {DE6A8208-57CD-495D-8A25-5CE1293B7483}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {DE6A8208-57CD-495D-8A25-5CE1293B7483}.Release|Mixed Platforms.Build.0 = Release|Any CPU {DE6A8208-57CD-495D-8A25-5CE1293B7483}.Release|x86.ActiveCfg = Release|Any CPU - {418496EF-36D6-4AE0-B48F-393D45E124CA}.Debug|Any CPU.ActiveCfg = Debug|x86 - {418496EF-36D6-4AE0-B48F-393D45E124CA}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {418496EF-36D6-4AE0-B48F-393D45E124CA}.Debug|Mixed Platforms.Build.0 = Debug|x86 - {418496EF-36D6-4AE0-B48F-393D45E124CA}.Debug|x86.ActiveCfg = Debug|x86 - {418496EF-36D6-4AE0-B48F-393D45E124CA}.Debug|x86.Build.0 = Debug|x86 - {418496EF-36D6-4AE0-B48F-393D45E124CA}.Release|Any CPU.ActiveCfg = Release|x86 - {418496EF-36D6-4AE0-B48F-393D45E124CA}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {418496EF-36D6-4AE0-B48F-393D45E124CA}.Release|Mixed Platforms.Build.0 = Release|x86 - {418496EF-36D6-4AE0-B48F-393D45E124CA}.Release|x86.ActiveCfg = Release|x86 - {418496EF-36D6-4AE0-B48F-393D45E124CA}.Release|x86.Build.0 = Release|x86 {5A4544F8-662F-4D5B-B3CB-B9B3994A0C0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5A4544F8-662F-4D5B-B3CB-B9B3994A0C0D}.Debug|Any CPU.Build.0 = Debug|Any CPU {5A4544F8-662F-4D5B-B3CB-B9B3994A0C0D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU diff --git a/Website/LOCWebsite.suo b/Website/LOCWebsite.suo index 519e0026b..1803948db 100644 Binary files a/Website/LOCWebsite.suo and b/Website/LOCWebsite.suo differ