mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-22 13:10:04 +00:00
Added a quest alert toggle for each quest in the quest log.
Fixed instant complete quests not finishing sometimes.
This commit is contained in:
1 parent
e58b494979
commit
df069c82c2
14 files changed
+133
-75
No files matched your search
@@ -124,18 +124,20 @@ public class PlayerQuestData implements IPlayerQuestData {
|
||||
|
||||
QuestInterface inter = data.quest.questInterface;
|
||||
if(inter.isCompleted(playerData)){
|
||||
if(!data.isCompleted){
|
||||
if(!data.quest.complete(player,data) || data.quest.completeText.isEmpty()){
|
||||
if((!data.isCompleted && data.quest.completion == EnumQuestCompletion.Npc) || data.quest.instantComplete(player,data)){
|
||||
if (data.quest.completeText.isEmpty() && data.sendAlerts) {
|
||||
Server.sendData((EntityPlayerMP)player, EnumPacketClient.MESSAGE, "quest.completed", data.quest.title);
|
||||
Server.sendData((EntityPlayerMP)player, EnumPacketClient.CHAT, "quest.completed",": ",data.quest.title);
|
||||
}
|
||||
data.isCompleted = true;
|
||||
if (data.quest.completion == EnumQuestCompletion.Npc) {
|
||||
EventHooks.onQuestFinished(player, data.quest);
|
||||
}
|
||||
bo = true;
|
||||
EventHooks.onQuestFinished(player,data.quest);
|
||||
}
|
||||
}
|
||||
else
|
||||
} else {
|
||||
data.isCompleted = false;
|
||||
}
|
||||
}
|
||||
QuestItem.pickedUp = null;
|
||||
return bo;
|
||||
|
||||
@@ -130,9 +130,8 @@ public class Quest implements ICompatibilty, IQuest {
|
||||
return QuestController.instance == null?null:QuestController.instance.quests.get(nextQuestid);
|
||||
}
|
||||
|
||||
public boolean complete(EntityPlayer player, QuestData data) {
|
||||
if(completion == EnumQuestCompletion.Instant){
|
||||
NoppesUtilPlayer.questCompletion((EntityPlayerMP) player, data.quest.id);
|
||||
public boolean instantComplete(EntityPlayer player, QuestData data) {
|
||||
if(completion == EnumQuestCompletion.Instant && NoppesUtilPlayer.questCompletion((EntityPlayerMP) player, data.quest.id)){
|
||||
Server.sendData((EntityPlayerMP)player, EnumPacketClient.QUEST_COMPLETION, data.quest.writeToNBT(new NBTTagCompound()));
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -5,16 +5,19 @@ import net.minecraft.nbt.NBTTagCompound;
|
||||
public class QuestData {
|
||||
public Quest quest;
|
||||
public boolean isCompleted;
|
||||
public boolean sendAlerts = true;
|
||||
public NBTTagCompound extraData = new NBTTagCompound();
|
||||
public QuestData(Quest quest){
|
||||
this.quest = quest;
|
||||
}
|
||||
public void writeEntityToNBT(NBTTagCompound nbttagcompound){
|
||||
nbttagcompound.setBoolean("QuestCompleted", isCompleted);
|
||||
nbttagcompound.setBoolean("SendAlerts", sendAlerts);
|
||||
nbttagcompound.setTag("ExtraData", extraData);
|
||||
}
|
||||
public void readEntityFromNBT(NBTTagCompound nbttagcompound){
|
||||
isCompleted = nbttagcompound.getBoolean("QuestCompleted");
|
||||
sendAlerts = nbttagcompound.getBoolean("SendAlerts");
|
||||
extraData = nbttagcompound.getCompoundTag("ExtraData");
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user