mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-20 03:35:51 +00:00
Refactor
This commit is contained in:
parent
21bf7cf607
commit
a01d33fea3
@ -48,7 +48,7 @@ public class MagicalZombiePills extends SimpleSlimefunItem<EntityInteractHandler
|
|||||||
return (e, item, offhand) -> {
|
return (e, item, offhand) -> {
|
||||||
Entity entity = e.getRightClicked();
|
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();
|
Player p = e.getPlayer();
|
||||||
|
|
||||||
if (p.getGameMode() != GameMode.CREATIVE) {
|
if (p.getGameMode() != GameMode.CREATIVE) {
|
||||||
@ -57,6 +57,7 @@ public class MagicalZombiePills extends SimpleSlimefunItem<EntityInteractHandler
|
|||||||
|
|
||||||
p.playSound(p.getLocation(), Sound.ENTITY_ZOMBIE_VILLAGER_CONVERTED, 1, 1);
|
p.playSound(p.getLocation(), Sound.ENTITY_ZOMBIE_VILLAGER_CONVERTED, 1, 1);
|
||||||
|
|
||||||
|
if (entity.getType() == EntityType.ZOMBIE_VILLAGER) {
|
||||||
ZombieVillager zombieVillager = (ZombieVillager) entity;
|
ZombieVillager zombieVillager = (ZombieVillager) entity;
|
||||||
zombieVillager.setConversionTime(1);
|
zombieVillager.setConversionTime(1);
|
||||||
|
|
||||||
@ -64,20 +65,13 @@ public class MagicalZombiePills extends SimpleSlimefunItem<EntityInteractHandler
|
|||||||
zombieVillager.setConversionPlayer(p);
|
zombieVillager.setConversionPlayer(p);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (SlimefunPlugin.getMinecraftVersion().isAtLeast(MinecraftVersion.MINECRAFT_1_16)
|
else if (entity.getType() == EntityType.ZOMBIFIED_PIGLIN) {
|
||||||
&& entity.getType() == EntityType.ZOMBIFIED_PIGLIN) {
|
|
||||||
Player p = e.getPlayer();
|
|
||||||
|
|
||||||
if (p.getGameMode() != GameMode.CREATIVE) {
|
|
||||||
ItemUtils.consumeItem(item, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
Location loc = entity.getLocation();
|
Location loc = entity.getLocation();
|
||||||
p.playSound(loc, Sound.ENTITY_ZOMBIE_VILLAGER_CONVERTED, 1, 1);
|
|
||||||
|
|
||||||
entity.remove();
|
entity.remove();
|
||||||
loc.getWorld().spawnEntity(loc, EntityType.PIGLIN);
|
loc.getWorld().spawnEntity(loc, EntityType.PIGLIN);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user