Fixed crashes with sound manager, fixed pigman drops

Author: ScribbleTAS

LoTAS-Fabric/src/main/java/de/pfannekuchen/lotas/dropmanipulation/drops/entitydrops/ZombieDropManipulation.java

@@ -12,6 +12,7 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.monster.Husk;
+import net.minecraft.world.entity.monster.PigZombie;
 import net.minecraft.world.entity.monster.Zombie;
 import net.minecraft.world.entity.monster.ZombieVillager;
 import net.minecraft.world.item.ItemStack;
@@ -57,7 +58,7 @@ public List<ItemStack> redirectDrops(BlockState block) {
 	@Override
 	public List<ItemStack> redirectDrops(Entity entity, int lootingBonus) {
 		List<ItemStack> list = new ArrayList<>();
-		if (entity instanceof Zombie || entity instanceof Husk || entity instanceof ZombieVillager) {
+		if (entity instanceof Zombie && !(entity instanceof PigZombie)) {
 			list.add(new ItemStack(Items.ROTTEN_FLESH, 2 +lootingBonus));
 
 			if (dropIron.isToggled())

LoTAS-Fabric/src/main/java/de/pfannekuchen/lotas/mixin/render/gui/MixinGuiMainMenu.java

@@ -10,6 +10,7 @@
 import de.pfannekuchen.lotas.core.MCVer;
 import de.pfannekuchen.lotas.core.utils.ConfigUtils;
 import de.pfannekuchen.lotas.gui.ConfigurationScreen;
+import de.pfannekuchen.lotas.mods.TickrateChangerMod;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.TitleScreen;
@@ -33,6 +34,9 @@ protected MixinGuiMainMenu(Component title) {
 
 	@Inject(method="init", at = @At("HEAD"))
 	private void changeSplash(CallbackInfo ci) {
+		if (ConfigUtils.getBoolean("tools", "saveTickrate")) {
+			TickrateChangerMod.updatePitch();
+		}
 		splash="TaS iS cHeAtInG !!1";
 	}
 

LoTAS-Fabric/src/main/java/de/pfannekuchen/lotas/mods/TickrateChangerMod.java

@@ -98,10 +98,11 @@ public static void updateClientTickrate(float tickrateIn) {
 			((AccessorTimer) ((AccessorMinecraftClient) Minecraft.getInstance()).getTimer()).setTickTime(Float.MAX_VALUE);
 		}
 		tickrate = tickrateIn;
-		if (!ConfigUtils.getBoolean("ui", "hideTickrateMessages") && Minecraft.getInstance().gui != null)
-			Minecraft.getInstance().gui.getChat().addMessage(MCVer.literal("Updated Tickrate to \u00A7b" + tickrateIn));
-		
-		((SoundPitchDuck)((AccessorSoundEngine)Minecraft.getInstance().getSoundManager()).getSoundEngine()).updatePitch();
+		if (!ConfigUtils.getBoolean("ui", "hideTickrateMessages") && Minecraft.getInstance().gui != null) {
+			Minecraft mc=Minecraft.getInstance();
+			mc.gui.getChat().addMessage(MCVer.literal("Updated Tickrate to \u00A7b" + tickrateIn));
+		}
+		updatePitch();
 	}
 
 	/**
@@ -160,6 +161,20 @@ public static void resetAdvanceServer() {
 			updateServerTickrate(0);
 		}
 	}
+	
+	public static void updatePitch() {
+		AccessorSoundEngine soundEngine = (AccessorSoundEngine)Minecraft.getInstance().getSoundManager();
+		
+		if(soundEngine == null)
+			return;
+		
+		SoundPitchDuck soundManager=(SoundPitchDuck)soundEngine.getSoundEngine();
+		
+		if(soundManager == null)
+			return;
+		
+		soundManager.updatePitch();
+	}
 
 	//public static ResourceLocation streaming = new ResourceLocation("textures/gui/stream_indicator.png");
 	public static boolean show = false;

LoTAS-Forge/src/main/java/de/pfannekuchen/lotas/dropmanipulation/drops/entitydrops/ZombieDropManipulation.java

@@ -14,6 +14,7 @@
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.monster.EntityPigZombie;
 import net.minecraft.entity.monster.EntityZombie;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
@@ -55,7 +56,7 @@ public String getName() {
     @Override
     public List<ItemStack> redirectDrops(Entity entity, int lootingValue) {
         List<ItemStack> list = new ArrayList<>();
-        if (entity instanceof EntityZombie) {
+        if (entity instanceof EntityZombie && !(entity instanceof EntityPigZombie)) {
             list.add(new ItemStack(MCVer.getItem("ROTTEN_FLESH"), 2 + lootingValue));
 
             if (dropIron.isToggled()) list.add(new ItemStack(MCVer.getItem("IRON_INGOT")));