mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 03:35:51 +00:00
Code Releases Activity

Refactor

Browse Source
This commit is contained in:
svr333 2020-10-05 15:25:11 +02:00
parent 21bf7cf607
commit a01d33fea3
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/MagicalZombiePills.java
View File

@ -48,7 +48,7 @@ public class MagicalZombiePills extends SimpleSlimefunItem<EntityInteractHandler
return (e, item, offhand) -> {
Entity entity = e.getRightClicked();
if (entity.getType() == EntityType.ZOMBIE_VILLAGER) {
if (entity.getType() == EntityType.ZOMBIE_VILLAGER || entity.getType() == EntityType.ZOMBIFIED_PIGLIN) {
Player p = e.getPlayer();
if (p.getGameMode() != GameMode.CREATIVE) {
@ -57,26 +57,20 @@ public class MagicalZombiePills extends SimpleSlimefunItem<EntityInteractHandler
p.playSound(p.getLocation(), Sound.ENTITY_ZOMBIE_VILLAGER_CONVERTED, 1, 1);
ZombieVillager zombieVillager = (ZombieVillager) entity;
zombieVillager.setConversionTime(1);
if (entity.getType() == EntityType.ZOMBIE_VILLAGER) {
ZombieVillager zombieVillager = (ZombieVillager) entity;
zombieVillager.setConversionTime(1);
if (SlimefunPlugin.getMinecraftVersion().isAtLeast(MinecraftVersion.MINECRAFT_1_15)) {
zombieVillager.setConversionPlayer(p);
if (SlimefunPlugin.getMinecraftVersion().isAtLeast(MinecraftVersion.MINECRAFT_1_15)) {
zombieVillager.setConversionPlayer(p);
}
}
}
else if (SlimefunPlugin.getMinecraftVersion().isAtLeast(MinecraftVersion.MINECRAFT_1_16)
&& entity.getType() == EntityType.ZOMBIFIED_PIGLIN) {
Player p = e.getPlayer();
if (p.getGameMode() != GameMode.CREATIVE) {
ItemUtils.consumeItem(item, false);
else if (entity.getType() == EntityType.ZOMBIFIED_PIGLIN) {
Location loc = entity.getLocation();
entity.remove();
loc.getWorld().spawnEntity(loc, EntityType.PIGLIN);
}
Location loc = entity.getLocation();
p.playSound(loc, Sound.ENTITY_ZOMBIE_VILLAGER_CONVERTED, 1, 1);
entity.remove();
loc.getWorld().spawnEntity(loc, EntityType.PIGLIN);
}
};
}