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

Add resource pack and other fixes

Browse Source
This commit is contained in:
William Burns 2016-01-19 14:00:23 +00:00
parent f22297418c
commit 7af8d78fc3
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,7 +86,7 @@ public enum GameType
DragonRiders(DragonRiders.class, GameDisplay.DragonRiders),
Dragons(Dragons.class, GameDisplay.Dragons),
DragonsTeams(DragonsTeams.class, GameDisplay.DragonsTeams),
Draw(Draw.class, GameDisplay.Draw),
Draw(Draw.class, GameDisplay.Draw, "http://chivebox.com/mineplex/ResDrawMyThing.zip", true),
Evolution(Evolution.class, GameDisplay.Evolution),
Gravity(Gravity.class, GameDisplay.Gravity),
Halloween(Halloween.class, GameDisplay.Halloween, "http://file.mineplex.com/ResHalloween.zip", true),

21
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/draw/Draw.java
View File

@ -363,16 +363,15 @@ public class Draw extends SoloGame
drawer.setAllowFlight(true);
drawer.setFlying(true);
drawer.setFlySpeed(0.4f);
drawer.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.WOOD_SWORD, (byte) 0, 1, "Thin Paint Brush"));
drawer.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.IRON_SWORD, (byte) 0, 1, "Thick Paint Brush"));
drawer.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.IRON_SWORD, (byte) 0, 1, "Paint Brush"));
drawer.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.STONE_SWORD, (byte) 0, 1, "Line Tool"));
drawer.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.GOLD_SWORD, (byte)0, 1, "Square Tool"));
drawer.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.DIAMOND_SWORD, (byte)0, 1, "Circle Tool"));
drawer.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.IRON_BLOCK, (byte)0, 1, "Spray Can"));
drawer.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.WOOD_SWORD, (byte)0, 1, "Spray Can"));
drawer.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.BUCKET, (byte)0, 1, "Paint Bucket"));
drawer.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.TNT, (byte)0, 1, "Clear Canvas"));
drawer.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.IRON_HOE, (byte)0, 1, "Paint Bucket"));
drawer.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.GOLD_HOE, (byte)0, 1, "Clear Canvas"));
Announce(C.cGold + C.Bold + "Round " + (_roundCount+1) + ": " + C.cYellow + C.Bold + drawer.getName() + " is drawing!");
}
@ -568,7 +567,7 @@ public class Draw extends SoloGame
for (Player player : _drawers.GetPlayers(true))
{
if (!UtilGear.isMat(player.getItemInHand(), Material.WOOD_SWORD) && !UtilGear.isMat(player.getItemInHand(), Material.IRON_SWORD) && !UtilGear.isMat(player.getItemInHand(), Material.IRON_BLOCK))
if (!UtilGear.isMat(player.getItemInHand(), Material.WOOD_SWORD) && !UtilGear.isMat(player.getItemInHand(), Material.IRON_SWORD))
continue;
if (!player.isBlocking())
@ -600,7 +599,7 @@ public class Draw extends SoloGame
}
//Spray Can
if (UtilGear.isMat(player.getItemInHand(), Material.IRON_BLOCK))
if (UtilGear.isMat(player.getItemInHand(), Material.WOOD_SWORD))
{
for (Block other : UtilBlock.getSurrounding(block, false))
{
@ -641,7 +640,7 @@ public class Draw extends SoloGame
}
//Spray Can
if (UtilGear.isMat(player.getItemInHand(), Material.IRON_BLOCK))
if (UtilGear.isMat(player.getItemInHand(), Material.WOOD_SWORD))
{
for (Block other : UtilBlock.getSurrounding(fixBlock, false))
{
@ -674,7 +673,7 @@ public class Draw extends SoloGame
Player player = event.getPlayer();
if (!UtilGear.isMat(player.getItemInHand(), Material.TNT))
if (!UtilGear.isMat(player.getItemInHand(), Material.GOLD_HOE))
return;
if (!_drawers.HasPlayer(player))
@ -703,7 +702,7 @@ public class Draw extends SoloGame
Player player = event.getPlayer();
if (!UtilGear.isMat(player.getItemInHand(), Material.BUCKET))
if (!UtilGear.isMat(player.getItemInHand(), Material.IRON_HOE))
return;
if (!_drawers.HasPlayer(player))