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

JK I found some more

This commit is contained in:
Dan Mulloy 2017-11-12 23:56:27 -05:00 committed by Alexander Meech
parent f1e48ff90c
commit 1944b2ecc9
6 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Plugins/Mineplex.Core/src/mineplex/core/treasure/animation/TreasureAnimation.java
View File

@ -180,7 +180,8 @@ public abstract class TreasureAnimation implements Runnable
{
onFinish();
TreasureSession session = _treasureLocation.getSession();
UtilServer.CallEvent(new TreasureAnimationFinishEvent(session.getPlayer(), session, this));
if (session != null)
UtilServer.CallEvent(new TreasureAnimationFinishEvent(session.getPlayer(), session, this));
}
}
}

5
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/gamesummary/GameSummaryComponent.java
View File

@ -29,6 +29,11 @@ public abstract class GameSummaryComponent<T>
public boolean sendMessage(Player player)
{
T result = _getFunction.apply(player);
if (result == null)
{
return false;
}
String mainText = getMainText(result);
List<String> hoverText = getHoverText(result);

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/gamesummary/components/LevelUpSummaryComponent.java
View File

@ -23,7 +23,7 @@ public class LevelUpSummaryComponent extends ExperienceSummaryComponent
@Override
public String getMainText(Pair<AchievementLog, AchievementData> data)
{
if (!data.getLeft().LevelUp)
if (data.getLeft() == null || !data.getLeft().LevelUp)
{
return null;
}

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkFletcher.java
View File

@ -3,6 +3,7 @@ package nautilus.game.arcade.kit.perks;
import java.util.HashSet;
import java.util.Iterator;
import mineplex.core.Managers;
import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilGear;
import mineplex.core.common.util.UtilInv;
@ -140,6 +141,9 @@ public class PerkFletcher extends Perk
{
if (event.getType() != UpdateType.FAST)
return;
if (Manager.GetGame() == null)
return;
if (!UtilTime.elapsed(Manager.GetGame().getGameLiveTime(), _time * 1000) && !_instant)
{

9
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/quest/WinQuestTracker.java
View File

@ -12,6 +12,7 @@ import nautilus.game.arcade.Arcade;
import nautilus.game.arcade.events.GameStateChangeEvent;
import nautilus.game.arcade.game.Game;
import nautilus.game.arcade.game.Game.GameState;
import nautilus.game.arcade.kit.Kit;
/**
* WinQuestTracker
@ -41,7 +42,13 @@ public class WinQuestTracker extends QuestTracker<Game>
for (Player player : winners)
{
incrementQuests(player, 1, ((Arcade) UtilServer.getPlugin()).getServerConfig().getServerGroup().getPrefix(), getGame().GetKit(player).GetName() + "Kit");
Kit kit = getGame().GetKit(player);
if (kit != null)
{
incrementQuests(player, 1,
((Arcade) UtilServer.getPlugin()).getServerConfig().getServerGroup().getPrefix(),
kit.GetName() + "Kit");
}
}
}

2
Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/quest/types/KillPlayerQuest.java
View File

@ -46,7 +46,7 @@ public class KillPlayerQuest extends Quest
{
Player player = event.getPlayer();
if (!isActive(player) || !event.getReason().startsWith("Killing"))
if (!isActive(player) || event.getReason() == null || !event.getReason().startsWith("Killing"))
{
return;
}