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

fixed bacon blast exloding blocks

Browse Source 
fixed sg compass pointing to teammates
This commit is contained in:
fooify 2015-11-28 09:31:57 -08:00
parent f8401e0eeb
commit 0dff0ffe1d
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -941,7 +941,7 @@ public abstract class SurvivalGames extends Game
for (Player alive : GetPlayers(true))
{
if (alive != player)
if (alive != player && getArcadeManager().canHurt(player, alive))
{
double distance = alive.getLocation().distance(
player.getLocation());
@ -1546,7 +1546,7 @@ public abstract class SurvivalGames extends Game
// Misc
_baseLoot.addLoot(new RandomItem(Material.EXP_BOTTLE, 30, 1, 2));
_baseLoot.addLoot(new RandomItem(Material.COMPASS, 20));
_baseLoot.addLoot(new RandomItem(Material.COMPASS, 1000));//20
_baseLoot.addLoot(new RandomItem(Material.STICK, 30, 1, 2));
_baseLoot.addLoot(new RandomItem(Material.BOAT, 15));
_baseLoot.addLoot(new RandomItem(Material.FLINT, 30, 1, 2));

5
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkBaconBlast.java
View File

@ -1,5 +1,6 @@
package nautilus.game.arcade.kit.perks;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.Sound;
import org.bukkit.block.Block;
@ -109,7 +110,9 @@ public class PerkBaconBlast extends Perk implements IThrown
public void Explode(ProjectileUser data)
{
data.GetThrown().getWorld().createExplosion(data.GetThrown().getLocation(), 0.5f);
// for whatever reason, you can't put a location in createExplosion if you don't want it to break blocks >.>
Location loc = data.GetThrown().getLocation();
data.GetThrown().getWorld().createExplosion(loc.getX(), loc.getY(), loc.getZ(), 0.5f, false, false);
data.GetThrown().remove();
}
}