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/moba

Browse Source
This commit is contained in:
Sam 2017-05-27 16:46:20 +01:00
commit 8f2c84b842
4 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
View File

@ -59,14 +59,14 @@ public enum Achievement
GLOBAL_EGG_HUNTER_2017("2017 Egg Hunter", 4000,
new String[]{"Global.Easter Eggs 2017"},
new String[]{"Find 200 Easter Egg Baskets,",
new String[]{"Find 35 Easter Egg Baskets,",
"during Easter 2017"},
new int[]{200},
new int[]{35},
AchievementCategory.HOLIDAY),
GLOBAL_ALIEN_INVASION("2017 Alien Hub Defender", 4000,
new String[]{"Global.Alien Invasion 2017"},
new String[]{"Kill 50 Aliens in the Lobby,",
new String[]{"Kill 300 Aliens in the Lobby,",
"during the Alien Invasion event"},
new int[]{300},
AchievementCategory.HOLIDAY),

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

@ -42,7 +42,7 @@ public class Alien
_stand.setPassenger(_skeleton);
_stand.setRemoveWhenFarAway(false);
_skeleton.setMaxHealth(4);
_skeleton.setMaxHealth(3);
_skeleton.setRemoveWhenFarAway(false);
EntityEquipment equipment = _skeleton.getEquipment();

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

@ -8,6 +8,7 @@ import java.util.List;
import java.util.Map.Entry;
import java.util.Set;
import nautilus.game.arcade.events.PlayerKitGiveEvent;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.Material;
@ -19,6 +20,8 @@ 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;
@ -190,7 +193,6 @@ public class AlienInvasion extends SoloGame
for (Player player : GetPlayers(true))
{
Manager.GetCondition().Factory().Invisible(GetName(), player, null, Integer.MAX_VALUE, 0, false, false, false);
_score.add(new DragonScore(player, 0));
}
@ -211,6 +213,11 @@ public class AlienInvasion extends SoloGame
_lastBeam = System.currentTimeMillis();
_nextBeam = 10000;
for (Player player : GetPlayers(true))
{
player.sendMessage(F.main("Game", C.cYellow + "Double Tab Space to use your double jump!"));
}
ItemStack glass = new ItemStack(Material.GLASS);
CreatureAllowOverride = true;
@ -229,6 +236,12 @@ public class AlienInvasion extends SoloGame
CreatureAllowOverride = false;
}
@EventHandler
public void invisibility(PlayerKitGiveEvent event)
{
Manager.GetCondition().Factory().Invisible(GetName(), event.getPlayer(), event.getPlayer(), 40, 0, false, false, false);
}
@EventHandler
public void updateAliens(UpdateEvent event)
{
@ -422,6 +435,7 @@ public class AlienInvasion extends SoloGame
for (DragonScore score1 : _score)
{
AddGems(score1.Player, score1.Score, "Map Progress", false, false);
players.add(score1.Player);
}

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

@ -22,6 +22,8 @@ import org.bukkit.util.Vector;
public class PhaserProjectile implements Listener
{
private static final int SHARDS_PER_HIT = 15;
private ArcadeManager _manager;
private Projectile _projectile;
@ -60,13 +62,14 @@ public class PhaserProjectile implements Listener
return;
}
_manager.GetGame().AddGems(damager, SHARDS_PER_HIT, "Aliens Hit", false, true);
damager.playSound(damager.getLocation(), Sound.CHICKEN_EGG_POP, 1, 0.7F);
}
event.SetCancelled("Blaster Snowball");
UtilParticle.PlayParticle(ParticleType.CLOUD, projectile.getLocation(), 0.5F, 0.5F, 0.5F, 0.05F, 5, ViewDist.NORMAL);
_manager.GetDamage().NewDamageEvent(damagee, damager, projectile, DamageCause.CUSTOM, 4, false, true, true, UtilEnt.getName(damager), "Blaster");
_manager.GetDamage().NewDamageEvent(damagee, damager, projectile, DamageCause.CUSTOM, 3, false, true, true, UtilEnt.getName(damager), "Blaster");
UtilServer.Unregister(this);
}