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

Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex

This commit is contained in:
Jonathan Williams 2013-12-21 03:23:07 -05:00
parent 7574a5972b c969775df3
commit 793b17e878
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
View File

@ -80,6 +80,7 @@ public class UtilBlock
blockPassSet.add((byte)118);
blockPassSet.add((byte)119);
blockPassSet.add((byte)120);
blockPassSet.add((byte)171);
}
return !blockPassSet.contains(block);

7
Plugins/Mineplex.Core/src/mineplex/core/blockrestore/BlockRestore.java
View File

@ -129,12 +129,13 @@ public class BlockRestore extends MiniPlugin
if (block.getRelative(BlockFace.DOWN).getType().toString().contains("STAIRS"))
return;
//No Snow on Fence
if (block.getRelative(BlockFace.DOWN).getTypeId() == 85)
//No Snow on Fence or Walls
if (block.getRelative(BlockFace.DOWN).getTypeId() == 85 ||
block.getRelative(BlockFace.DOWN).getTypeId() == 139)
return;
//Not Buildable
if (!UtilBlock.airFoliage(block) && block.getTypeId() != 78)
if (!UtilBlock.airFoliage(block) && block.getTypeId() != 78 && block.getType() != Material.CARPET)
return;
//Limit Build Height

2
Plugins/Mineplex.Hub/src/mineplex/hub/gadget/GadgetManager.java
View File

@ -66,7 +66,7 @@ public class GadgetManager extends MiniPlugin
//Christmas 2013
_gadgets.add(new Christmas2013_Helmet(this));
_gadgets.add(new Christmas2013_SnowCannon(this));
//_gadgets.add(new Christmas2013_SnowCannon(this));
}
@EventHandler

2
Plugins/Mineplex.Hub/src/mineplex/hub/gadget/gadgets/Christmas2013_SnowCannon.java
View File

@ -45,7 +45,7 @@ public class Christmas2013_SnowCannon extends ItemGadget
C.cWhite + "at people you don't like!",
},
-1,
Material.IRON_BARDING, (byte)0);
Material.DIAMOND_BARDING, (byte)0);
}
@Override

14
Plugins/Mineplex.Hub/src/mineplex/hub/mount/types/Frost.java
View File

@ -31,10 +31,10 @@ public class Frost extends Mount
C.cWhite + "it leaves a trail of frost",
C.cWhite + "as it moves!",
},
Material.BONE,
Material.SNOW_BALL,
(byte)0,
-1,
Color.WHITE, Style.WHITE, Variant.HORSE, 0.8, null);
Color.WHITE, Style.WHITE, Variant.HORSE, 1, null);
}
@ -48,7 +48,7 @@ public class Frost extends Mount
{
try
{
UtilParticle.PlayParticle(player, ParticleType.SNOW_SHOVEL, horse.getLocation().add(0, 1, 0), 0.25f, 0.25f, 0.25f, 0, 3);
UtilParticle.PlayParticle(player, ParticleType.SNOW_SHOVEL, horse.getLocation().add(0, 1, 0), 0.25f, 0.25f, 0.25f, 0.1f, 4);
}
catch (Exception e)
{
@ -64,15 +64,13 @@ public class Frost extends Mount
if (event.getType() != UpdateType.TICK)
return;
for (Player player : GetActive().keySet())
for (Horse horse : GetActive().values())
{
double range = 5*player.getExp();
//Blocks
double duration = 2000;
HashMap<Block, Double> blocks = UtilBlock.getInRadius(player.getLocation(), range);
HashMap<Block, Double> blocks = UtilBlock.getInRadius(horse.getLocation(), 2.5d);
for (Block block : blocks.keySet())
{
{
//Snow
Manager.Manager.GetBlockRestore().Snow(block, (byte)1, (byte)1, (long)(duration * (1 + blocks.get(block))), 250, 0);
}