Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
luisc committed 2024-03-26 14:39:53 -05:00
commit b0c7322ac2
2 files changed
+8 -2

No files matched your search

@@ -127,7 +127,14 @@ public class GuiNpcDisplay extends GuiNPCInterface2 implements ITextfieldListene
}
else if(textfield.id == 9){
if (!textfield.getText().isEmpty()) {
npc.display.skinOverlayData.overlayList.put(0,new SkinOverlay(textfield.getText()));
boolean isGlow = true;
if(npc.display.skinOverlayData.has(0))
isGlow = npc.display.skinOverlayData.overlayList.get(0).getGlow();
SkinOverlay skinOverlay = new SkinOverlay(textfield.getText());
skinOverlay.setGlow(isGlow);
skinOverlay.setBlend(isGlow);
npc.display.skinOverlayData.overlayList.put(0, skinOverlay);
} else {
npc.display.skinOverlayData.overlayList.remove(0);
}
@@ -429,7 +429,6 @@ public class GuiParty extends GuiCNPCInventory implements ITextfieldListener,ICu
this.trackedQuestKey = compound.getString("QuestName");
}
this.isLeader = ClientCacheHandler.party.getPartyLeaderName().equals(this.player.getCommandSenderName());
System.out.println("KEY:" + trackedQuestKey);
} else if (compound.hasKey("Disband")) {
this.isLeader = false;
} else if (compound.hasKey("PartyInvites")) {