Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename and clean up MaplePet

Browse Source
This commit is contained in:
P0nk
2021-09-09 20:51:30 +02:00
parent 5ed7cf73d1
commit 6ca5abd896
25 changed files with 121 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/server/quest/requirements/PetRequirement.java
View File

@@ -22,14 +22,15 @@
package server.quest.requirements;
import client.MapleCharacter;
import client.inventory.MaplePet;
import java.util.ArrayList;
import java.util.List;
import client.inventory.Pet;
import provider.MapleData;
import provider.MapleDataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
import java.util.ArrayList;
import java.util.List;
/**
*
* @author Tyler (Twdtwd)
@@ -54,7 +55,7 @@ public class PetRequirement extends MapleQuestRequirement {
@Override
public boolean check(MapleCharacter chr, Integer npcid) {
for(MaplePet pet : chr.getPets()) {
for(Pet pet : chr.getPets()) {
if(pet == null) continue; // thanks Arufonsu for showing a NPE occurring here
if(petIDs.contains(pet.getItemId()))