Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
This commit is contained in:
commit
31517d679a
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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();
|
||||||
|
|
Loading…
Reference in New Issue