From fc487231a8913698c186f2a2618bb30e43951714 Mon Sep 17 00:00:00 2001 From: duckietm Date: Wed, 8 Apr 2026 14:08:22 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=86=99=20Added=20send=20username=20to=20b?= =?UTF-8?q?adge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eu/habbo/habbohotel/commands/BadgeCommand.java | 3 ++- .../java/com/eu/habbo/habbohotel/users/Habbo.java | 6 +++++- .../messages/outgoing/users/AddUserBadgeComposer.java | 11 +++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/commands/BadgeCommand.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/commands/BadgeCommand.java index 1328ed19..8abf0b25 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/commands/BadgeCommand.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/commands/BadgeCommand.java @@ -36,7 +36,8 @@ public class BadgeCommand extends Command { Habbo habbo = Emulator.getGameEnvironment().getHabboManager().getHabbo(params[1]); if (habbo != null) { - if (habbo.addBadge(params[2])) { + String senderName = gameClient.getHabbo().getHabboInfo().getUsername(); + if (habbo.addBadge(params[2], senderName)) { gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.succes.cmd_badge.given").replace("%user%", params[1]).replace("%badge%", params[2]), RoomChatMessageBubbles.ALERT); } else { gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_badge.already_owned").replace("%user%", params[1]).replace("%badge%", params[2]), RoomChatMessageBubbles.ALERT); diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/users/Habbo.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/users/Habbo.java index ef097d48..61f8075e 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/users/Habbo.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/users/Habbo.java @@ -408,10 +408,14 @@ public class Habbo implements Runnable { public boolean addBadge(String code) { + return this.addBadge(code, ""); + } + + public boolean addBadge(String code, String senderName) { if (!this.habboInventory.getBadgesComponent().hasBadge(code)) { HabboBadge badge = BadgesComponent.createBadge(code, this); this.habboInventory.getBadgesComponent().addBadge(badge); - this.client.sendResponse(new AddUserBadgeComposer(badge)); + this.client.sendResponse(new AddUserBadgeComposer(badge, senderName)); this.client.sendResponse(new AddHabboItemComposer(badge.getId(), AddHabboItemComposer.AddHabboItemCategory.BADGE)); THashMap keys = new THashMap<>(); diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/AddUserBadgeComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/AddUserBadgeComposer.java index d8802b20..1e4216bf 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/AddUserBadgeComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/AddUserBadgeComposer.java @@ -7,9 +7,15 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class AddUserBadgeComposer extends MessageComposer { private final HabboBadge badge; + private final String senderName; public AddUserBadgeComposer(HabboBadge badge) { + this(badge, ""); + } + + public AddUserBadgeComposer(HabboBadge badge, String senderName) { this.badge = badge; + this.senderName = senderName == null ? "" : senderName; } @Override @@ -17,10 +23,15 @@ public class AddUserBadgeComposer extends MessageComposer { this.response.init(Outgoing.AddUserBadgeComposer); this.response.appendInt(this.badge.getId()); this.response.appendString(this.badge.getCode()); + this.response.appendString(this.senderName); return this.response; } public HabboBadge getBadge() { return badge; } + + public String getSenderName() { + return senderName; + } }