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

Rename and clean up MapleHiredMerchant

Browse Source
This commit is contained in:
P0nk
2021-09-09 22:22:34 +02:00
parent 897f2a857f
commit d35969dea5
9 changed files with 142 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/client/Character.java
View File

@@ -151,7 +151,7 @@ public class Character extends AbstractCharacterObject {
private int merchantmeso;
private BuddyList buddylist;
private EventInstanceManager eventInstance = null;
private MapleHiredMerchant hiredMerchant = null;
private HiredMerchant hiredMerchant = null;
private Client client;
private GuildCharacter mgc = null;
private PartyCharacter mpc = null;
@@ -5032,7 +5032,7 @@ public class Character extends AbstractCharacterObject {
return hair;
}
public MapleHiredMerchant getHiredMerchant() {
public HiredMerchant getHiredMerchant() {
return hiredMerchant;
}
@@ -5575,7 +5575,7 @@ public class Character extends AbstractCharacterObject {
}
public void closeHiredMerchant(boolean closeMerchant) {
MapleHiredMerchant merchant = this.getHiredMerchant();
HiredMerchant merchant = this.getHiredMerchant();
if (merchant == null) {
return;
}
@@ -8997,7 +8997,7 @@ public class Character extends AbstractCharacterObject {
}
}
public void setHiredMerchant(MapleHiredMerchant merchant) {
public void setHiredMerchant(HiredMerchant merchant) {
this.hiredMerchant = merchant;
}