Skip to content

Commit b6ae2fb

Browse files
datatagsdatatags
authored
Merge pull request UltraCosmetics#596 from Chris6ix/master
Fix Piglin Pet Zombification
2 parents e792dac + ee0e231 commit b6ae2fb

2 files changed

Lines changed: 14 additions & 2 deletions

File tree

‎core/src/main/java/be/isach/ultracosmetics/cosmetics/pets/PetPiglin.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
import be.isach.ultracosmetics.cosmetics.type.PetType;
66
import be.isach.ultracosmetics.player.UltraPlayer;
77
import be.isach.ultracosmetics.util.ItemFactory;
8+
9+
import org.bukkit.entity.Piglin;
10+
811
import com.cryptomorin.xseries.XMaterial;
912

1013
/**
@@ -17,4 +20,10 @@ public class PetPiglin extends Pet {
1720
public PetPiglin(UltraPlayer owner, UltraCosmetics ultraCosmetics) {
1821
super(owner, ultraCosmetics, PetType.getByName("piglin"), ItemFactory.create(XMaterial.GOLD_INGOT, UltraCosmeticsData.get().getItemNoPickupString()));
1922
}
23+
24+
@Override
25+
public void onEquip() {
26+
super.onEquip();
27+
((Piglin)entity).setImmuneToZombification(true);
28+
}
2029
}

‎core/src/main/java/be/isach/ultracosmetics/cosmetics/type/PetType.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ public static void register() {
8383
new PetType("ultracosmetics.pets.bat", "Bat", XMaterial.COAL, "&7&oI prefer dark areas", EntityType.BAT, PetBat.class, ServerVersion.earliest());
8484
new PetType("ultracosmetics.pets.sheep", "Sheep", XMaterial.WHITE_WOOL, "&7&oBaaaa, baa", EntityType.SHEEP, PetSheep.class, ServerVersion.earliest());
8585
new PetType("ultracosmetics.pets.wither", "Wither", XMaterial.WITHER_SKELETON_SKULL, "&7&oWatch out for me..", EntityType.WITHER, PetWither.class, ServerVersion.earliest());
86+
/*Slime disabled because its just constantly jumping in one direction instead of following the player*/
8687
/*new PetType("ultracosmetics.pets.slime", "Slime", XMaterial.SLIME_BALL, "&7&oSquish...", EntityType.SLIME, PetSlime.class, ServerVersion.earliest());*/
8788
new PetType("ultracosmetics.pets.silverfish", "Silverfish", XMaterial.GRAY_DYE, "&7&oLurking in the walls...", EntityType.SILVERFISH, PetSilverfish.class, ServerVersion.earliest());
8889
new PetType("ultracosmetics.pets.horse", "Horse", XMaterial.LEATHER_HORSE_ARMOR, "&7&o*fhrrrrhh*", EntityType.HORSE, PetHorse.class, ServerVersion.earliest());
@@ -93,14 +94,15 @@ public static void register() {
9394
new PetType("ultracosmetics.pets.zombie", "Zombie", XMaterial.ROTTEN_FLESH, "&7&oQuick! Hide your Villagers!", EntityType.ZOMBIE, PetZombie.class, ServerVersion.earliest());
9495

9596
if (serverVersion.isAtLeast(ServerVersion.v1_17_R1)) {
97+
/*Axolotl disabled because it walks way too fast*/
9698
/*new PetType("ultracosmetics.pets.axolotl", "Axolotl", XMaterial.AXOLOTL_BUCKET, "&7&oSooo Cute!", EntityType.AXOLOTL, PetAxolotl.class, ServerVersion.v1_17_R1);*/
9799
/*Temporarily using WHEAT as material for the Goat until https://minecraft.fandom.com/wiki/Goat_Horn comes to Java edition*/
98100
new PetType("ultracosmetics.pets.goat", "Goat", XMaterial.WHEAT, "&7&oBAAAA!", EntityType.GOAT, PetGoat.class, ServerVersion.v1_17_R1);
99101
}
100102

101-
/*if (serverVersion.isAtLeast(ServerVersion.v1_16_R3)) {
103+
if (serverVersion.isAtLeast(ServerVersion.v1_16_R3)) {
102104
new PetType("ultracosmetics.pets.piglin", "Piglin", XMaterial.GOLD_INGOT, "&7&oDeals with Gold!", EntityType.PIGLIN, PetPiglin.class, ServerVersion.v1_16_R3);
103-
}*/
105+
}
104106

105107
if (serverVersion.isAtLeast(ServerVersion.v1_15_R1)) {
106108
new PetType("ultracosmetics.pets.bee", "Bee", XMaterial.HONEYCOMB, "&7&o*bzzzz* *bzzzz*", EntityType.BEE, PetBee.class, ServerVersion.v1_15_R1);
@@ -120,6 +122,7 @@ public static void register() {
120122
new PetType("ultracosmetics.pets.polarbear", "PolarBear", XMaterial.SNOW_BLOCK, "&7&oI prefer cold areas", GetForVersion.entityType("POLAR_BEAR"), PetPolarBear.class, ServerVersion.v1_12_R1);
121123
new PetType("ultracosmetics.pets.llama", "Llama", XMaterial.RED_WOOL, "&7&oNeed me to carry anything?", GetForVersion.entityType("LLAMA"), PetLlama.class, ServerVersion.v1_12_R1);
122124
new PetType("ultracosmetics.pets.parrot", "Parrot", XMaterial.COOKIE, "&7&oPolly want a cracker?", GetForVersion.entityType("PARROT"), PetParrot.class, ServerVersion.v1_12_R1);
125+
/*Vex disabled because its just not following the player at all (Besides teleport)*/
123126
/*new PetType("ultracosmetics.pets.vex", "Vex", XMaterial.IRON_SWORD, "&7&oYAAHH Ehehhehe!", GetForVersion.entityType("VEX"), PetVex.class, ServerVersion.v1_12_R1);*/
124127
}
125128
}

0 commit comments

Comments
 (0)