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

2
src/main/java/server/CashShop.java
View File

@@ -87,7 +87,7 @@ public class CashShop {
int petid = -1;
if (ItemConstants.isPet(itemId)) {
petid = MaplePet.createPet(itemId);
petid = Pet.createPet(itemId);
}
if (ItemConstants.getInventoryType(itemId).equals(InventoryType.EQUIP)) {

4
src/main/java/server/MapleShop.java
View File

@@ -24,7 +24,7 @@ package server;
import client.MapleClient;
import client.inventory.InventoryType;
import client.inventory.Item;
import client.inventory.MaplePet;
import client.inventory.Pet;
import client.inventory.manipulator.MapleInventoryManipulator;
import constants.inventory.ItemConstants;
import tools.DatabaseConnection;
@@ -138,7 +138,7 @@ public class MapleShop {
int diff = cardreduce + c.getPlayer().getMeso();
if (MapleInventoryManipulator.checkSpace(c, itemId, quantity, "")) {
if (ItemConstants.isPet(itemId)) {
int petid = MaplePet.createPet(itemId);
int petid = Pet.createPet(itemId);
MapleInventoryManipulator.addById(c, itemId, quantity, "", petid, -1);
} else {
MapleInventoryManipulator.addById(c, itemId, quantity, "", -1, -1);

6
src/main/java/server/maps/MapleMap.java
View File

@@ -28,7 +28,7 @@ import client.autoban.AutobanFactory;
import client.inventory.Equip;
import client.inventory.InventoryType;
import client.inventory.Item;
import client.inventory.MaplePet;
import client.inventory.Pet;
import client.status.MonsterStatus;
import client.status.MonsterStatusEffect;
import config.YamlConfig;
@@ -2452,8 +2452,8 @@ public class MapleMap {
chr.sendPacket(PacketCreator.getClock(pqTimer / 1000));
}
MaplePet[] pets = chr.getPets();
for (MaplePet pet : pets) {
Pet[] pets = chr.getPets();
for (Pet pet : pets) {
if (pet != null) {
pet.setPos(getGroundBelow(chr.getPosition()));
chr.sendPacket(PacketCreator.showPet(chr, pet, false, false));

9
src/main/java/server/quest/actions/PetSpeedAction.java
View File

@@ -19,11 +19,10 @@
*/
package server.quest.actions;
import client.MapleClient;
import client.MapleCharacter;
import client.inventory.MaplePet;
import client.MapleClient;
import client.inventory.Pet;
import provider.MapleData;
import provider.MapleDataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestActionType;
@@ -46,12 +45,12 @@ public class PetSpeedAction extends MapleQuestAction {
public void run(MapleCharacter chr, Integer extSelection) {
MapleClient c = chr.getClient();
MaplePet pet = chr.getPet(0); // assuming here only the pet leader will gain owner speed
Pet pet = chr.getPet(0); // assuming here only the pet leader will gain owner speed
if(pet == null) return;
c.lockClient();
try {
pet.addPetFlag(c.getPlayer(), MaplePet.PetFlag.OWNER_SPEED);
pet.addPetFlag(c.getPlayer(), Pet.PetFlag.OWNER_SPEED);
} finally {
c.unlockClient();
}

6
src/main/java/server/quest/actions/PetTamenessAction.java
View File

@@ -19,9 +19,9 @@
*/
package server.quest.actions;
import client.MapleClient;
import client.MapleCharacter;
import client.inventory.MaplePet;
import client.MapleClient;
import client.inventory.Pet;
import provider.MapleData;
import provider.MapleDataTool;
import server.quest.MapleQuest;
@@ -50,7 +50,7 @@ public class PetTamenessAction extends MapleQuestAction {
public void run(MapleCharacter chr, Integer extSelection) {
MapleClient c = chr.getClient();
MaplePet pet = chr.getPet(0); // assuming here only the pet leader will gain tameness
Pet pet = chr.getPet(0); // assuming here only the pet leader will gain tameness
if(pet == null) return;
c.lockClient();

4
src/main/java/server/quest/requirements/MinTamenessRequirement.java
View File

@@ -22,7 +22,7 @@
package server.quest.requirements;
import client.MapleCharacter;
import client.inventory.MaplePet;
import client.inventory.Pet;
import provider.MapleData;
import provider.MapleDataTool;
import server.quest.MapleQuest;
@@ -55,7 +55,7 @@ public class MinTamenessRequirement extends MapleQuestRequirement {
public boolean check(MapleCharacter chr, Integer npcid) {
int curCloseness = 0;
for(MaplePet pet : chr.getPets()) {
for(Pet pet : chr.getPets()) {
if(pet == null) continue;
if(pet.getCloseness() > curCloseness)

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()))