upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-12 00:17:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added a quest alert toggle for each quest in the quest log.

Browse Source 
Fixed instant complete quests not finishing sometimes.
This commit is contained in:
Luis C.M committed 2023-03-16 23:37:57 -05:00
1 parent e58b494979
commit df069c82c2
14 files changed
+133 -75
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/noppes/npcs/ServerEventsHandler.java
+25 -19
View File
@@ -292,48 +292,54 @@ public class ServerEventsHandler {
private void doQuest(EntityPlayer player, EntityLivingBase entity, boolean all) {
PlayerData playerData = PlayerDataController.instance.getPlayerData(player);
PlayerQuestData questData = playerData.questData;
boolean change = false;
boolean checkCompletion = false;
String entityName = EntityList.getEntityString(entity);
ArrayList<QuestData> activeQuestValues = new ArrayList<>(questData.activeQuests.values());
for(QuestData data : activeQuestValues){
if(data.quest.type != EnumQuestType.Kill && data.quest.type != EnumQuestType.AreaKill)
if (data.quest.type != EnumQuestType.Kill && data.quest.type != EnumQuestType.AreaKill)
continue;
if(data.quest.type == EnumQuestType.AreaKill && all){
List<EntityPlayer> list = player.worldObj.getEntitiesWithinAABB(EntityPlayer.class, entity.boundingBox.expand(10, 10, 10));
for(EntityPlayer pl : list)
if(pl != player)
doQuest(pl, entity, false);
if (data.quest.type == EnumQuestType.AreaKill && all) {
List<EntityPlayer> list = player.worldObj.getEntitiesWithinAABB(EntityPlayer.class, entity.boundingBox.expand(10, 10, 10));
for (EntityPlayer pl : list) {
if (pl != player) {
doQuest(pl, entity, false);
}
}
}
String name = entityName;
QuestKill quest = (QuestKill) data.quest.questInterface;
Class entityType = EntityNPCInterface.class;
if(quest.targetType == 2) {
if (quest.targetType == 2) {
try {
entityType = Class.forName(quest.customTargetType);
} catch (ClassNotFoundException notFoundException) {
continue;
}
}
if(quest.targetType > 0 && !(entityType.isInstance(entity)))
if (quest.targetType > 0 && !(entityType.isInstance(entity)))
continue;
if(quest.targets.containsKey(entity.getCommandSenderName()))
if (quest.targets.containsKey(entity.getCommandSenderName()))
name = entity.getCommandSenderName();
else if(!quest.targets.containsKey(name))
else if (!quest.targets.containsKey(name))
continue;
checkCompletion = true;
HashMap<String, Integer> killed = quest.getKilled(data);
if(killed.containsKey(name) && killed.get(name) >= quest.targets.get(name))
continue;
int amount = 0;
if(killed.containsKey(name))
amount = killed.get(name);
killed.put(name, amount + 1);
if (!killed.containsKey(name)) {
killed.put(name, 1);
} else if(killed.get(name) < quest.targets.get(name)) {
int amount = killed.get(name);
killed.put(name, amount + 1);
}
quest.setKilled(data, killed);
change = true;
}
if(!change)
if(!checkCompletion)
return;
questData.checkQuestCompletion(playerData,EnumQuestType.Kill);