Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-12-31 21:48:04 +01:00
Code Issues Projects Releases Wiki Activity

Squash some bugs

Browse Source
This commit is contained in:
BuildTools 2018-12-10 18:24:48 -05:00
parent 9c1c19d623
commit 1f6a410723
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/me/blackvein/quests/Event.java
View File

@ -178,7 +178,7 @@ public class Event {
} else if (other.teleport == null && teleport != null) {
return false;
}
if (other.book != book) {
if (!other.book.equals(book)) {
return false;
}
}
@ -259,11 +259,13 @@ public class Event {
if (teleport != null) {
player.teleport(teleport);
}
if (!(book == null && book.isEmpty())) {
if (Quests.citizensBooks != null) {
if (Quests.citizensBooks.hasFilter(book)) {
Quests.citizensBooks.openBook(player, Quests.citizensBooks.getFilter(book));
}
if (book != null) {
if (!book.isEmpty()) {
if (Quests.citizensBooks != null) {
if (Quests.citizensBooks.hasFilter(book)) {
Quests.citizensBooks.openBook(player, Quests.citizensBooks.getFilter(book));
}
}
}
}
if (failQuest == true) {

4
src/main/java/me/blackvein/quests/Quest.java
View File

@ -699,10 +699,10 @@ public class Quest {
if (other.orderedStages.equals(orderedStages) == false) {
return false;
}
if (other.startPlanner != startPlanner) {
if (!other.startPlanner.equals(startPlanner)) {
return false;
}
if (other.endPlanner != endPlanner) {
if (!other.endPlanner.equals(endPlanner)) {
return false;
}
if (other.repeatPlanner != repeatPlanner) {

2
src/main/java/me/blackvein/quests/util/ItemUtil.java
View File

@ -260,7 +260,7 @@ public class ItemUtil {
if (!lore.isEmpty()) {
meta.setLore(lore);
}
if (flags[0] != null && flags[0].toString() != "") {
if (flags[0] != null && flags[0].toString().equals("")) {
for (ItemFlag flag : flags) {
if (flag != null) {
try {