Merge branch 'user-catalog-purchased-item-event' into 'dev'

Fixed UserCatalogItemPurchasedEvent when user already has the badge

See merge request morningstar/Arcturus-Community!330
This commit is contained in:
Harmonic 2020-11-20 16:09:26 -05:00
commit e10e5da7b5

View File

@ -1070,9 +1070,6 @@ public class CatalogManager {
}
}
UserCatalogItemPurchasedEvent purchasedEvent = new UserCatalogItemPurchasedEvent(habbo, item, itemsList, totalCredits, totalPoints, badges);
Emulator.getPluginManager().fireEvent(purchasedEvent);
if (badgeFound) {
habbo.getClient().sendResponse(new AlertPurchaseFailedComposer(AlertPurchaseFailedComposer.ALREADY_HAVE_BADGE));
@ -1081,6 +1078,9 @@ public class CatalogManager {
}
}
UserCatalogItemPurchasedEvent purchasedEvent = new UserCatalogItemPurchasedEvent(habbo, item, itemsList, totalCredits, totalPoints, badges);
Emulator.getPluginManager().fireEvent(purchasedEvent);
if (!free && !habbo.getClient().getHabbo().hasPermission(Permission.ACC_INFINITE_CREDITS)) {
if (purchasedEvent.totalCredits > 0) {
habbo.getClient().getHabbo().getHabboInfo().addCredits(-purchasedEvent.totalCredits);