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

Pet Snail expiration + Scripted portal sound effects

Browse Source 
Fixed pet Snail not expiring properly (being removed from inventory when the time's up).
Broadcasted code update for most of the missing portal sound effects for portal scripts. It is expected for all scripted portals now to play the sound effect when traversing it.
This commit is contained in:
ronancpl
2018-02-11 21:19:30 -02:00
parent 2d49c322e1
commit 10dc1f03e7
300 changed files with 425 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/client/MapleCharacter.java
View File

@@ -2308,7 +2308,7 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject {
item.setExpiration(-1);
forceUpdateItem(item); //TEST :3
} else if (expiration != -1 && expiration < currenttime) {
if(!ItemConstants.isPet(item.getItemId()) || ServerConstants.USE_ERASE_PET_ON_EXPIRATION) {
if(!ItemConstants.isPet(item.getItemId()) || ItemConstants.isExpirablePet(item.getItemId())) {
client.announce(MaplePacketCreator.itemExpired(item.getItemId()));
toberemove.add(item);
if(ItemConstants.isRateCoupon(item.getItemId())) {
@@ -2321,7 +2321,10 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject {
}
}
for (Item item : toberemove) {
if(item.getPetId() > -1) unequipPet(getPet(getPetIndex(item.getPetId())), true);
if(item.getPetId() > -1) {
int petIdx = getPetIndex(item.getPetId());
if(petIdx > -1) unequipPet(getPet(petIdx), true);
}
MapleInventoryManipulator.removeFromSlot(client, inv.getType(), item.getPosition(), item.getQuantity(), true);
}
toberemove.clear();

4
src/constants/ItemConstants.java
View File

@@ -93,6 +93,10 @@ public final class ItemConstants {
return itemId / 1000 == 5000;
}
public static boolean isExpirablePet(int itemId) {
return ServerConstants.USE_ERASE_PET_ON_EXPIRATION || itemId == 5000054;
}
public static boolean isNewYearCardEtc(int itemId) {
return itemId / 10000 == 430;
}