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

Rename and clean up MapleSkinColor

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:24:36 +02:00
parent 448c02033d
commit 8f91d8e7ac
4 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -165,7 +165,7 @@ public class Character extends AbstractCharacterObject {
private final Pet[] pets = new Pet[3];
private MaplePlayerShop playerShop = null;
private MapleShop shop = null;
private MapleSkinColor skinColor = MapleSkinColor.NORMAL;
private SkinColor skinColor = SkinColor.NORMAL;
private MapleStorage storage = null;
private MapleTrade trade = null;
private MonsterBook monsterbook;
@@ -5830,7 +5830,7 @@ public class Character extends AbstractCharacterObject {
return skills.get(skill).expiration;
}
public MapleSkinColor getSkinColor() {
public SkinColor getSkinColor() {
return skinColor;
}
@@ -6848,7 +6848,7 @@ public class Character extends AbstractCharacterObject {
ret.id = rs.getInt("id");
ret.name = rs.getString("name");
ret.gender = rs.getInt("gender");
ret.skinColor = MapleSkinColor.getById(rs.getInt("skincolor"));
ret.skinColor = SkinColor.getById(rs.getInt("skincolor"));
ret.face = rs.getInt("face");
ret.hair = rs.getInt("hair");
@@ -6992,7 +6992,7 @@ public class Character extends AbstractCharacterObject {
ret.meso.set(rs.getInt("meso"));
ret.merchantmeso = rs.getInt("MerchantMesos");
ret.setGMLevel(rs.getInt("gm"));
ret.skinColor = MapleSkinColor.getById(rs.getInt("skincolor"));
ret.skinColor = SkinColor.getById(rs.getInt("skincolor"));
ret.gender = rs.getInt("gender");
ret.job = Job.getById(rs.getInt("job"));
ret.finishedDojoTutorial = rs.getInt("finishedDojoTutorial") == 1;
@@ -9285,7 +9285,7 @@ public class Character extends AbstractCharacterObject {
search = find;
}
public void setSkinColor(MapleSkinColor skinColor) {
public void setSkinColor(SkinColor skinColor) {
this.skinColor = skinColor;
}