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

UtilShapes: Fix a method, add a space in OldMineWare in GameType

Browse Source
This commit is contained in:
libraryaddict 2015-06-06 18:08:37 +12:00
parent 5f2810ae37
commit ef9c69f356
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilShapes.java
View File

@ -9,25 +9,15 @@ import org.bukkit.util.Vector;
public class UtilShapes
{
private final static BlockFace[] diagonalFaces =
{
BlockFace.SOUTH_WEST, BlockFace.NORTH_WEST, BlockFace.NORTH_EAST, BlockFace.SOUTH_EAST
};
private final static BlockFace[] radial =
{
BlockFace.SOUTH, BlockFace.SOUTH_WEST, BlockFace.WEST, BlockFace.NORTH_WEST, BlockFace.NORTH,
BlockFace.NORTH_EAST, BlockFace.EAST, BlockFace.SOUTH_EAST
};
private final static BlockFace[] squareFaces =
{
BlockFace.SOUTH, BlockFace.WEST, BlockFace.NORTH, BlockFace.EAST
};
public static ArrayList<Location> getCircle(Location loc, double radius, boolean hollow)
public static ArrayList<Location> getCircle(Location loc, double radius)
{
return getCircleBlocks(loc, radius, 0, hollow, false);
return getCircleBlocks(loc, radius, 0, true, false);
}
public static ArrayList<Location> getSphereBlocks(Location loc, double radius, double height, boolean hollow)

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
View File

@ -85,7 +85,7 @@ public enum GameType
MilkCow(MilkCow.class, "Milk the Cow", Material.MILK_BUCKET, (byte)0, GameCategory.ARCADE, 27),
MineStrike(MineStrike.class, "MineStrike", Material.TNT, (byte)0, GameCategory.CLASSICS, 25, "http://chivebox.com/file/c/assets.zip", false),
MineWare(MineWare.class, "MineWare", Material.PAPER, (byte)0, GameCategory.EXTRA, 26),
OldMineWare(OldMineWare.class, "OldMineWare", Material.PAPER, (byte)0, GameCategory.EXTRA, 26),
OldMineWare(OldMineWare.class, "Old MineWare", Material.PAPER, (byte)0, GameCategory.EXTRA, 26),
Paintball(Paintball.class, "Super Paintball", Material.ENDER_PEARL, (byte)0, GameCategory.ARCADE, 28),
Quiver(Quiver.class, "One in the Quiver", Material.ARROW, (byte)0, GameCategory.ARCADE, 29),
QuiverTeams(QuiverTeams.class, "One in the Quiver Teams", Material.ARROW, (byte)0, GameCategory.TEAM_VARIANT, 30),