Skip to content

Commit 48e464c

Browse files
committed
Merge remote-tracking branch 'origin/master'
# Conflicts: # core/src/main/java/be/isach/ultracosmetics/cosmetics/pets/Pet.java
2 parents e67c202 + a894584 commit 48e464c

1 file changed

Lines changed: 1 addition & 6 deletions

File tree

  • core/src/main/java/be/isach/ultracosmetics/cosmetics/pets

core/src/main/java/be/isach/ultracosmetics/cosmetics/pets/Pet.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -220,12 +220,7 @@ protected void setupNameTag() {
220220
armorStand.setCustomNameVisible(true);
221221
FixedMetadataValue metadataValue = new FixedMetadataValue(getUltraCosmetics(), "C_AD_ArmorStand");
222222
armorStand.setMetadata("C_AD_ArmorStand", metadataValue);
223-
setPassenger(entity, armorStand);
224-
}
225-
226-
@SuppressWarnings("deprecation")
227-
private void setPassenger(Entity entity, Entity passenger) {
228-
entity.setPassenger(passenger);
223+
entity.addPassenger(armorStand);
229224
}
230225

231226
public void updateName() {

0 commit comments

Comments
 (0)