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

Clean slate counting Vicious Hammer + Scroll Handler patch

Browse Source 
Improved clean slate, now taking Vicious Hammer slots into max upgrade slots account.
Solved some exploit cases within Scroll Handler.
This commit is contained in:
ronancpl
2019-05-02 13:48:49 -03:00
parent 615caa7937
commit 383495a7e9
3 changed files with 124 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

215
src/net/server/channel/handlers/ScrollHandler.java
View File

@@ -49,106 +49,135 @@ public final class ScrollHandler extends AbstractMaplePacketHandler {
@Override @Override
public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) { public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
slea.readInt(); // whatever... if (c.tryacquireClient()) {
short slot = slea.readShort(); try {
short dst = slea.readShort(); slea.readInt(); // whatever...
byte ws = (byte) slea.readShort(); short slot = slea.readShort();
boolean whiteScroll = false; // white scroll being used? short dst = slea.readShort();
boolean legendarySpirit = false; // legendary spirit skill byte ws = (byte) slea.readShort();
if ((ws & 2) == 2) { boolean whiteScroll = false; // white scroll being used?
whiteScroll = true; boolean legendarySpirit = false; // legendary spirit skill
} if ((ws & 2) == 2) {
whiteScroll = true;
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); }
MapleCharacter chr = c.getPlayer();
Equip toScroll = (Equip) chr.getInventory(MapleInventoryType.EQUIPPED).getItem(dst);
Skill LegendarySpirit = SkillFactory.getSkill(1003);
if (chr.getSkillLevel(LegendarySpirit) > 0 && dst >= 0) {
legendarySpirit = true;
toScroll = (Equip) chr.getInventory(MapleInventoryType.EQUIP).getItem(dst);
}
byte oldLevel = toScroll.getLevel();
byte oldSlots = toScroll.getUpgradeSlots();
MapleInventory useInventory = chr.getInventory(MapleInventoryType.USE);
Item scroll = useInventory.getItem(slot);
Item wscroll = null;
if (ItemConstants.isCleanSlate(scroll.getItemId())) { MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
Map<String, Integer> eqStats = ii.getEquipStats(toScroll.getItemId()); // clean slate issue found thanks to Masterrulax MapleCharacter chr = c.getPlayer();
if (eqStats == null || eqStats.get("tuc") == 0) { Equip toScroll = (Equip) chr.getInventory(MapleInventoryType.EQUIPPED).getItem(dst);
c.announce(MaplePacketCreator.getInventoryFull()); Skill LegendarySpirit = SkillFactory.getSkill(1003);
return; if (chr.getSkillLevel(LegendarySpirit) > 0 && dst >= 0) {
} legendarySpirit = true;
} else if (!ItemConstants.isModifierScroll(scroll.getItemId()) && ((Equip) toScroll).getUpgradeSlots() < 1) { toScroll = (Equip) chr.getInventory(MapleInventoryType.EQUIP).getItem(dst);
c.announce(MaplePacketCreator.getInventoryFull()); }
return; byte oldLevel = toScroll.getLevel();
} byte oldSlots = toScroll.getUpgradeSlots();
MapleInventory useInventory = chr.getInventory(MapleInventoryType.USE);
List<Integer> scrollReqs = ii.getScrollReqs(scroll.getItemId()); Item scroll = useInventory.getItem(slot);
if (scrollReqs.size() > 0 && !scrollReqs.contains(toScroll.getItemId())) { Item wscroll = null;
c.announce(MaplePacketCreator.getInventoryFull());
return;
}
if (whiteScroll) {
wscroll = useInventory.findById(2340000);
if (wscroll == null) {
whiteScroll = false;
}
}
if (!ItemConstants.isChaosScroll(scroll.getItemId()) && !ItemConstants.isCleanSlate(scroll.getItemId())) { if (ItemConstants.isCleanSlate(scroll.getItemId())) {
if (!canScroll(scroll.getItemId(), toScroll.getItemId())) { Map<String, Integer> eqStats = ii.getEquipStats(toScroll.getItemId()); // clean slate issue found thanks to Masterrulax
return; if (eqStats == null || eqStats.get("tuc") == 0) {
} c.announce(MaplePacketCreator.getInventoryFull());
} return;
}
if (ItemConstants.isCleanSlate(scroll.getItemId()) && !ii.canUseCleanSlate(toScroll)) { } else if (!ItemConstants.isModifierScroll(scroll.getItemId()) && ((Equip) toScroll).getUpgradeSlots() < 1) {
return; c.announce(MaplePacketCreator.getInventoryFull());
} return;
}
Equip scrolled = (Equip) ii.scrollEquipWithId(toScroll, scroll.getItemId(), whiteScroll, 0, chr.isGM());
ScrollResult scrollSuccess = Equip.ScrollResult.FAIL; // fail List<Integer> scrollReqs = ii.getScrollReqs(scroll.getItemId());
if (scrolled == null) { if (scrollReqs.size() > 0 && !scrollReqs.contains(toScroll.getItemId())) {
scrollSuccess = Equip.ScrollResult.CURSE; c.announce(MaplePacketCreator.getInventoryFull());
} else if (scrolled.getLevel() > oldLevel || (ItemConstants.isCleanSlate(scroll.getItemId()) && scrolled.getUpgradeSlots() == oldSlots + 1) || ItemConstants.isFlagModifier(scroll.getItemId(), scrolled.getFlag())) { return;
scrollSuccess = Equip.ScrollResult.SUCCESS; }
} if (whiteScroll) {
MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.USE, scroll.getPosition(), (short) 1, false); wscroll = useInventory.findById(2340000);
if (whiteScroll && !ItemConstants.isCleanSlate(scroll.getItemId())) { if (wscroll == null) {
MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.USE, wscroll.getPosition(), (short) 1, false, false); whiteScroll = false;
} }
final List<ModifyInventory> mods = new ArrayList<>(); }
if (scrollSuccess == Equip.ScrollResult.CURSE) {
if(!ItemConstants.isWeddingRing(toScroll.getItemId())) { if (!ItemConstants.isChaosScroll(scroll.getItemId()) && !ItemConstants.isCleanSlate(scroll.getItemId())) {
mods.add(new ModifyInventory(3, toScroll)); if (!canScroll(scroll.getItemId(), toScroll.getItemId())) {
if (dst < 0) { return;
MapleInventory inv = chr.getInventory(MapleInventoryType.EQUIPPED); }
}
if (ItemConstants.isCleanSlate(scroll.getItemId()) && !ii.canUseCleanSlate(toScroll)) {
return;
}
Equip scrolled = (Equip) ii.scrollEquipWithId(toScroll, scroll.getItemId(), whiteScroll, 0, chr.isGM());
ScrollResult scrollSuccess = Equip.ScrollResult.FAIL; // fail
if (scrolled == null) {
scrollSuccess = Equip.ScrollResult.CURSE;
} else if (scrolled.getLevel() > oldLevel || (ItemConstants.isCleanSlate(scroll.getItemId()) && scrolled.getUpgradeSlots() == oldSlots + 1) || ItemConstants.isFlagModifier(scroll.getItemId(), scrolled.getFlag())) {
scrollSuccess = Equip.ScrollResult.SUCCESS;
}
useInventory.lockInventory();
try {
if (scroll.getQuantity() < 1) {
return;
}
inv.lockInventory(); if (whiteScroll && !ItemConstants.isCleanSlate(scroll.getItemId())) {
try { if (wscroll.getQuantity() < 1) {
chr.unequippedItem(toScroll); return;
inv.removeItem(toScroll.getPosition()); }
} finally {
inv.unlockInventory(); MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.USE, wscroll.getPosition(), (short) 1, false, false);
}
MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.USE, scroll.getPosition(), (short) 1, false);
} finally {
useInventory.unlockInventory();
}
final List<ModifyInventory> mods = new ArrayList<>();
if (scrollSuccess == Equip.ScrollResult.CURSE) {
if(!ItemConstants.isWeddingRing(toScroll.getItemId())) {
mods.add(new ModifyInventory(3, toScroll));
if (dst < 0) {
MapleInventory inv = chr.getInventory(MapleInventoryType.EQUIPPED);
inv.lockInventory();
try {
chr.unequippedItem(toScroll);
inv.removeItem(toScroll.getPosition());
} finally {
inv.unlockInventory();
}
} else {
MapleInventory inv = chr.getInventory(MapleInventoryType.EQUIP);
inv.lockInventory();
try {
inv.removeItem(toScroll.getPosition());
} finally {
inv.unlockInventory();
}
}
} else {
scrolled = toScroll;
scrollSuccess = Equip.ScrollResult.FAIL;
mods.add(new ModifyInventory(3, scrolled));
mods.add(new ModifyInventory(0, scrolled));
} }
} else { } else {
chr.getInventory(MapleInventoryType.EQUIP).removeItem(toScroll.getPosition()); mods.add(new ModifyInventory(3, scrolled));
mods.add(new ModifyInventory(0, scrolled));
} }
} else { c.announce(MaplePacketCreator.modifyInventory(true, mods));
scrolled = toScroll; chr.getMap().broadcastMessage(MaplePacketCreator.getScrollEffect(chr.getId(), scrollSuccess, legendarySpirit));
scrollSuccess = Equip.ScrollResult.FAIL; if (dst < 0 && (scrollSuccess == Equip.ScrollResult.SUCCESS || scrollSuccess == Equip.ScrollResult.CURSE)) {
chr.equipChanged();
mods.add(new ModifyInventory(3, scrolled)); }
mods.add(new ModifyInventory(0, scrolled)); } finally {
c.releaseClient();
} }
} else {
mods.add(new ModifyInventory(3, scrolled));
mods.add(new ModifyInventory(0, scrolled));
}
c.announce(MaplePacketCreator.modifyInventory(true, mods));
chr.getMap().broadcastMessage(MaplePacketCreator.getScrollEffect(chr.getId(), scrollSuccess, legendarySpirit));
if (dst < 0 && (scrollSuccess == Equip.ScrollResult.SUCCESS || scrollSuccess == Equip.ScrollResult.CURSE)) {
chr.equipChanged();
} }
} }

2
src/net/server/channel/handlers/UseCashItemHandler.java
View File

@@ -507,7 +507,7 @@ public final class UseCashItemHandler extends AbstractMaplePacketHandler {
int itemSlot = slea.readInt(); int itemSlot = slea.readInt();
slea.readInt(); slea.readInt();
final Equip equip = (Equip) player.getInventory(MapleInventoryType.EQUIP).getItem((short) itemSlot); final Equip equip = (Equip) player.getInventory(MapleInventoryType.EQUIP).getItem((short) itemSlot);
if (equip.getVicious() == 2 || player.getInventory(MapleInventoryType.CASH).findById(5570000) == null) { if (equip.getVicious() >= 2 || player.getInventory(MapleInventoryType.CASH).findById(5570000) == null) {
return; return;
} }
equip.setVicious(equip.getVicious() + 1); equip.setVicious(equip.getVicious() + 1);

2
src/server/MapleItemInformationProvider.java
View File

@@ -913,7 +913,7 @@ public class MapleItemInformationProvider {
public boolean canUseCleanSlate(Equip nEquip) { public boolean canUseCleanSlate(Equip nEquip) {
Map<String, Integer> eqstats = this.getEquipStats(nEquip.getItemId()); Map<String, Integer> eqstats = this.getEquipStats(nEquip.getItemId());
return ServerConstants.USE_ENHANCED_CLNSLATE || nEquip.getUpgradeSlots() < (byte) (eqstats.get("tuc") + nEquipe.getVicious()); // issue with clean slate found thanks to Masterrulax return ServerConstants.USE_ENHANCED_CLNSLATE || nEquip.getUpgradeSlots() < (byte) (eqstats.get("tuc") + nEquip.getVicious()); // issue with clean slate found thanks to Masterrulax, vicious added in the check thanks to Crypter (CrypterDEV)
} }
public Item scrollEquipWithId(Item equip, int scrollId, boolean usingWhiteScroll, int vegaItemId, boolean isGM) { public Item scrollEquipWithId(Item equip, int scrollId, boolean usingWhiteScroll, int vegaItemId, boolean isGM) {