JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable crafting of minecarts to patch minecart phasing

Browse Source
This commit is contained in:
AlexTheCoder 2017-08-26 02:05:37 -04:00
parent bc3637833e
commit 559c641adc
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/CustomRecipes.java
View File

@ -12,7 +12,7 @@ import mineplex.core.common.util.UtilPlayer;
public class CustomRecipes implements Listener
{
private static final Material[] DISABLED_RECIPES = { Material.EXPLOSIVE_MINECART, Material.JUKEBOX, Material.FISHING_ROD, Material.BED, Material.BOAT, Material.HOPPER, Material.HOPPER_MINECART };
private static final Material[] DISABLED_RECIPES = { Material.EXPLOSIVE_MINECART, Material.MINECART, Material.JUKEBOX, Material.FISHING_ROD, Material.BED, Material.BOAT, Material.HOPPER, Material.HOPPER_MINECART };
@EventHandler
public void onPlayerCraftItem(CraftItemEvent event)

4
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/ui/GearPage.java
View File

@ -151,7 +151,7 @@ public class GearPage extends ShopPageBase<GearManager, GearShop>
{
Triple<Boolean, String, Material> stage2 = doStageTwo();
if (stage2.getLeft().booleanValue())
if (stage2.getLeft())
{
return;
}
@ -166,7 +166,7 @@ public class GearPage extends ShopPageBase<GearManager, GearShop>
{
Triple<Boolean, String, Material> stage3 = doStageThree();
if (stage3.getLeft().booleanValue())
if (stage3.getLeft())
{
return;
}

5
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java
View File

@ -141,14 +141,15 @@ public class AttackEnemyObjective extends OrderedObjective<ClansMainTutorial>
EnclosedObject<Boolean> kill = new EnclosedObject<>(Boolean.FALSE);
_shooters.get(player.getName()).forEach(shooter -> {
_shooters.get(player.getName()).forEach(shooter ->
{
if (player.getLocation().distance(shooter.getLocation()) < 5)
{
kill.Set(Boolean.TRUE);
}
});
if (kill.Get().booleanValue())
if (kill.Get())
{
_shooters.get(player.getName()).forEach(shooter -> {
UtilParticle.PlayParticle(ParticleType.LARGE_SMOKE, shooter.getLocation().add(0, .5, 0), new Vector(0d, 0d, 0d), 0.2f, 15, ViewDist.MAX, player);