nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2024-07-02 05:25:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '22-rank-vip-and-staff-badges-disappear' into 'dev'

Browse Source 
Resolve "Rank VIP and Staff  badges disappear"

See merge request morningstar/Arcturus-Community!21
This commit is contained in:
Beny 2019-05-12 00:05:09 -04:00
commit b0473e89c9
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/eu/habbo/habbohotel/commands/BadgeCommand.java
View File

@ -54,7 +54,7 @@ public class BadgeCommand extends Command
{
boolean found;
try (PreparedStatement statement = connection.prepareStatement("SELECT badge_code FROM users_badges INNER JOIN users ON users.id = user_id WHERE users.username = ? AND badge_code = ? LIMIT 1"))
try (PreparedStatement statement = connection.prepareStatement("SELECT `badge_code` FROM `users_badges` INNER JOIN `users` ON `users`.`id` = `user_id` WHERE `users`.`username` = ? AND `badge_code` = ? LIMIT 1"))
{
statement.setString(1, params[1]);
statement.setString(2, params[2]);
@ -71,7 +71,7 @@ public class BadgeCommand extends Command
}
else
{
try (PreparedStatement statement = connection.prepareStatement("INSERT INTO users_badges VALUES (null, (SELECT id FROM users WHERE username = ? LIMIT 1), 0, ?)"))
try (PreparedStatement statement = connection.prepareStatement("INSERT INTO users_badges (`id`, `user_id`, `slot_id`, `badge_code`) VALUES (null, (SELECT `id` FROM `users` WHERE `username` = ? LIMIT 1), 0, ?)"))
{
statement.setString(1, params[1]);
statement.setString(2, params[2]);

2
src/main/java/com/eu/habbo/habbohotel/users/HabboManager.java
View File

@ -333,7 +333,7 @@ public class HabboManager
if (!oldRank.getBadge().isEmpty())
{
habbo.deleteBadge(habbo.getInventory().getBadgesComponent().getBadge(oldRank.getBadge()));
BadgesComponent.deleteBadge(userId, oldRank.getBadge());
//BadgesComponent.deleteBadge(userId, oldRank.getBadge()); // unnecessary as Habbo.deleteBadge does this
}
habbo.getHabboInfo().setRank(newRank);

2
src/main/java/com/eu/habbo/habbohotel/users/inventory/BadgesComponent.java
View File

@ -43,7 +43,7 @@ public class BadgesComponent
for (Rank rank : Emulator.getGameEnvironment().getPermissionsManager().getRanks(badge.getCode()))
{
if (rank.getId() == habbo.getHabboInfo().getId())
if (rank.getId() == habbo.getHabboInfo().getRank().getId())
{
delete = false;
break;