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

Merge branch 'dev' into 'dev'

Browse Source 
Fixes the song disk bug

See merge request morningstar/Arcturus-Community!15
This commit is contained in:
John 2023-01-05 02:34:12 +00:00
commit 33c82e0b8f
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryItemsComposer.java
View File

@ -11,6 +11,9 @@ import gnu.trove.procedure.TIntObjectProcedure;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.util.Arrays;
import java.util.List;
public class InventoryItemsComposer extends MessageComposer implements TIntObjectProcedure<HabboItem> { public class InventoryItemsComposer extends MessageComposer implements TIntObjectProcedure<HabboItem> {
private static final Logger LOGGER = LoggerFactory.getLogger(InventoryItemsComposer.class); private static final Logger LOGGER = LoggerFactory.getLogger(InventoryItemsComposer.class);
@ -48,7 +51,7 @@ public class InventoryItemsComposer extends MessageComposer implements TIntObjec
this.response.appendInt(habboItem.getId()); this.response.appendInt(habboItem.getId());
this.response.appendInt(habboItem.getBaseItem().getSpriteId()); this.response.appendInt(habboItem.getBaseItem().getSpriteId());
if (habboItem.getBaseItem().getName().equals("floor") || habboItem.getBaseItem().getName().equals("landscape") || habboItem.getBaseItem().getName().equals("wallpaper") || habboItem.getBaseItem().getName().equals("poster")) { if (habboItem.getBaseItem().getName().equals("floor") || habboItem.getBaseItem().getName().equals("landscape") || habboItem.getBaseItem().getName().equals("song_disk") || habboItem.getBaseItem().getName().equals("wallpaper") || habboItem.getBaseItem().getName().equals("poster")) {
switch (habboItem.getBaseItem().getName()) { switch (habboItem.getBaseItem().getName()) {
case "landscape": case "landscape":
this.response.appendInt(4); this.response.appendInt(4);
@ -62,10 +65,11 @@ public class InventoryItemsComposer extends MessageComposer implements TIntObjec
case "poster": case "poster":
this.response.appendInt(6); this.response.appendInt(6);
break; break;
case "song_disk":
this.response.appendInt(8);
break;
} }
this.addExtraDataToResponse(habboItem);
this.response.appendInt(0);
this.response.appendString(habboItem.getExtradata());
} else { } else {
if (habboItem.getBaseItem().getName().equals("gnome_box")) if (habboItem.getBaseItem().getName().equals("gnome_box"))
this.response.appendInt(13); this.response.appendInt(13);
@ -82,12 +86,25 @@ public class InventoryItemsComposer extends MessageComposer implements TIntObjec
this.response.appendBoolean(true); this.response.appendBoolean(true);
this.response.appendInt(-1); this.response.appendInt(-1);
if (habboItem.getBaseItem().getType() == FurnitureType.FLOOR) { if (habboItem.getBaseItem().getType() == FurnitureType.FLOOR) {
this.response.appendString(""); this.response.appendString("");
if(habboItem.getBaseItem().getName().equals("song_disk")) {
List<String> extraDataAsList = Arrays.asList(habboItem.getExtradata().split("\n"));
this.response.appendInt(Integer.valueOf(extraDataAsList.get(extraDataAsList.size() - 1)));
return true;
}
this.response.appendInt(habboItem instanceof InteractionGift ? ((((InteractionGift) habboItem).getColorId() * 1000) + ((InteractionGift) habboItem).getRibbonId()) : 1); this.response.appendInt(habboItem instanceof InteractionGift ? ((((InteractionGift) habboItem).getColorId() * 1000) + ((InteractionGift) habboItem).getRibbonId()) : 1);
} }
return true; return true;
} }
} public void addExtraDataToResponse(HabboItem habboItem) {
this.response.appendInt(0);
this.response.appendString(habboItem.getExtradata());
}
}