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

Browse Source
This commit is contained in:
Jonathan Williams 2013-11-26 17:48:40 -08:00
commit 31517d679a
2 changed files with 136 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hungergames/HungerGames.java
View File

@ -459,7 +459,7 @@ public class HungerGames extends SoloGame
} }
System.out.println(material + " " + (count / _baseChestLoot.size() * 100) + "%"); System.out.println(material + " " + (count / _baseChestLoot.size() * 100) + "%");
*/ */
} }
if (_superChestLoot.isEmpty()) if (_superChestLoot.isEmpty())
@ -665,8 +665,8 @@ public class HungerGames extends SoloGame
return false; return false;
//Inside Boundary //Inside Boundary
if (UtilMath.offset(_spawn, block.getLocation()) < 48) if (UtilMath.offset(_spawn, block.getLocation()) < 48)
return false; return false;
//Liquid //Liquid
if (block.isLiquid()) if (block.isLiquid())
@ -770,7 +770,7 @@ public class HungerGames extends SoloGame
return; return;
} }
*/ */
//Non-Queue //Non-Queue
for (Player player : UtilServer.getPlayers()) for (Player player : UtilServer.getPlayers())
@ -817,7 +817,7 @@ public class HungerGames extends SoloGame
ChunkChange change = chunkIterator.next(); ChunkChange change = chunkIterator.next();
if (Math.abs(player.getLocation().getChunk().getX() - change.Chunk.getX()) > UtilServer.getServer().getViewDistance() || if (Math.abs(player.getLocation().getChunk().getX() - change.Chunk.getX()) > UtilServer.getServer().getViewDistance() ||
Math.abs(player.getLocation().getChunk().getZ() - change.Chunk.getZ()) > UtilServer.getServer().getViewDistance()) Math.abs(player.getLocation().getChunk().getZ() - change.Chunk.getZ()) > UtilServer.getServer().getViewDistance())
{ {
chunkIterator.remove(); chunkIterator.remove();
} }
@ -1396,7 +1396,8 @@ public class HungerGames extends SoloGame
return; return;
if (event.getClickedBlock().getType() == Material.BREWING_STAND || if (event.getClickedBlock().getType() == Material.BREWING_STAND ||
event.getClickedBlock().getType() == Material.FURNACE) event.getClickedBlock().getType() == Material.FURNACE ||
event.getClickedBlock().getType() == Material.BURNING_FURNACE)
event.setCancelled(true); event.setCancelled(true);
} }

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWolfPet.java
View File

@ -200,7 +200,7 @@ public class PerkWolfPet extends Perk
if (event.getPlayer().getItemInHand() == null) if (event.getPlayer().getItemInHand() == null)
return; return;
if (!event.getPlayer().getItemInHand().getType().toString().contains("_AXE")) if (!event.getPlayer().getItemInHand().getType().toString().contains("_AXE") && !event.getPlayer().getItemInHand().getType().toString().contains("_SWORD"))
return; return;
Player player = event.getPlayer(); Player player = event.getPlayer();