nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2024-11-22 23:10:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-duplicated-badge' into 'dev'

Browse Source 
Fix: Duplicated badges

See merge request morningstar/Arcturus-Community!540
This commit is contained in:
Bill 2022-04-13 04:16:03 +00:00
commit c8a9984167
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -380,7 +380,7 @@ public class Habbo implements Runnable {
public boolean addBadge(String code) { public boolean addBadge(String code) {
if (this.habboInventory.getBadgesComponent().getBadge(code) == null) { if (!this.habboInventory.getBadgesComponent().hasBadge(code)) {
HabboBadge badge = BadgesComponent.createBadge(code, this); HabboBadge badge = BadgesComponent.createBadge(code, this);
this.habboInventory.getBadgesComponent().addBadge(badge); this.habboInventory.getBadgesComponent().addBadge(badge);
this.client.sendResponse(new AddUserBadgeComposer(badge)); this.client.sendResponse(new AddUserBadgeComposer(badge));

3
src/main/java/com/eu/habbo/habbohotel/users/HabboBadge.java
View File

@ -57,9 +57,6 @@ public class HabboBadge implements Runnable {
public void run() { public void run() {
try { try {
if (this.needsInsert) { if (this.needsInsert) {
if (this.habbo.getInventory().getBadgesComponent().hasBadge(this.code))
return;
try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("INSERT INTO users_badges (user_id, slot_id, badge_code) VALUES (?, ?, ?)", Statement.RETURN_GENERATED_KEYS)) { try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("INSERT INTO users_badges (user_id, slot_id, badge_code) VALUES (?, ?, ?)", Statement.RETURN_GENERATED_KEYS)) {
statement.setInt(1, this.habbo.getHabboInfo().getId()); statement.setInt(1, this.habbo.getHabboInfo().getId());
statement.setInt(2, this.slot); statement.setInt(2, this.slot);

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

@ -160,8 +160,7 @@ public class BadgesComponent {
public void addBadge(HabboBadge badge) { public void addBadge(HabboBadge badge) {
synchronized (this.badges) { synchronized (this.badges) {
if (!this.hasBadge(badge.getCode())) this.badges.add(badge);
this.badges.add(badge);
} }
} }

3
src/main/java/com/eu/habbo/habbohotel/wired/WiredHandler.java
View File

@ -306,6 +306,9 @@ public class WiredHandler {
if (rewardReceived.value.isEmpty()) if (rewardReceived.value.isEmpty())
return; return;
if (habbo.getInventory().getBadgesComponent().hasBadge(rewardReceived.value))
return;
HabboBadge badge = new HabboBadge(0, rewardReceived.value, 0, habbo); HabboBadge badge = new HabboBadge(0, rewardReceived.value, 0, habbo);
Emulator.getThreading().run(badge); Emulator.getThreading().run(badge);

2
src/main/java/com/eu/habbo/messages/incoming/polls/AnswerPollEvent.java
View File

@ -52,7 +52,7 @@ public class AnswerPollEvent extends MessageHandler {
if (poll.lastQuestionId == questionId) { if (poll.lastQuestionId == questionId) {
if (poll.badgeReward.length() > 0) { if (poll.badgeReward.length() > 0) {
if (this.client.getHabbo().getInventory().getBadgesComponent().getBadge(poll.badgeReward) == null) { if (!this.client.getHabbo().getInventory().getBadgesComponent().hasBadge(poll.badgeReward)) {
HabboBadge badge = new HabboBadge(0, poll.badgeReward, 0, this.client.getHabbo()); HabboBadge badge = new HabboBadge(0, poll.badgeReward, 0, this.client.getHabbo());
Emulator.getThreading().run(badge); Emulator.getThreading().run(badge);
this.client.getHabbo().getInventory().getBadgesComponent().addBadge(badge); this.client.getHabbo().getInventory().getBadgesComponent().addBadge(badge);