mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-16 14:14:46 +00:00
Fix Quest Item pickup not removing items on Auto Complete Pickup
This commit is contained in:
1 parent
a57bf10031
commit
b7091aa289
3 files changed
+20
-19
No files matched your search
@@ -13,6 +13,7 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ChatComponentTranslation;
|
||||
import net.minecraft.world.WorldServer;
|
||||
import net.minecraftforge.common.ForgeHooks;
|
||||
import net.minecraftforge.common.util.FakePlayer;
|
||||
import net.minecraftforge.event.entity.EntityStruckByLightningEvent;
|
||||
import net.minecraftforge.event.entity.PlaySoundAtEntityEvent;
|
||||
import net.minecraftforge.event.entity.item.ItemTossEvent;
|
||||
@@ -23,10 +24,12 @@ import noppes.npcs.api.entity.IPlayer;
|
||||
import noppes.npcs.constants.EnumPacketClient;
|
||||
import noppes.npcs.constants.EnumQuestType;
|
||||
import noppes.npcs.constants.SyncType;
|
||||
import noppes.npcs.controllers.PartyController;
|
||||
import noppes.npcs.controllers.PlayerDataController;
|
||||
import noppes.npcs.controllers.ScriptController;
|
||||
import noppes.npcs.controllers.data.*;
|
||||
import noppes.npcs.entity.EntityNPCInterface;
|
||||
import noppes.npcs.quests.QuestItem;
|
||||
import noppes.npcs.scripted.NpcAPI;
|
||||
import noppes.npcs.scripted.item.ScriptCustomItem;
|
||||
|
||||
@@ -236,6 +239,21 @@ public class ScriptPlayerEventHandler {
|
||||
if(event.player == null || event.player.worldObj == null)
|
||||
return;
|
||||
|
||||
if(!event.player.worldObj.isRemote && !(event.player instanceof FakePlayer)){
|
||||
PlayerData playerData = PlayerDataController.Instance.getPlayerData(event.player);
|
||||
PlayerQuestData questData = playerData.questData;
|
||||
QuestItem.pickedUp = event.pickedUp.getEntityItem();
|
||||
|
||||
Party playerParty = playerData.getPlayerParty();
|
||||
if(playerParty != null){
|
||||
QuestItem.pickedUpParty = event.pickedUp.getEntityItem();
|
||||
QuestItem.pickedUpPlayer = event.player;
|
||||
PartyController.Instance().checkQuestCompletion(playerParty, EnumQuestType.Item);
|
||||
}
|
||||
|
||||
questData.checkQuestCompletion(playerData, EnumQuestType.Item);
|
||||
}
|
||||
|
||||
if(event.player.worldObj instanceof WorldServer) {
|
||||
PlayerDataScript handler = ScriptController.Instance.playerScripts;
|
||||
IPlayer scriptPlayer = (IPlayer) NpcAPI.Instance().getIEntity(event.player);
|
||||
|
||||
Reference in new issue
Block a user