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

More fixes

This commit is contained in:
Sam 2018-07-23 01:28:50 +01:00 committed by Alexander Meech
parent ce1a17c0a4
commit c54587590b
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Mineplex.Core/src/mineplex/core/mission/MissionLength.java
View File

@ -12,7 +12,7 @@ public enum MissionLength
{ {
DAY("Daily", "tomorrow", UtilText.splitLineToArray(C.cGray + "Here you will find missions that reset every day. Missions only reset if you've completed them or you've discarded them, click on an active mission to discard it.", LineFormat.LORE), ChatColor.WHITE, 0, 1, Calendar.DAY_OF_WEEK), DAY("Daily", "tomorrow", UtilText.splitLineToArray(C.cGray + "Here you will find missions that reset every day. Missions only reset if you've completed them or you've discarded them, click on an active mission to discard it.", LineFormat.LORE), ChatColor.WHITE, 0, 1, Calendar.DAY_OF_WEEK),
WEEK("Weekly", "next week", UtilText.splitLineToArray(C.cGray + "These missions will rotate out every Monday. They are daily missions that have an increased objective and rewards.", LineFormat.LORE), ChatColor.GREEN, 7, 5, Calendar.WEEK_OF_YEAR), WEEK("Weekly", "next week", UtilText.splitLineToArray(C.cGray + "These missions will rotate out every Monday. They are weekly missions that have an increased objective and rewards.", LineFormat.LORE), ChatColor.GREEN, 7, 5, Calendar.WEEK_OF_YEAR),
EVENT("Event", null, UtilText.splitLineToArray(C.cGray + "These super special missions will only show up every once in a while and come with a super special reward!", LineFormat.LORE), ChatColor.LIGHT_PURPLE, 10, 1, -1); EVENT("Event", null, UtilText.splitLineToArray(C.cGray + "These super special missions will only show up every once in a while and come with a super special reward!", LineFormat.LORE), ChatColor.LIGHT_PURPLE, 10, 1, -1);
private final String _name, _resetWhen; private final String _name, _resetWhen;

8
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gladiators/hotbar/HotbarEditor.java
View File

@ -87,11 +87,13 @@ public class HotbarEditor extends Module
@EventHandler(priority = EventPriority.HIGH) @EventHandler(priority = EventPriority.HIGH)
public void Observer(PlayerCommandPreprocessEvent event) public void Observer(PlayerCommandPreprocessEvent event)
{ {
if (getGame() == null || getGame().InProgress())
{
return;
}
if (event.getMessage().equalsIgnoreCase("/spec")) if (event.getMessage().equalsIgnoreCase("/spec"))
{ {
if (getGame() == null)
return;
if (!getGame().IsAlive(event.getPlayer()) if (!getGame().IsAlive(event.getPlayer())
&& !UtilInv.contains(event.getPlayer(), _item.getType(), (byte) 0, 1)) && !UtilInv.contains(event.getPlayer(), _item.getType(), (byte) 0, 1))
{ {

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/creeper/PerkCreeperElectricity.java
View File

@ -30,7 +30,7 @@ public class PerkCreeperElectricity extends Perk
private int _damage; private int _damage;
private float _knockbackMagnitude; private float _knockbackMagnitude;
private Map<UUID, Long> _active = new HashMap<>(); private final Map<UUID, Long> _active = new HashMap<>();
public PerkCreeperElectricity() public PerkCreeperElectricity()
{ {
@ -157,7 +157,7 @@ public class PerkCreeperElectricity extends Perk
event.SetCancelled("Lightning Shield"); event.SetCancelled("Lightning Shield");
// Inform // Inform
UtilPlayer.message(damagee, F.main("Skill", "You hit " + F.elem(UtilEnt.getName(event.GetDamagerPlayer(false))) + " with " + F.skill(GetName()) + ".")); UtilPlayer.message(damagee, F.main("Skill", "You hit " + F.elem(UtilEnt.getName(event.GetDamagerEntity(false))) + " with " + F.skill(GetName()) + "."));
// Elec // Elec
damagee.getWorld().strikeLightningEffect(damagee.getLocation()); damagee.getWorld().strikeLightningEffect(damagee.getLocation());