Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
This commit is contained in:
commit
25782813f4
|
@ -42,6 +42,7 @@ import org.bukkit.event.player.PlayerMoveEvent;
|
||||||
import org.bukkit.event.player.PlayerQuitEvent;
|
import org.bukkit.event.player.PlayerQuitEvent;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
import org.bukkit.inventory.meta.ItemMeta;
|
import org.bukkit.inventory.meta.ItemMeta;
|
||||||
|
import org.bukkit.util.Vector;
|
||||||
|
|
||||||
import mineplex.core.common.util.C;
|
import mineplex.core.common.util.C;
|
||||||
import mineplex.core.common.util.F;
|
import mineplex.core.common.util.F;
|
||||||
|
@ -908,17 +909,11 @@ public class HungerGames extends SoloGame
|
||||||
{
|
{
|
||||||
if (Math.random() > 0.8)
|
if (Math.random() > 0.8)
|
||||||
{
|
{
|
||||||
/*
|
|
||||||
Vector traj = UtilAlg.getTrajectory(block.getLocation().add(0.5, 1.5, 0.5), player.getLocation());
|
Vector traj = UtilAlg.getTrajectory(block.getLocation().add(0.5, 1.5, 0.5), player.getLocation());
|
||||||
|
|
||||||
Snowball ball = player.getWorld().spawn(block.getLocation().add(0.5, 1.5, 0.5).subtract(traj.clone().multiply(8 + UtilMath.r(8))), Snowball.class);
|
Snowball ball = player.getWorld().spawn(block.getLocation().add(0.5, 1.5, 0.5).subtract(traj.clone().multiply(8 + UtilMath.r(8))), Snowball.class);
|
||||||
|
|
||||||
ball.setVelocity(UtilAlg.getTrajectory(ball.getLocation(), player.getEyeLocation().add(0, 3, 0)).add(new Vector(Math.random()-0.5, Math.random()-0.5, Math.random()-0.5).multiply(0.1)));
|
ball.setVelocity(UtilAlg.getTrajectory(ball.getLocation(), player.getEyeLocation().add(0, 3, 0)).add(new Vector(Math.random()-0.5, Math.random()-0.5, Math.random()-0.5).multiply(0.1)));
|
||||||
*/
|
|
||||||
|
|
||||||
player.playEffect(block.getLocation(), Effect.STEP_SOUND, Material.OBSIDIAN);
|
|
||||||
|
|
||||||
player.sendMessage("Block @ " + UtilWorld.locToStrClean(block.getLocation()));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1026,7 +1021,7 @@ public class HungerGames extends SoloGame
|
||||||
|
|
||||||
if (time > 14000 && time < 23000)
|
if (time > 14000 && time < 23000)
|
||||||
{
|
{
|
||||||
if (_supplyCurrent == null)
|
if (_supplyCurrent == null && !_deathmatchCountdown && !_deathmatchLive)
|
||||||
{
|
{
|
||||||
if (_supplyLocations.isEmpty())
|
if (_supplyLocations.isEmpty())
|
||||||
return;
|
return;
|
||||||
|
@ -1189,6 +1184,9 @@ public class HungerGames extends SoloGame
|
||||||
if (UtilMath.offset2d(event.getFrom(), event.getTo()) == 0)
|
if (UtilMath.offset2d(event.getFrom(), event.getTo()) == 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
if (!IsAlive(event.getPlayer()))
|
||||||
|
return;
|
||||||
|
|
||||||
event.setTo(event.getFrom());
|
event.setTo(event.getFrom());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue