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

Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex

Browse Source
This commit is contained in:
Jonathan Williams 2014-11-15 14:32:40 -08:00
commit 99ff386ac1
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
View File

@ -22,6 +22,7 @@ import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.event.block.BlockSpreadEvent; import org.bukkit.event.block.BlockSpreadEvent;
import org.bukkit.event.block.LeavesDecayEvent; import org.bukkit.event.block.LeavesDecayEvent;
import org.bukkit.event.entity.EntityExplodeEvent; import org.bukkit.event.entity.EntityExplodeEvent;
import org.bukkit.event.entity.EntityShootBowEvent;
import org.bukkit.event.entity.ExplosionPrimeEvent; import org.bukkit.event.entity.ExplosionPrimeEvent;
import org.bukkit.event.entity.ItemSpawnEvent; import org.bukkit.event.entity.ItemSpawnEvent;
import org.bukkit.event.entity.EntityDamageEvent.DamageCause; import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
@ -1680,12 +1681,6 @@ public class SurvivalGames extends SoloGame
Scoreboard.Draw(); Scoreboard.Draw();
} }
@Override
public boolean IsLive()
{
return super.IsLive() && !isDeathMatchAboutToStart();
}
public boolean isDeathMatchAboutToStart() public boolean isDeathMatchAboutToStart()
{ {
if (!_deathmatchLive) if (!_deathmatchLive)
@ -1696,4 +1691,11 @@ public class SurvivalGames extends SoloGame
return true; return true;
} }
@EventHandler
public void deathmatchBowShoot(EntityShootBowEvent event)
{
if (isDeathMatchAboutToStart())
event.getProjectile().remove();
}
} }

18
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
View File

@ -357,16 +357,16 @@ public class WitherGame extends TeamGame implements IBlockRestorer
ArrayList<Location> collisions = new ArrayList<Location>(); ArrayList<Location> collisions = new ArrayList<Location>();
//Fly Speed //Fly Speed
if (player.getLocation().getY() > _yLimit) double speed = 0.06 - (_yLimit - player.getLocation().getY()) * 0.075;
{
player.setFlySpeed(0.06f); if (speed > 0.16)
} speed = 0.16;
else
{ if (speed < 0.015)
double speed = (_yLimit - player.getLocation().getY()) * 0.075; speed = 0.015;
player.setFlySpeed((float)speed);
player.setFlySpeed(Math.max(0.015f, 0.06f - (float)speed));
}
//Bump //Bump
for (Block block : UtilBlock.getInRadius(player.getLocation().add(0, 0.5, 0), 1.5d).keySet()) for (Block block : UtilBlock.getInRadius(player.getLocation().add(0, 0.5, 0), 1.5d).keySet())