mc
/
minions-plus
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix NPE

master
loganb1max 2020-01-05 15:15:05 +07:00
parent a4e76e8383
commit c621a0ed07
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/me/loganb1max/minionsplus/manager/MinionManager.java
Unescape Escape View File

@ -111,7 +111,7 @@ public class MinionManager implements Listener {
@EventHandler(priority = EventPriority.HIGHEST)
public void onRightClick(final PlayerArmorStandManipulateEvent e) {
this.minions.stream().filter(minion -> minion.getId().equals(e.getRightClicked().getUniqueId())).findFirst().ifPresent(minion -> {
this.minions.stream().filter(minion -> minion.getId() != null).filter(minion -> minion.getId().equals(e.getRightClicked().getUniqueId())).findFirst().ifPresent(minion -> {
e.setCancelled(true);
if (!minion.getOwner().equals(e.getPlayer().getUniqueId())) {
e.getPlayer().sendMessage(Text.color("&cOnly the owner of the minion can interact with it."));

1
src/main/java/me/loganb1max/minionsplus/model/Minion.java
Unescape Escape View File

@ -248,6 +248,7 @@ public abstract class Minion {
toReturn = new BreederMinion(owner, ownerName, location, energy, level, linkedBlocks);
break;
}
toReturn.findStand();
return toReturn;
}