-Quests with complete text now complete the quest in data before showing the text GUI, instead of being completed when that GUI is closed.

Item Quests:
Some fixes to item quest completion when an item is picked up.
This commit is contained in:
Luis C.M committed 2022-06-13 04:08:36 -05:00
1 parent 1293fabca9
commit dfec85484b
7 files changed
+17 -11

No files matched your search

@@ -18,6 +18,7 @@ import noppes.npcs.controllers.PlayerDataController;
import noppes.npcs.controllers.QuestController;
import noppes.npcs.entity.EntityNPCInterface;
import noppes.npcs.quests.QuestInterface;
import noppes.npcs.quests.QuestItem;
import noppes.npcs.scripted.interfaces.handler.IPlayerQuestData;
import noppes.npcs.scripted.interfaces.handler.data.IQuest;
@@ -122,7 +123,7 @@ public class PlayerQuestData implements IPlayerQuestData {
QuestInterface inter = data.quest.questInterface;
if(inter.isCompleted(playerData)){
if(!data.isCompleted){
if(!data.quest.complete(player,data)){
if(!data.quest.complete(player,data) || data.quest.completeText.isEmpty()){
Server.sendData((EntityPlayerMP)player, EnumPacketClient.MESSAGE, "quest.completed", data.quest.title);
Server.sendData((EntityPlayerMP)player, EnumPacketClient.CHAT, "quest.completed",": ",data.quest.title);
}
@@ -134,6 +135,7 @@ public class PlayerQuestData implements IPlayerQuestData {
else
data.isCompleted = false;
}
QuestItem.pickedUp = null;
return bo;
}
@@ -3,10 +3,7 @@ package noppes.npcs.controllers.data;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.ICompatibilty;
import noppes.npcs.NpcMiscInventory;
import noppes.npcs.Server;
import noppes.npcs.VersionCompatibility;
import noppes.npcs.*;
import noppes.npcs.constants.EnumPacketClient;
import noppes.npcs.constants.EnumQuestCompletion;
import noppes.npcs.constants.EnumQuestRepeat;
@@ -138,6 +135,7 @@ public class Quest implements ICompatibilty, IQuest {
public boolean complete(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;
}