From f4f5e12a5049b69dcceb51557e55c7e2bd336695 Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 9 Sep 2021 21:22:04 +0200 Subject: [PATCH] Rename and clean up MapleMount --- src/main/java/client/Character.java | 12 ++++++------ .../java/client/{MapleMount.java => Mount.java} | 17 ++++++++++------- .../channel/handlers/PlayerLoggedinHandler.java | 2 +- .../channel/handlers/UseMountFoodHandler.java | 4 ++-- src/main/java/server/MapleStatEffect.java | 2 +- src/main/java/tools/PacketCreator.java | 8 ++++---- 6 files changed, 24 insertions(+), 21 deletions(-) rename src/main/java/client/{MapleMount.java => Mount.java} (93%) diff --git a/src/main/java/client/Character.java b/src/main/java/client/Character.java index aad4d0da79..c8fecfd9e0 100644 --- a/src/main/java/client/Character.java +++ b/src/main/java/client/Character.java @@ -160,7 +160,7 @@ public class Character extends AbstractCharacterObject { private MapleMessenger messenger = null; private MapleMiniGame miniGame; private MapleRockPaperScissor rps; - private MapleMount maplemount; + private Mount maplemount; private MapleParty party; private final Pet[] pets = new Pet[3]; private MaplePlayerShop playerShop = null; @@ -5372,7 +5372,7 @@ public class Character extends AbstractCharacterObject { return bookCover; } - public MapleMount getMount() { + public Mount getMount() { return maplemount; } @@ -7424,9 +7424,9 @@ public class Character extends AbstractCharacterObject { final int mountid = ret.getJobType() * 10000000 + 1004; if (ret.getInventory(InventoryType.EQUIPPED).getItem((short) -18) != null) { - ret.maplemount = new MapleMount(ret, ret.getInventory(InventoryType.EQUIPPED).getItem((short) -18).getItemId(), mountid); + ret.maplemount = new Mount(ret, ret.getInventory(InventoryType.EQUIPPED).getItem((short) -18).getItemId(), mountid); } else { - ret.maplemount = new MapleMount(ret, 0, mountid); + ret.maplemount = new Mount(ret, 0, mountid); } ret.maplemount.setExp(mountexp); ret.maplemount.setLevel(mountlevel); @@ -7540,8 +7540,8 @@ public class Character extends AbstractCharacterObject { } } - public MapleMount mount(int id, int skillid) { - MapleMount mount = maplemount; + public Mount mount(int id, int skillid) { + Mount mount = maplemount; mount.setItemId(id); mount.setSkillId(skillid); return mount; diff --git a/src/main/java/client/MapleMount.java b/src/main/java/client/Mount.java similarity index 93% rename from src/main/java/client/MapleMount.java rename to src/main/java/client/Mount.java index 020eef4f26..c360fab006 100644 --- a/src/main/java/client/MapleMount.java +++ b/src/main/java/client/Mount.java @@ -24,7 +24,7 @@ package client; /** * @author PurpleMadness < Patrick :O > */ -public class MapleMount { +public class Mount { private int itemid; private int skillid; private int tiredness; @@ -33,7 +33,7 @@ public class MapleMount { private Character owner; private boolean active; - public MapleMount(Character owner, int id, int skillid) { + public Mount(Character owner, int id, int skillid) { this.itemid = id; this.skillid = skillid; this.tiredness = 0; @@ -63,6 +63,7 @@ public class MapleMount { * 1902010 - Frog * 1902011 - Turtle * 1902012 - Yeti + * * @return the id */ public int getId() { @@ -90,7 +91,7 @@ public class MapleMount { tiredness = 0; } } - + public int incrementAndGetTiredness() { this.tiredness++; return this.tiredness; @@ -107,7 +108,7 @@ public class MapleMount { public void setItemId(int newitemid) { this.itemid = newitemid; } - + public void setSkillId(int newskillid) { this.skillid = newskillid; } @@ -119,9 +120,11 @@ public class MapleMount { public boolean isActive() { return active; } - + public void empty() { - if(owner != null) owner.getClient().getWorldServer().unregisterMountHunger(owner); + if (owner != null) { + owner.getClient().getWorldServer().unregisterMountHunger(owner); + } this.owner = null; - } + } } diff --git a/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java b/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java index bdf1252437..d6def2b7d8 100644 --- a/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java +++ b/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java @@ -345,7 +345,7 @@ public final class PlayerLoggedinHandler extends AbstractPacketHandler { } } - MapleMount mount = player.getMount(); // thanks Ari for noticing a scenario where Silver Mane quest couldn't be started + Mount mount = player.getMount(); // thanks Ari for noticing a scenario where Silver Mane quest couldn't be started if (mount.getItemId() != 0) { player.sendPacket(PacketCreator.updateMount(player.getId(), mount, false)); } diff --git a/src/main/java/net/server/channel/handlers/UseMountFoodHandler.java b/src/main/java/net/server/channel/handlers/UseMountFoodHandler.java index 5fb2711d4c..56a049df0d 100644 --- a/src/main/java/net/server/channel/handlers/UseMountFoodHandler.java +++ b/src/main/java/net/server/channel/handlers/UseMountFoodHandler.java @@ -23,7 +23,7 @@ package net.server.channel.handlers; import client.Character; import client.Client; -import client.MapleMount; +import client.Mount; import client.inventory.Inventory; import client.inventory.InventoryType; import client.inventory.Item; @@ -45,7 +45,7 @@ public final class UseMountFoodHandler extends AbstractPacketHandler { int itemid = p.readInt(); Character chr = c.getPlayer(); - MapleMount mount = chr.getMount(); + Mount mount = chr.getMount(); Inventory useInv = chr.getInventory(InventoryType.USE); if (c.tryacquireClient()) { diff --git a/src/main/java/server/MapleStatEffect.java b/src/main/java/server/MapleStatEffect.java index 5b51495254..cd82809ab8 100644 --- a/src/main/java/server/MapleStatEffect.java +++ b/src/main/java/server/MapleStatEffect.java @@ -1223,7 +1223,7 @@ public class MapleStatEffect { int localDuration = getBuffLocalDuration(); int localsourceid = sourceid; int seconds = localDuration / 1000; - MapleMount givemount = null; + Mount givemount = null; if (isMonsterRiding()) { int ridingMountId = 0; Item mount = applyfrom.getInventory(InventoryType.EQUIPPED).getItem((short) -18); diff --git a/src/main/java/tools/PacketCreator.java b/src/main/java/tools/PacketCreator.java index ec2e813713..22c6ae011e 100644 --- a/src/main/java/tools/PacketCreator.java +++ b/src/main/java/tools/PacketCreator.java @@ -1850,7 +1850,7 @@ public class PacketCreator { // Monster Riding Integer bv = chr.getBuffedValue(BuffStat.MONSTER_RIDING); if (bv != null) { - MapleMount mount = chr.getMount(); + Mount mount = chr.getMount(); if (mount != null) { p.writeInt(mount.getItemId()); p.writeInt(mount.getSkillId()); @@ -2712,7 +2712,7 @@ public class PacketCreator { Item mount; //mounts can potentially crash the client if the player's level is not properly checked if (chr.getMount() != null && (mount = chr.getInventory(InventoryType.EQUIPPED).getItem((short) -18)) != null && MapleItemInformationProvider.getInstance().getEquipLevelReq(mount.getItemId()) <= chr.getLevel()) { - MapleMount mmount = chr.getMount(); + Mount mmount = chr.getMount(); p.writeByte(mmount.getId()); //mount p.writeInt(mmount.getLevel()); //level p.writeInt(mmount.getExp()); //exp @@ -2792,7 +2792,7 @@ public class PacketCreator { * @param mount * @return */ - public static Packet showMonsterRiding(int cid, MapleMount mount) { //Gtfo with this, this is just giveForeignBuff + public static Packet showMonsterRiding(int cid, Mount mount) { //Gtfo with this, this is just giveForeignBuff final OutPacket p = OutPacket.create(SendOpcode.GIVE_FOREIGN_BUFF); p.writeInt(cid); p.writeLong(BuffStat.MONSTER_RIDING.getValue()); @@ -4556,7 +4556,7 @@ public class PacketCreator { return p; } - public static Packet updateMount(int charid, MapleMount mount, boolean levelup) { + public static Packet updateMount(int charid, Mount mount, boolean levelup) { final OutPacket p = OutPacket.create(SendOpcode.SET_TAMING_MOB_INFO); p.writeInt(charid); p.writeInt(mount.getLevel());