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

Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/leveling

Browse Source
This commit is contained in:
Sam 2017-05-28 16:27:59 +01:00
commit 72ba5e0686
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/alieninvasion/AlienInvasion.java
View File

@ -8,10 +8,11 @@ import java.util.List;
import java.util.Map.Entry;
import java.util.Set;
import nautilus.game.arcade.events.PlayerKitGiveEvent;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.entity.ExperienceOrb;
import org.bukkit.entity.Player;
import org.bukkit.entity.Skeleton;
@ -20,8 +21,6 @@ import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
import org.bukkit.event.entity.EntitySpawnEvent;
import org.bukkit.event.entity.ItemSpawnEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
import org.bukkit.scheduler.BukkitRunnable;
import org.bukkit.scoreboard.Team;
@ -42,6 +41,7 @@ import mineplex.core.utils.UtilVariant;
import nautilus.game.arcade.ArcadeManager;
import nautilus.game.arcade.GameType;
import nautilus.game.arcade.events.GameStateChangeEvent;
import nautilus.game.arcade.events.PlayerKitGiveEvent;
import nautilus.game.arcade.game.SoloGame;
import nautilus.game.arcade.game.games.alieninvasion.kit.KitPlayer;
import nautilus.game.arcade.game.games.dragonescape.DragonScore;
@ -70,6 +70,7 @@ public class AlienInvasion extends SoloGame
return 0;
};
private static final String GAME_COMPLETED_STAT = "Alien Invasion Chest Given";
private final List<BeamSource> _sources = new ArrayList<>();
private final List<Location> _targets = new ArrayList<>();
@ -96,6 +97,11 @@ public class AlienInvasion extends SoloGame
new CompassModule()
.register(this);
for (World world : Bukkit.getWorlds())
{
world.setTime(18000);
}
}
@Override
@ -371,6 +377,24 @@ public class AlienInvasion extends SoloGame
// Reward title
if (score.Score == _path.size() - 1)
{
if (Manager.GetStatsManager().Get(player).getStat(GAME_COMPLETED_STAT) == 0)
{
Manager.GetStatsManager().incrementStat(player, GAME_COMPLETED_STAT, 1);
Manager.getInventoryManager().addItemToInventory(success ->
{
if (success)
{
player.sendMessage(F.main("Game", "Unlocked 1 " + C.cAqua + "Omega Chest" + C.mBody + "."));
}
else
{
player.sendMessage(F.main("Game", "Failed to give you your Omega Chest, you should inform a staff member!"));
}
}, player, "Omega Chest", 1);
}
TrackManager trackManager = Manager.getTrackManager();
Track track = trackManager.getTrack(AlienInvasionTrack.class);

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/alieninvasion/PhaserProjectile.java
View File

@ -22,7 +22,7 @@ import org.bukkit.util.Vector;
public class PhaserProjectile implements Listener
{
private static final int SHARDS_PER_HIT = 15;
private static final int SHARDS_PER_HIT = 5;
private ArcadeManager _manager;
private Projectile _projectile;